diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml
index d5f14b82..d93dc884 100644
--- a/.gitea/workflows/test-flight-cd.yaml
+++ b/.gitea/workflows/test-flight-cd.yaml
@@ -15,11 +15,12 @@ jobs:
         uses: https://github.com/actions/checkout@v2
 
       - name: Checkout env repository
-        uses: https://github.com/actions/checkout@v2
+        uses: https://github.com/actions/checkout@v3
         with:
-          repository: mso7nueh/eatvio_app_env
+          repository: eatvio/eatvio_app_env
           path: env_repo
-          token: ${{ vars.MSO7NUEH_TOKEN }}
+          # Здесь может быть токен любого юзера с доступом в gitea
+          token: ${{ vars.READ_USER_GITEA_TOKEN }}
           ref: main
 
       - name: Copy .env file
@@ -57,23 +58,24 @@ jobs:
 
       - name: Flutter build
         run: |
-          flutter upgrade
+          flutter --version
+          flutter config --no-enable-swift-package-manager 
+          rm -rf ios/Podfile.lock
           flutter clean
           flutter pub get
-          flutter pub upgrade
           flutter pub run build_runner build --delete-conflicting-outputs
-          # Configure Flutter for release mode
-          pod repo update
-          flutter build ios --config-only --release
           cd ios
-          pod update
+          pod install --repo-update
+          cd ..
+          flutter build ios --config-only --release
+          cd ios 
           fastlane beta
         env:
           LANG: en_US.UTF-8
           LC_ALL: en_US.UTF-8
           MATCH_PASSWORD: ${{ vars.IOS_RUNNER_CI_PASSWORD }}
           FASTLANE_PASSWORD: ${{ vars.FASTLANE_PASSWORD }}
-          MATCH_GIT_URL: http://gitea.office.local:3000/mso7nueh/fastlane
+          MATCH_GIT_URL: http://eatvio:${{ vars.READ_USER_GITEA_TOKEN }}@gitea.office.local:3000/eatvio/fastlane.git
           FASTLANE_USER: eatvio2023@icloud.com
           FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ vars.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}
           API_APPSTORE_KEY: ${{ vars.API_APPSTORE_KEY }}
diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 458bea8c..516f806a 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -1,6 +1,9 @@
 name: Eatvio App Android Test
 
-on: [pull_request]
+on:
+  pull_request:
+    branches:
+      - main
 
 env:
   flutter_version: '3.41.2'
@@ -163,66 +166,66 @@ jobs:
       - name: Test
         run: flutter test --coverage
 
-      - name: Test coverage
-        run: |
-          echo "📊 Analyzing test coverage..."
-          echo ""
-          awk -F: '
-            /^SF:/ {
-              file = $0
-              sub(/^SF:/, "", file)
-              sub(/^[[:space:]]+/, "", file)
-              is_generated = 0
-              if (file ~ /\.(g|freezed|gr|mocks)\.dart$/) {
-                is_generated = 1
-                generated_files++
-              } else if (file ~ /\/(build|\.dart_tool)\//) {
-                is_generated = 1
-                generated_files++
-              } else {
-                source_files++
-              }
-            }
-            /^LF:/ {
-              if (!is_generated) {
-                total += $2
-              } else {
-                generated_lines += $2
-              }
-            }
-            /^LH:/ {
-              if (!is_generated) {
-                covered += $2
-              } else {
-                generated_covered += $2
-              }
-            }
-            END {
-              print "📁 Files:"
-              printf "   Source files:    %d\n", source_files
-              printf "   Generated files: %d (excluded)\n", generated_files
-              print ""
-              print "📝 Lines:"
-              printf "   Total lines:     %d\n", total
-              printf "   Covered lines:   %d\n", covered
-              printf "   Uncovered lines: %d\n", total - covered
-              print ""
-              if (total == 0) {
-                print "⚠️  Coverage: 0%"
-                exit 1
-              } else {
-                percentage = (covered / total) * 100
-                printf "✅ Coverage: %.2f%%\n", percentage
-                print ""
-                if (percentage < 70) {
-                  printf "❌ FAIL: Coverage is below 70%%\n"
-                  exit 1
-                } else {
-                  printf "💚 Excellent: Coverage is above 70%%\n"
-                }
-              }
-            }
-          ' coverage/lcov.info
+      # - name: Test coverage
+      #   run: |
+      #     echo "📊 Analyzing test coverage..."
+      #     echo ""
+      #     awk -F: '
+      #       /^SF:/ {
+      #         file = $0
+      #         sub(/^SF:/, "", file)
+      #         sub(/^[[:space:]]+/, "", file)
+      #         is_generated = 0
+      #         if (file ~ /\.(g|freezed|gr|mocks)\.dart$/) {
+      #           is_generated = 1
+      #           generated_files++
+      #         } else if (file ~ /\/(build|\.dart_tool)\//) {
+      #           is_generated = 1
+      #           generated_files++
+      #         } else {
+      #           source_files++
+      #         }
+      #       }
+      #       /^LF:/ {
+      #         if (!is_generated) {
+      #           total += $2
+      #         } else {
+      #           generated_lines += $2
+      #         }
+      #       }
+      #       /^LH:/ {
+      #         if (!is_generated) {
+      #           covered += $2
+      #         } else {
+      #           generated_covered += $2
+      #         }
+      #       }
+      #       END {
+      #         print "📁 Files:"
+      #         printf "   Source files:    %d\n", source_files
+      #         printf "   Generated files: %d (excluded)\n", generated_files
+      #         print ""
+      #         print "📝 Lines:"
+      #         printf "   Total lines:     %d\n", total
+      #         printf "   Covered lines:   %d\n", covered
+      #         printf "   Uncovered lines: %d\n", total - covered
+      #         print ""
+      #         if (total == 0) {
+      #           print "⚠️  Coverage: 0%"
+      #           exit 1
+      #         } else {
+      #           percentage = (covered / total) * 100
+      #           printf "✅ Coverage: %.2f%%\n", percentage
+      #           print ""
+      #           if (percentage < 70) {
+      #             printf "❌ FAIL: Coverage is below 70%%\n"
+      #             exit 1
+      #           } else {
+      #             printf "💚 Excellent: Coverage is above 70%%\n"
+      #           }
+      #         }
+      #       }
+      #     ' coverage/lcov.info
 
       - name: Build apk
         run: |
diff --git a/.gitignore b/.gitignore
index 6b66540b..af0c7b6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,5 @@ coverage/
 backend/
 .fvm/
 .fvmrc
-/eatvio
\ No newline at end of file
+/eatvio
+*.code-workspace
\ No newline at end of file
diff --git a/.kilocode/rules/memory-bank/context.md b/.kilocode/rules/memory-bank/context.md
index 0bde3ccf..ff45966e 100644
--- a/.kilocode/rules/memory-bank/context.md
+++ b/.kilocode/rules/memory-bank/context.md
@@ -1,7 +1,7 @@
 # Current Context
 
 ## Project Status
-Memory Bank initialized on 2025-10-16. This is a mature Flutter application (v1.3.0+79) currently in production.
+Memory Bank initialized on 2025-10-16. This is a mature Flutter application (v1.3.24+106) currently in production.
 
 ## Recent Activity
 - Memory Bank initialization completed
@@ -9,10 +9,19 @@ Memory Bank initialized on 2025-10-16. This is a mature Flutter application (v1.
 - Architecture and technology stack catalogued
 
 ## Current Focus
-Ready for development tasks. No active work in progress.
+Виджет видеоплеера ленты (`lib/features/feed/presentation/widgets/feed_video_player_widget.dart`)
+мигрирован с `webview_flutter` v4 на `flutter_inappwebview` 6.1.5. Цель — фикс
+fullscreen-кнопки внутри embed-плеера (Rutube/YouTube): `webview_flutter` не реализует
+Android `WebChromeClient.onShowCustomView/onHideCustomView`, а `flutter_inappwebview`
+делает это нативно (`InAppWebViewChromeClient`). Паритет UX сохранён (превью → play →
+скрытая загрузка → fade-in по Rutube `player:canPlay`, плюс страховочный таймер 4с
+для провайдеров без этого протокола). Добавлена ориентация landscape на fullscreen.
+Остальные 4 экрана на `webview_flutter` не трогались; обе зависимости в `pubspec.yaml`.
 
 ## Known Issues
-None documented at initialization.
+- 2 теста в `test/features/feed/` (`post_feed_pagination_model_test`,
+  `post_feed_mapper_test`) падают на ветке `personalized_feed` — пре-существующие,
+  связаны с fixtures/маппингом, не с видеоплеером.
 
 ## Next Steps
 Awaiting user direction for:
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 5fb4bf83..ff3634f9 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -69,6 +69,8 @@ android {
 }
 
 dependencies {
+    implementation platform('com.google.firebase:firebase-bom:34.4.0')
+    implementation 'com.google.firebase:firebase-messaging'
     implementation 'com.huawei.agconnect:agconnect-core:1.9.5.300'
     implementation 'com.huawei.hms:push:6.13.0.301'
     // Huawei Analytics dependency to satisfy com.huawei.hianalytics.* references during R8
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
index b657fa16..4c01d86a 100644
--- a/android/app/proguard-rules.pro
+++ b/android/app/proguard-rules.pro
@@ -4,6 +4,12 @@
 -keep class org.bouncycastle.** { *; }
 -dontwarn org.bouncycastle.**
 
+-keep class com.hiennv.flutter_callkit_incoming.** { *; }
+-dontwarn com.hiennv.flutter_callkit_incoming.**
+
+-keep class com.pravera.flutter_foreground_task.** { *; }
+-dontwarn com.pravera.flutter_foreground_task.**
+
 -keep class io.flutter.** { *; }
 -dontwarn io.flutter.**
 
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index b724e0c5..1838dff8 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,9 +1,13 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
@@ -13,6 +17,16 @@
         android:usesCleartextTraffic="true"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+        <service
+            android:name=".EatvioFcmMessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+        <service
+            android:name="io.flutter.plugins.firebase.messaging.FlutterFirebaseMessagingService"
+            tools:node="remove" />
         <service
             android:name=".HmsPushService"
             android:exported="false">
@@ -33,7 +47,7 @@
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
-            android:taskAffinity=""
+            android:supportsPictureInPicture="true"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
@@ -77,6 +91,68 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+
+        <!-- Tap on notification body opens CallkitIncomingActivity via PendingIntent.
+             Replace it with a bridge that routes to the same accept flow as Answer. -->
+        <activity
+            android:name="com.hiennv.flutter_callkit_incoming.CallkitIncomingActivity"
+            tools:node="remove" />
+
+        <activity
+            android:name=".EatvioCallkitIncomingBridgeActivity"
+            android:exported="false"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:turnScreenOn="true"
+            android:launchMode="singleTop"
+            android:configChanges="orientation" />
+
+        <activity-alias
+            android:name="com.hiennv.flutter_callkit_incoming.CallkitIncomingActivity"
+            android:targetActivity=".EatvioCallkitIncomingBridgeActivity"
+            android:exported="true"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:turnScreenOn="true"
+            android:launchMode="singleTop"
+            android:configChanges="orientation"
+            android:permission="${applicationId}.PERMISSION_CALL">
+            <intent-filter>
+                <action android:name="${applicationId}.com.hiennv.flutter_callkit_incoming.ACTION_CALL_INCOMING" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity-alias>
+
+        <activity
+            android:name="com.hiennv.flutter_callkit_incoming.TransparentActivity"
+            tools:node="remove" />
+
+        <activity
+            android:name=".EatvioCallkitTransparentBridgeActivity"
+            android:exported="false"
+            android:theme="@style/TranslucentTheme"
+            android:showWhenLocked="true"
+            android:turnScreenOn="true"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:launchMode="singleTop" />
+
+        <activity-alias
+            android:name="com.hiennv.flutter_callkit_incoming.TransparentActivity"
+            android:targetActivity=".EatvioCallkitTransparentBridgeActivity"
+            android:exported="false"
+            android:theme="@style/TranslucentTheme"
+            android:showWhenLocked="true"
+            android:turnScreenOn="true"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:launchMode="singleTop" />
+        <service
+            android:name="com.pravera.flutter_foreground_task.service.ForegroundService"
+            android:foregroundServiceType="microphone"
+            android:exported="false"
+            android:stopWithTask="true" />
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
diff --git a/android/app/src/main/kotlin/com/eatvioapp/app/CallKitAcceptIntentMapper.kt b/android/app/src/main/kotlin/com/eatvioapp/app/CallKitAcceptIntentMapper.kt
new file mode 100644
index 00000000..3b6d3732
--- /dev/null
+++ b/android/app/src/main/kotlin/com/eatvioapp/app/CallKitAcceptIntentMapper.kt
@@ -0,0 +1,53 @@
+package com.eatvioapp.app
+
+import android.content.Intent
+import android.os.Bundle
+import com.hiennv.flutter_callkit_incoming.CallkitConstants
+import com.hiennv.flutter_callkit_incoming.FlutterCallkitIncomingPlugin
+
+object CallKitAcceptIntentMapper {
+    fun payloadFromBundle(data: Bundle, action: String): Map<String, Any?>? {
+        if (!action.contains(CallkitConstants.ACTION_CALL_ACCEPT) &&
+            !action.contains(CallkitConstants.ACTION_CALL_CALLBACK)
+        ) {
+            return null
+        }
+
+        return hashMapOf(
+            "action" to action,
+            "id" to data.getString(CallkitConstants.EXTRA_CALLKIT_ID, ""),
+            "handle" to data.getString(CallkitConstants.EXTRA_CALLKIT_HANDLE, ""),
+            "nameCaller" to data.getString(CallkitConstants.EXTRA_CALLKIT_NAME_CALLER, ""),
+            "avatar" to data.getString(CallkitConstants.EXTRA_CALLKIT_AVATAR, ""),
+            "extra" to data.getSerializable(CallkitConstants.EXTRA_CALLKIT_EXTRA),
+        )
+    }
+
+    fun payloadFromIntent(intent: Intent?): Map<String, Any?>? {
+        if (intent == null) return null
+
+        val data = intent.getBundleExtra(FlutterCallkitIncomingPlugin.EXTRA_CALLKIT_CALL_DATA)
+            ?: return null
+        val action = intent.action ?: return null
+        if (!action.contains(CallkitConstants.ACTION_CALL_ACCEPT) &&
+            !action.contains(CallkitConstants.ACTION_CALL_CALLBACK)
+        ) {
+            return null
+        }
+
+        return hashMapOf(
+            "action" to action,
+            "id" to data.getString(CallkitConstants.EXTRA_CALLKIT_ID, ""),
+            "handle" to data.getString(CallkitConstants.EXTRA_CALLKIT_HANDLE, ""),
+            "nameCaller" to data.getString(CallkitConstants.EXTRA_CALLKIT_NAME_CALLER, ""),
+            "avatar" to data.getString(CallkitConstants.EXTRA_CALLKIT_AVATAR, ""),
+            "extra" to data.getSerializable(CallkitConstants.EXTRA_CALLKIT_EXTRA),
+        )
+    }
+
+    fun clearCallKitLaunchIntent(intent: Intent?) {
+        if (intent == null) return
+        intent.removeExtra(FlutterCallkitIncomingPlugin.EXTRA_CALLKIT_CALL_DATA)
+        intent.action = null
+    }
+}
diff --git a/android/app/src/main/kotlin/com/eatvioapp/app/CallKitIntentBridge.kt b/android/app/src/main/kotlin/com/eatvioapp/app/CallKitIntentBridge.kt
new file mode 100644
index 00000000..e433b4fc
--- /dev/null
+++ b/android/app/src/main/kotlin/com/eatvioapp/app/CallKitIntentBridge.kt
@@ -0,0 +1,38 @@
+package com.eatvioapp.app
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import com.hiennv.flutter_callkit_incoming.AppUtils
+import com.hiennv.flutter_callkit_incoming.CallkitIncomingBroadcastReceiver
+
+object CallKitIntentBridge {
+    fun dispatchCallKitAction(context: Context, action: String, data: Bundle?) {
+        if (data != null) {
+            CallKitAcceptIntentMapper.payloadFromBundle(data, action)?.let { payload ->
+                PendingCallKitAcceptBridge.store(payload)
+            }
+        }
+
+        val broadcastIntent = CallkitIncomingBroadcastReceiver.getIntent(context, action, data)
+        broadcastIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND)
+        context.sendBroadcast(broadcastIntent)
+
+        val shouldLaunchMainActivity =
+            action == com.hiennv.flutter_callkit_incoming.CallkitConstants.ACTION_CALL_ACCEPT ||
+                action == com.hiennv.flutter_callkit_incoming.CallkitConstants.ACTION_CALL_CALLBACK ||
+                !MainActivity.isInForeground
+
+        if (!shouldLaunchMainActivity) {
+            return
+        }
+
+        val activityIntent = AppUtils.getAppIntent(context, action, data) ?: return
+        activityIntent.addFlags(
+            Intent.FLAG_ACTIVITY_NEW_TASK or
+                Intent.FLAG_ACTIVITY_SINGLE_TOP or
+                Intent.FLAG_ACTIVITY_REORDER_TO_FRONT,
+        )
+        context.startActivity(activityIntent)
+    }
+}
diff --git a/android/app/src/main/kotlin/com/eatvioapp/app/EatvioCallkitIncomingBridgeActivity.kt b/android/app/src/main/kotlin/com/eatvioapp/app/EatvioCallkitIncomingBridgeActivity.kt
new file mode 100644
index 00000000..965e2af0
--- /dev/null
+++ b/android/app/src/main/kotlin/com/eatvioapp/app/EatvioCallkitIncomingBridgeActivity.kt
@@ -0,0 +1,29 @@
+package com.eatvioapp.app
+
+import android.app.Activity
+import android.os.Bundle
+import com.hiennv.flutter_callkit_incoming.CallkitConstants
+
+/// Redirects notification body / full-screen intent taps to the same accept path as
+/// the Answer button, instead of showing the native Callkit incoming UI.
+class EatvioCallkitIncomingBridgeActivity : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val data = intent.extras?.getBundle(CallkitConstants.EXTRA_CALLKIT_INCOMING_DATA)
+        if (data == null) {
+            finish()
+            return
+        }
+
+        CallKitIntentBridge.dispatchCallKitAction(
+            this,
+            CallkitConstants.ACTION_CALL_ACCEPT,
+            data,
+        )
+
+        finish()
+        @Suppress("DEPRECATION")
+        overridePendingTransition(0, 0)
+    }
+}
diff --git a/android/app/src/main/kotlin/com/eatvioapp/app/EatvioCallkitTransparentBridgeActivity.kt b/android/app/src/main/kotlin/com/eatvioapp/app/EatvioCallkitTransparentBridgeActivity.kt
new file mode 100644
index 00000000..606de16b
--- /dev/null
+++ b/android/app/src/main/kotlin/com/eatvioapp/app/EatvioCallkitTransparentBridgeActivity.kt
@@ -0,0 +1,25 @@
+package com.eatvioapp.app
+
+import android.app.Activity
+import android.os.Bundle
+
+/// Replaces plugin TransparentActivity: forwards CallKit actions without relaunching
+/// MainActivity when the Flutter app is already in the foreground.
+class EatvioCallkitTransparentBridgeActivity : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val action = intent.action
+        if (action.isNullOrBlank()) {
+            finish()
+            return
+        }
+
+        val data = intent.getBundleExtra("data")
+        CallKitIntentBridge.dispatchCallKitAction(this, action, data)
+
+        finish()
+        @Suppress("DEPRECATION")
+        overridePendingTransition(0, 0)
+    }
+}
diff --git a/android/app/src/main/kotlin/com/eatvioapp/app/EatvioFcmMessagingService.kt b/android/app/src/main/kotlin/com/eatvioapp/app/EatvioFcmMessagingService.kt
new file mode 100644
index 00000000..4a370800
--- /dev/null
+++ b/android/app/src/main/kotlin/com/eatvioapp/app/EatvioFcmMessagingService.kt
@@ -0,0 +1,38 @@
+package com.eatvioapp.app
+
+import android.util.Log
+import com.google.firebase.messaging.FirebaseMessagingService
+import com.google.firebase.messaging.RemoteMessage
+import io.flutter.plugins.firebase.messaging.FlutterFirebaseTokenLiveData
+
+class EatvioFcmMessagingService : FirebaseMessagingService() {
+    override fun onNewToken(token: String) {
+        super.onNewToken(token)
+        FlutterFirebaseTokenLiveData.getInstance().postToken(token)
+        Log.i(TAG, "onNewToken")
+    }
+
+    override fun onMessageReceived(message: RemoteMessage) {
+        Log.i(TAG, "onMessageReceived: ${message.data}")
+
+        if (VideoCallPushBridge.isEndedVideoCall(message.data)) {
+            VideoCallPushBridge.dismissAllIncomingCalls(this)
+            return
+        }
+
+        if (!VideoCallPushBridge.isIncomingVideoCall(message.data)) {
+            return
+        }
+
+        if (MainActivity.isInForeground) {
+            Log.i(TAG, "App in foreground, deferring incoming call to Flutter handler")
+            return
+        }
+
+        VideoCallPushBridge.showIncomingCall(this, message.data)
+    }
+
+    companion object {
+        private const val TAG = "EatvioFCM"
+    }
+}
diff --git a/android/app/src/main/kotlin/com/eatvioapp/app/HmsPushService.kt b/android/app/src/main/kotlin/com/eatvioapp/app/HmsPushService.kt
index f18b3992..5c1c0d3e 100644
--- a/android/app/src/main/kotlin/com/eatvioapp/app/HmsPushService.kt
+++ b/android/app/src/main/kotlin/com/eatvioapp/app/HmsPushService.kt
@@ -20,17 +20,23 @@ class HmsPushService : HmsMessageService() {
 
         if (message == null) return
 
-        // Берём action_url из data-поля, если оно есть.
-        val actionUrl = message.dataOfMap["action_url"]
+        if (VideoCallPushBridge.isEndedVideoCall(message.dataOfMap)) {
+            VideoCallPushBridge.dismissAllIncomingCalls(this)
+            return
+        }
 
-        // Строим системное уведомление, по тапу по которому откроется MainActivity с action_url.
+        if (VideoCallPushBridge.isIncomingVideoCall(message.dataOfMap)) {
+            VideoCallPushBridge.showIncomingCall(this, message.dataOfMap)
+            return
+        }
+
+        val actionUrl = message.dataOfMap["action_url"]
         showNotification(message, actionUrl)
     }
 
     private fun showNotification(message: RemoteMessage, actionUrl: String?) {
         val context = applicationContext
 
-        // Интент для запуска Flutter-активити.
         val intent = Intent(context, MainActivity::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
             if (!actionUrl.isNullOrBlank()) {
@@ -48,7 +54,7 @@ class HmsPushService : HmsMessageService() {
         val channelId = "hms_push_channel"
 
         val notification = NotificationCompat.Builder(context, channelId)
-            .setSmallIcon(R.mipmap.ic_launcher) // используем иконку приложения
+            .setSmallIcon(R.mipmap.ic_launcher)
             .setContentTitle(message.notification?.title ?: context.getString(R.string.app_name))
             .setContentText(message.notification?.body ?: "")
             .setAutoCancel(true)
@@ -58,5 +64,3 @@ class HmsPushService : HmsMessageService() {
         NotificationManagerCompat.from(context).notify(message.messageId.hashCode(), notification)
     }
 }
-
-
diff --git a/android/app/src/main/kotlin/com/eatvioapp/app/MainActivity.kt b/android/app/src/main/kotlin/com/eatvioapp/app/MainActivity.kt
index 97e76a0e..1ae3354f 100644
--- a/android/app/src/main/kotlin/com/eatvioapp/app/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/eatvioapp/app/MainActivity.kt
@@ -1,11 +1,16 @@
 package com.eatvioapp.app
 
+import android.app.PictureInPictureParams
 import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import android.util.Rational
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel
+import com.hiennv.flutter_callkit_incoming.FlutterCallkitIncomingPlugin
 import com.huawei.agconnect.config.AGConnectServicesConfig
 import com.huawei.hms.aaid.HmsInstanceId
 import kotlinx.coroutines.CoroutineScope
@@ -13,13 +18,68 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 class MainActivity: FlutterActivity() {
+    companion object {
+        @JvmStatic
+        var isInForeground: Boolean = false
+            private set
+    }
+
     private val channelName = "com.eatvioapp/hms_push"
+    private val videoCallPipChannelName = "com.eatvioapp/video_call_pip"
+    private val videoCallPushChannelName = "com.eatvioapp/video_call_push"
     private var methodChannel: MethodChannel? = null
+    private var videoCallPipChannel: MethodChannel? = null
+    private var videoCallPushChannel: MethodChannel? = null
+    private var videoCallPipEnabled: Boolean = false
+
+    override fun onResume() {
+        super.onResume()
+        isInForeground = true
+        captureCallKitLaunchIntent(intent)
+        if (PendingCallKitAcceptBridge.peek() != null) {
+            scheduleDeliverPendingCallKitAccept()
+        }
+    }
+
+    override fun onPause() {
+        isInForeground = false
+        super.onPause()
+    }
 
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
 
         methodChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, channelName)
+        videoCallPipChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, videoCallPipChannelName)
+        videoCallPushChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, videoCallPushChannelName)
+        videoCallPushChannel?.setMethodCallHandler { call, result ->
+            when (call.method) {
+                "dismissIncomingCalls" -> {
+                    try {
+                        VideoCallPushBridge.dismissAllIncomingCalls(applicationContext)
+                        result.success(null)
+                    } catch (e: Exception) {
+                        result.error("DISMISS_INCOMING_CALLS_FAILED", e.message, null)
+                    }
+                }
+                "drainPendingCallKitAccept" -> {
+                    result.success(PendingCallKitAcceptBridge.drain())
+                }
+                "peekPendingCallKitAccept" -> {
+                    result.success(PendingCallKitAcceptBridge.peekPending())
+                }
+                else -> result.notImplemented()
+            }
+        }
+        videoCallPipChannel?.setMethodCallHandler { call, result ->
+            when (call.method) {
+                "setPipEnabled" -> {
+                    videoCallPipEnabled = call.arguments as? Boolean ?: false
+                    result.success(null)
+                }
+                else -> result.notImplemented()
+            }
+        }
         methodChannel?.setMethodCallHandler { call, result ->
                 when (call.method) {
                     "getHuaweiToken" -> {
@@ -75,17 +135,67 @@ class MainActivity: FlutterActivity() {
 
         // Обрабатываем возможный action_url, с которым была открыта Activity (например, из HMS уведомления).
         handleIntentForActionUrl(intent)
+        captureCallKitLaunchIntent(intent)
+    }
+
+    override fun onUserLeaveHint() {
+        super.onUserLeaveHint()
+        enterVideoCallPictureInPictureIfNeeded()
+        videoCallPipChannel?.invokeMethod("onUserLeaveHint", null)
     }
 
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
+        setIntent(intent)
+        captureCallKitLaunchIntent(intent)
         // Обработка нового интента, когда Activity уже запущена (тап по уведомлению).
         handleIntentForActionUrl(intent)
     }
 
+    private fun captureCallKitLaunchIntent(intent: Intent?) {
+        val payload = CallKitAcceptIntentMapper.payloadFromIntent(intent) ?: return
+
+        android.util.Log.i(
+            "VideoCallPush",
+            "captureCallKitLaunchIntent: action=${payload["action"]} id=${payload["id"]}",
+        )
+
+        PendingCallKitAcceptBridge.store(payload)
+        CallKitAcceptIntentMapper.clearCallKitLaunchIntent(intent)
+        scheduleDeliverPendingCallKitAccept()
+    }
+
+    private fun scheduleDeliverPendingCallKitAccept() {
+        PendingCallKitAcceptBridge.scheduleDeliverToFlutter(
+            deliver = { deliverPendingCallKitAcceptToFlutter() },
+        )
+    }
+
+    private fun deliverPendingCallKitAcceptToFlutter() {
+        val payload = PendingCallKitAcceptBridge.peek() ?: return
+        val channel = videoCallPushChannel
+        if (channel == null) {
+            android.util.Log.w(
+                "VideoCallPush",
+                "deliverPendingCallKitAcceptToFlutter: channel not ready",
+            )
+            return
+        }
+
+        android.util.Log.i(
+            "VideoCallPush",
+            "deliverPendingCallKitAcceptToFlutter: id=${payload["id"]}",
+        )
+        channel.invokeMethod("onCallKitLaunchIntent", payload)
+    }
+
     private fun handleIntentForActionUrl(intent: Intent?) {
         if (intent == null) return
 
+        if (intent.hasExtra(FlutterCallkitIncomingPlugin.EXTRA_CALLKIT_CALL_DATA)) {
+            return
+        }
+
         // Вариант 1: action_url лежит в extras.
         val fromExtras = intent.extras?.getString("action_url")
 
@@ -101,4 +211,19 @@ class MainActivity: FlutterActivity() {
         // Проксируем URL во Flutter, где уже есть общая логика навигации по диплинкам.
         methodChannel?.invokeMethod("openActionUrl", actionUrl)
     }
+
+    private fun enterVideoCallPictureInPictureIfNeeded() {
+        if (!videoCallPipEnabled) return
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
+        if (isInPictureInPictureMode) return
+
+        try {
+            val params = PictureInPictureParams.Builder()
+                .setAspectRatio(Rational(2, 3))
+                .build()
+            enterPictureInPictureMode(params)
+        } catch (e: Exception) {
+            android.util.Log.w("VideoCallPiP", "Unable to enter PiP from onUserLeaveHint", e)
+        }
+    }
 }
diff --git a/android/app/src/main/kotlin/com/eatvioapp/app/PendingCallKitAcceptBridge.kt b/android/app/src/main/kotlin/com/eatvioapp/app/PendingCallKitAcceptBridge.kt
new file mode 100644
index 00000000..8be98e66
--- /dev/null
+++ b/android/app/src/main/kotlin/com/eatvioapp/app/PendingCallKitAcceptBridge.kt
@@ -0,0 +1,42 @@
+package com.eatvioapp.app
+
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+
+/// Stores accepted call payloads until the Flutter engine is ready to drain them.
+object PendingCallKitAcceptBridge {
+    private const val TAG = "PendingCallKitAccept"
+
+    @Volatile
+    private var pendingPayload: Map<String, Any?>? = null
+
+    private val mainHandler = Handler(Looper.getMainLooper())
+
+    fun store(payload: Map<String, Any?>) {
+        pendingPayload = payload
+        Log.i(TAG, "stored pending accept id=${payload["id"]}")
+    }
+
+    fun peek(): Map<String, Any?>? = pendingPayload
+
+    fun drain(): Map<String, Any?>? {
+        val payload = pendingPayload
+        pendingPayload = null
+        if (payload != null) {
+            Log.i(TAG, "drained pending accept id=${payload["id"]}")
+        }
+        return payload
+    }
+
+    fun peekPending(): Map<String, Any?>? = pendingPayload
+
+    fun scheduleDeliverToFlutter(
+        deliver: () -> Unit,
+        delaysMs: LongArray = longArrayOf(0L, 250L, 700L, 1500L, 2800L, 4200L, 6000L),
+    ) {
+        for (delayMs in delaysMs) {
+            mainHandler.postDelayed({ deliver() }, delayMs)
+        }
+    }
+}
diff --git a/android/app/src/main/kotlin/com/eatvioapp/app/VideoCallPushBridge.kt b/android/app/src/main/kotlin/com/eatvioapp/app/VideoCallPushBridge.kt
new file mode 100644
index 00000000..fbad936e
--- /dev/null
+++ b/android/app/src/main/kotlin/com/eatvioapp/app/VideoCallPushBridge.kt
@@ -0,0 +1,318 @@
+package com.eatvioapp.app
+
+import android.content.Context
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import com.hiennv.flutter_callkit_incoming.CallkitConstants
+import com.hiennv.flutter_callkit_incoming.CallkitNotificationManager
+import com.hiennv.flutter_callkit_incoming.CallkitNotificationService
+import com.hiennv.flutter_callkit_incoming.CallkitSoundPlayerManager
+import com.hiennv.flutter_callkit_incoming.Data
+import com.hiennv.flutter_callkit_incoming.FlutterCallkitIncomingPlugin
+import com.hiennv.flutter_callkit_incoming.addCall
+import com.hiennv.flutter_callkit_incoming.getDataActiveCalls
+import com.hiennv.flutter_callkit_incoming.removeAllCalls
+import java.util.HashMap
+
+object VideoCallPushBridge {
+    private const val TAG = "VideoCallPushBridge"
+    private const val ANDROID_ACCENT_COLOR = "#2787F5"
+    private const val MISSED_CALL_CLEANUP_DELAY_MS = 250L
+
+    private var activeSoundManager: CallkitSoundPlayerManager? = null
+    private var activeNotificationManager: CallkitNotificationManager? = null
+
+    fun isIncomingVideoCall(data: Map<String, String>): Boolean {
+        val rawType = data["type"]
+            ?: data["notification_type"]
+            ?: data["event"]
+            ?: data["action"]
+            ?: data["push_type"]
+            ?: data["call_type"]
+
+        if (rawType != null) {
+            val normalized = rawType.lowercase().replace("-", "_")
+            if (normalized.contains("video_call")) {
+                return !normalized.contains("end") && !normalized.contains("ended")
+            }
+            if (normalized == "incoming_call" ||
+                normalized == "video_call_incoming" ||
+                normalized == "incoming_video_call"
+            ) {
+                return true
+            }
+        }
+
+        if (isTruthy(data["is_video_call"]) ||
+            isTruthy(data["incoming_call"]) ||
+            isTruthy(data["is_incoming_call"])
+        ) {
+            return conversationUuid(data) != null
+        }
+
+        val actionUrl = data["action_url"]
+        if (!actionUrl.isNullOrBlank() &&
+            (actionUrl.contains("video-call") || actionUrl.contains("videoCall"))
+        ) {
+            return true
+        }
+
+        return false
+    }
+
+    fun isEndedVideoCall(data: Map<String, String>): Boolean {
+        val rawType = data["type"]
+            ?: data["notification_type"]
+            ?: data["event"]
+            ?: data["action"]
+            ?: data["push_type"]
+            ?: data["call_type"]
+
+        if (rawType != null) {
+            val normalized = rawType.lowercase().replace("-", "_")
+            if (normalized == "video_call_ended" || normalized == "video_call_end") {
+                return true
+            }
+            if (normalized.contains("video_call") &&
+                (normalized.contains("ended") || normalized.endsWith("_end"))
+            ) {
+                return true
+            }
+        }
+
+        return false
+    }
+
+    fun showIncomingCall(context: Context, data: Map<String, String>) {
+        val appContext = context.applicationContext
+        val callData = buildCallDataBundle(data)
+        if (callData == null) {
+            Log.w(TAG, "showIncomingCall: missing conversation uuid, data=$data")
+            return
+        }
+
+        Log.i(TAG, "showIncomingCall: conversation=${callData.getString(CallkitConstants.EXTRA_CALLKIT_ID)}")
+
+        val soundManager = CallkitSoundPlayerManager(appContext)
+        val notificationManager = CallkitNotificationManager(appContext, soundManager)
+        activeSoundManager = soundManager
+        activeNotificationManager = notificationManager
+        notificationManager.createNotificationChanel(callData)
+        notificationManager.showIncomingNotification(callData)
+
+        try {
+            addCall(appContext, Data.fromBundle(callData))
+        } catch (error: Exception) {
+            Log.w(TAG, "showIncomingCall: failed to persist active call", error)
+        }
+    }
+
+    fun dismissAllIncomingCalls(context: Context) {
+        val appContext = context.applicationContext
+        val calls = getDataActiveCalls(appContext)
+        Log.i(TAG, "dismissAllIncomingCalls: active calls=${calls.size}")
+
+        stopIncomingRingtone(appContext)
+
+        val notificationManager = resolveNotificationManager(appContext)
+        val bundles = calls.map { it.toBundle() }
+
+        for (bundle in bundles) {
+            try {
+                dismissIncomingCallNotification(appContext, notificationManager, bundle)
+            } catch (error: Exception) {
+                Log.w(
+                    TAG,
+                    "dismissAllIncomingCalls: failed for call ${bundle.getString(CallkitConstants.EXTRA_CALLKIT_ID)}",
+                    error,
+                )
+            }
+        }
+
+        try {
+            CallkitNotificationService.stopService(appContext)
+        } catch (error: Exception) {
+            Log.w(TAG, "dismissAllIncomingCalls: failed to stop callkit service", error)
+        }
+
+        try {
+            removeAllCalls(appContext)
+        } catch (error: Exception) {
+            Log.w(TAG, "dismissAllIncomingCalls: failed to remove persisted calls", error)
+        }
+
+        stopIncomingRingtone(appContext)
+        scheduleMissedCallCleanup(notificationManager, bundles)
+        activeSoundManager = null
+        activeNotificationManager = null
+    }
+
+    private fun resolveNotificationManager(context: Context): CallkitNotificationManager {
+        activeNotificationManager?.let { return it }
+        FlutterCallkitIncomingPlugin.getInstance()
+            ?.getCallkitNotificationManager()
+            ?.let { return it }
+
+        val soundManager = CallkitSoundPlayerManager(context)
+        return CallkitNotificationManager(context, soundManager)
+    }
+
+    private fun stopIncomingRingtone(context: Context) {
+        activeSoundManager?.stop()
+        FlutterCallkitIncomingPlugin.getInstance()
+            ?.getCallkitSoundPlayerManager()
+            ?.stop()
+    }
+
+    /**
+     * Replaces the incoming notification before cancel so Android does not fire the
+     * timeout delete intent (which would show a missed-call notification).
+     */
+    private fun dismissIncomingCallNotification(
+        context: Context,
+        notificationManager: CallkitNotificationManager,
+        bundle: Bundle,
+    ) {
+        val notificationId = incomingNotificationId(bundle)
+
+        val silentNotification = NotificationCompat.Builder(
+            context,
+            CallkitNotificationManager.NOTIFICATION_CHANNEL_ID_INCOMING,
+        )
+            .setSmallIcon(context.applicationInfo.icon)
+            .setContentTitle("")
+            .setSilent(true)
+            .setOngoing(false)
+            .setPriority(NotificationCompat.PRIORITY_MIN)
+            .build()
+
+        val notificationManagerCompat = NotificationManagerCompat.from(context)
+        notificationManagerCompat.notify(notificationId, silentNotification)
+        notificationManagerCompat.cancel(notificationId)
+
+        bundle.putBoolean(CallkitConstants.EXTRA_CALLKIT_MISSED_CALL_SHOW, false)
+        notificationManager.clearIncomingNotification(bundle, isAccepted = true)
+        notificationManager.clearMissCallNotification(bundle)
+    }
+
+    private fun scheduleMissedCallCleanup(
+        notificationManager: CallkitNotificationManager,
+        bundles: List<Bundle>,
+    ) {
+        if (bundles.isEmpty()) return
+
+        Handler(Looper.getMainLooper()).postDelayed({
+            for (bundle in bundles) {
+                try {
+                    notificationManager.clearMissCallNotification(bundle)
+                } catch (error: Exception) {
+                    Log.w(TAG, "dismissAllIncomingCalls: delayed missed-call cleanup failed", error)
+                }
+            }
+        }, MISSED_CALL_CLEANUP_DELAY_MS)
+    }
+
+    private fun incomingNotificationId(bundle: Bundle): Int {
+        return bundle.getString(CallkitConstants.EXTRA_CALLKIT_ID, "callkit_incoming").hashCode()
+    }
+
+    private fun buildCallDataBundle(data: Map<String, String>): Bundle? {
+        val conversationUuid = conversationUuid(data) ?: return null
+        val callerName = data["counterpartName"]
+            ?: data["counterpart_name"]
+            ?: data["caller_name"]
+            ?: data["callerName"]
+            ?: data["nameCaller"]
+            ?: data["caller"]
+            ?: "Итвио"
+        val avatarUrl = data["counterpartAvatarUrl"]
+            ?: data["counterpart_avatar_url"]
+            ?: data["avatar"]
+            ?: data["avatarUrl"]
+            ?: data["avatar_url"]
+            ?: data["caller_avatar"]
+            ?: ""
+        val localParticipantName = data["localParticipantName"]
+            ?: data["local_participant_name"]
+        val counterpartIsConsultant = isTruthy(
+            data["counterpartIsConsultant"]
+                ?: data["counterpart_is_consultant"]
+                ?: data["is_consultant"]
+                ?: data["isConsultant"]
+        )
+
+        val extra = HashMap<String, Any?>()
+        extra["conversationUuid"] = conversationUuid
+        extra["counterpartName"] = callerName
+        if (avatarUrl.isNotBlank()) {
+            extra["counterpartAvatarUrl"] = avatarUrl
+        }
+        if (!localParticipantName.isNullOrBlank()) {
+            extra["localParticipantName"] = localParticipantName
+        }
+        if (counterpartIsConsultant) {
+            extra["counterpartIsConsultant"] = true
+        }
+
+        return Bundle().apply {
+            putString(CallkitConstants.EXTRA_CALLKIT_ID, conversationUuid)
+            putString(CallkitConstants.EXTRA_CALLKIT_NAME_CALLER, callerName)
+            putString(CallkitConstants.EXTRA_CALLKIT_APP_NAME, "Итвио")
+            putString(CallkitConstants.EXTRA_CALLKIT_HANDLE, conversationUuid)
+            putString(CallkitConstants.EXTRA_CALLKIT_AVATAR, avatarUrl)
+            putInt(CallkitConstants.EXTRA_CALLKIT_TYPE, 0)
+            putLong(CallkitConstants.EXTRA_CALLKIT_DURATION, 45000L)
+            putString(CallkitConstants.EXTRA_CALLKIT_TEXT_ACCEPT, "Answer")
+            putString(CallkitConstants.EXTRA_CALLKIT_TEXT_DECLINE, "Decline")
+            putSerializable(CallkitConstants.EXTRA_CALLKIT_EXTRA, extra)
+            putSerializable(CallkitConstants.EXTRA_CALLKIT_HEADERS, HashMap<String, Any?>())
+            putBoolean(CallkitConstants.EXTRA_CALLKIT_IS_CUSTOM_NOTIFICATION, true)
+            putBoolean(CallkitConstants.EXTRA_CALLKIT_IS_CUSTOM_SMALL_EX_NOTIFICATION, false)
+            putBoolean(CallkitConstants.EXTRA_CALLKIT_IS_SHOW_LOGO, false)
+            putBoolean(CallkitConstants.EXTRA_CALLKIT_IS_SHOW_CALL_ID, false)
+            putString(CallkitConstants.EXTRA_CALLKIT_RINGTONE_PATH, "system_ringtone_default")
+            putString(CallkitConstants.EXTRA_CALLKIT_BACKGROUND_COLOR, ANDROID_ACCENT_COLOR)
+            putString(CallkitConstants.EXTRA_CALLKIT_ACTION_COLOR, ANDROID_ACCENT_COLOR)
+            putString(CallkitConstants.EXTRA_CALLKIT_TEXT_COLOR, "#ffffff")
+            putBoolean(CallkitConstants.EXTRA_CALLKIT_IS_SHOW_FULL_LOCKED_SCREEN, false)
+            putBoolean(CallkitConstants.EXTRA_CALLKIT_IS_FULL_SCREEN, false)
+            putBoolean(CallkitConstants.EXTRA_CALLKIT_CALLING_SHOW, false)
+        }
+    }
+
+    private fun conversationUuid(data: Map<String, String>): String? {
+        val fromData = data["conversationUuid"]
+            ?: data["conversation_uuid"]
+            ?: data["conversation_id"]
+            ?: data["chat_uuid"]
+            ?: data["uuid"]
+        if (!fromData.isNullOrBlank()) {
+            return fromData
+        }
+
+        val actionUrl = data["action_url"] ?: return null
+        val uuidFromQuery = Regex("""[?&](?:uuid|conversationUuid|conversation_uuid)=([^&]+)""")
+            .find(actionUrl)
+            ?.groupValues
+            ?.getOrNull(1)
+            ?.trim()
+        if (!uuidFromQuery.isNullOrEmpty()) {
+            return uuidFromQuery
+        }
+
+        val pathMatch = Regex("""/video-call/([^/?#]+)""").find(actionUrl)
+        return pathMatch?.groupValues?.getOrNull(1)?.trim()?.takeIf { it.isNotEmpty() }
+    }
+
+    private fun isTruthy(value: String?): Boolean {
+        if (value.isNullOrBlank()) return false
+        return when (value.trim().lowercase()) {
+            "1", "true", "yes" -> true
+            else -> false
+        }
+    }
+}
diff --git a/android/build/reports/problems/problems-report.html b/android/build/reports/problems/problems-report.html
index 379f47c9..fa7c1a97 100644
--- a/android/build/reports/problems/problems-report.html
+++ b/android/build/reports/problems/problems-report.html
@@ -650,7 +650,7 @@ code + .copy-button {
 <script type="text/javascript">
 function configurationCacheProblems() { return (
 // begin-report-data
-{"diagnostics":[{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('signingConfig = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('shrinkResources = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('signingConfig = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('signingConfig = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('group = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('version = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('group = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('version = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('namespace = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('group = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('version = <value>') instead."}]]},{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('namespace = <value>') instead."}]]}],"problemsReport":{"totalProblemCount":15,"buildName":"android","requestedTasks":"assembleDebug","documentationLink":"https://docs.gradle.org/9.0.0/userguide/reporting_problems.html","documentationLinkCaption":"Problem report","summaries":[]}}
+{"diagnostics":[{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]}],"problemsReport":{"totalProblemCount":1,"requestedTasks":":app:compileDebugKotlin","documentationLink":"https://docs.gradle.org/9.0.0/userguide/reporting_problems.html","documentationLinkCaption":"Problem report","summaries":[]}}
 // end-report-data
 );}
 </script>
diff --git a/assets/icons/video_call/vc_control_enter.svg b/assets/icons/video_call/vc_control_enter.svg
new file mode 100644
index 00000000..e396beb2
--- /dev/null
+++ b/assets/icons/video_call/vc_control_enter.svg
@@ -0,0 +1,3 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.3438 5.34375C14.9405 5.34375 15.5128 5.5808 15.9347 6.00276C16.3567 6.42472 16.5938 6.99701 16.5938 7.59375M14.3438 0.84375C16.134 0.84375 17.8509 1.55491 19.1167 2.82078C20.3826 4.08665 21.0938 5.80354 21.0938 7.59375M3.09375 1.96875H7.59375L9.84375 7.59375L7.03125 9.28125C8.23608 11.7242 10.2133 13.7014 12.6562 14.9062L14.3438 12.0938L19.9688 14.3438V18.8438C19.9688 19.4405 19.7317 20.0128 19.3097 20.4347C18.8878 20.8567 18.3155 21.0938 17.7188 21.0938C13.3304 20.8271 9.19142 18.9636 6.08268 15.8548C2.97394 12.7461 1.11043 8.60708 0.84375 4.21875C0.84375 3.62201 1.0808 3.04972 1.50276 2.62776C1.92472 2.2058 2.49701 1.96875 3.09375 1.96875Z" stroke="white" stroke-width="1.6875" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/ios/Podfile b/ios/Podfile
index 4fe34ec9..833e2940 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -47,8 +47,6 @@ post_install do |installer|
         ## dart: PermissionGroup.photos
         'PERMISSION_PHOTOS=1',      
         'PERMISSION_NOTIFICATIONS=1',
-        ## dart: PermissionGroup.mediaLibrary
-        'PERMISSION_MEDIA_LIBRARY=1',        
       ]
 
     end
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index ad156380..9a9c45c0 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -397,7 +397,7 @@
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Eatvio;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -548,7 +548,7 @@
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Eatvio;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -587,7 +587,7 @@
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Eatvio;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
index fc70b0b0..15dfb671 100644
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -1,30 +1,517 @@
+import AVFAudio
+import CallKit
 import Flutter
+import PushKit
 import UIKit
+import UserNotifications
 import YandexLoginSDK
+import flutter_callkit_incoming
+import flutter_foreground_task
 
 @main
-@objc class AppDelegate: FlutterAppDelegate {
+@objc class AppDelegate: FlutterAppDelegate, PKPushRegistryDelegate, CallkitIncomingAppDelegate {
+  private var voipRegistry: PKPushRegistry?
+  private var voipDiagnosticsChannel: FlutterMethodChannel?
+  private let voipDiagnosticsStorageKey = "EatvioVoipDiagnostics"
+  private let pendingAcceptedVoipCallKey = "EatvioPendingAcceptedVoipCall"
+  private let voipDiagnosticsChannelName = "com.eatvioapp/voip_diagnostics"
+  private let appUrlScheme = "eatvio"
+
   override func application(
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
     GeneratedPluginRegistrant.register(with: self)
-    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+    SwiftFlutterForegroundTaskPlugin.setPluginRegistrantCallback { registry in
+      GeneratedPluginRegistrant.register(with: registry)
+    }
+
+    let mainQueue = DispatchQueue.main
+    voipRegistry = PKPushRegistry(queue: mainQueue)
+    voipRegistry?.delegate = self
+    voipRegistry?.desiredPushTypes = [PKPushType.voIP]
+
+    if #available(iOS 10.0, *) {
+      UNUserNotificationCenter.current().delegate = self
+    }
+
+    let launched = super.application(application, didFinishLaunchingWithOptions: launchOptions)
+
+    if let controller = window?.rootViewController as? FlutterViewController {
+      let channel = FlutterMethodChannel(
+        name: voipDiagnosticsChannelName,
+        binaryMessenger: controller.binaryMessenger
+      )
+      voipDiagnosticsChannel = channel
+      channel.setMethodCallHandler { [weak self] call, result in
+        guard let self else {
+          result(nil)
+          return
+        }
+        switch call.method {
+        case "drainVoipDiagnostics":
+          result(self.drainVoipDiagnostics())
+        case "drainPendingAcceptedVoipCall":
+          result(self.drainPendingAcceptedVoipCall())
+        default:
+          result(FlutterMethodNotImplemented)
+        }
+      }
+    }
+
+    return launched
   }
 
   @available(iOS 8.0, *)
-  func application(
-    _ application: UIApplication, continue userActivity: NSUserActivity,
-    restorationHandler: @escaping ([Any]?) -> Void
+  override func application(
+    _ application: UIApplication,
+    continue userActivity: NSUserActivity,
+    restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void
   ) -> Bool {
-    YXLSdk.shared.processUserActivity(userActivity)
-    return true
+    if YXLSdk.shared.processUserActivity(userActivity) {
+      return true
+    }
+    return super.application(
+      application,
+      continue: userActivity,
+      restorationHandler: restorationHandler
+    )
   }
 
   override public func application(
-    _ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]
+    _ app: UIApplication,
+    open url: URL,
+    options: [UIApplication.OpenURLOptionsKey: Any] = [:]
   ) -> Bool {
+    if url.scheme == appUrlScheme {
+      let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
+      let queryItems = components?.queryItems ?? []
+      let conversationUuid = queryItems.first { $0.name == "conversationUuid" }?.value?
+        .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+      let callKitId = queryItems.first { $0.name == "callKitId" }?.value?
+        .trimmingCharacters(in: .whitespacesAndNewlines)
+      recordVoipDiagnostic(
+        "accepted_call_url_opened",
+        data: [
+          "callKitId": callKitId ?? "",
+          "hasCallKitId": callKitId != nil,
+          "conversationUuid": conversationUuid,
+          "url": url.absoluteString,
+        ]
+      )
+      if let callKitId, !callKitId.isEmpty, !conversationUuid.isEmpty {
+        voipDiagnosticsChannel?.invokeMethod(
+          "acceptedVoipCall",
+          arguments: [
+            "id": callKitId,
+            "handle": conversationUuid,
+            "extra": [
+              "conversationUuid": conversationUuid
+            ],
+          ]
+        )
+      }
+      return true
+    }
+
     return YXLSdk.shared.handleOpen(
-      url, sourceApplication: options[UIApplication.OpenURLOptionsKey.sourceApplication] as? String)
+      url,
+      sourceApplication: options[UIApplication.OpenURLOptionsKey.sourceApplication] as? String
+    )
   }
+
+  private func conversationUuid(fromActionUrl actionUrl: String?) -> String? {
+    guard
+      let actionUrl = actionUrl,
+      let components = URLComponents(string: actionUrl)
+    else {
+      return nil
+    }
+
+    let queryItems = components.queryItems ?? []
+    for key: String in ["uuid", "conversationUuid", "conversation_uuid"] {
+      if let value = queryItems.first(where: { $0.name == key })?.value,
+        !value.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+      {
+        return value.trimmingCharacters(in: .whitespacesAndNewlines)
+      }
+    }
+
+    let segments = components.path.split(separator: "/").map(String.init)
+    for index in segments.indices where segments[index] == "video-call" {
+      let nextIndex = segments.index(after: index)
+      if segments.indices.contains(nextIndex), !segments[nextIndex].isEmpty {
+        return segments[nextIndex]
+      }
+    }
+
+    return nil
+  }
+
+  private func conversationUuid(fromCall call: Call) -> String? {
+    let extra = call.data.extra as? [String: Any] ?? [:]
+    for key in ["conversationUuid", "conversation_uuid", "conversation_id", "chat_uuid", "uuid"] {
+      if let value = extra[key] as? String {
+        let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines)
+        if !trimmed.isEmpty {
+          return trimmed
+        }
+      }
+    }
+
+    let handle = call.data.handle.trimmingCharacters(in: .whitespacesAndNewlines)
+    if !handle.isEmpty {
+      return handle
+    }
+
+    return nil
+  }
+
+  private func storePendingAcceptedCall(_ call: Call) {
+    let payload = sanitizedDiagnosticValue(call.data.toJSON()) as? [String: Any] ?? [:]
+    UserDefaults.standard.set(payload, forKey: pendingAcceptedVoipCallKey)
+  }
+
+  private func drainPendingAcceptedVoipCall() -> [String: Any]? {
+    let defaults = UserDefaults.standard
+    guard let payload = defaults.dictionary(forKey: pendingAcceptedVoipCallKey) else {
+      return nil
+    }
+    defaults.removeObject(forKey: pendingAcceptedVoipCallKey)
+    return payload
+  }
+
+  private func bringAppToForeground() {
+    DispatchQueue.main.async {
+      for scene in UIApplication.shared.connectedScenes {
+        guard let windowScene = scene as? UIWindowScene else { continue }
+        for window in windowScene.windows {
+          window.makeKeyAndVisible()
+        }
+      }
+      self.window?.makeKeyAndVisible()
+    }
+  }
+
+  private func openAppForAcceptedCall(_ call: Call) {
+    guard let conversationUuid = conversationUuid(fromCall: call), !conversationUuid.isEmpty else {
+      recordVoipDiagnostic(
+        "accepted_call_missing_conversation_uuid",
+        data: ["callKitId": call.data.uuid]
+      )
+      return
+    }
+
+    var components = URLComponents()
+    components.scheme = appUrlScheme
+    components.host = "video-call"
+    components.queryItems = [
+      URLQueryItem(name: "callKitId", value: call.data.uuid),
+      URLQueryItem(name: "conversationUuid", value: conversationUuid)
+    ]
+
+    guard let url = components.url else {
+      recordVoipDiagnostic(
+        "accepted_call_url_build_failed",
+        data: [
+          "callKitId": call.data.uuid,
+          "conversationUuid": conversationUuid,
+        ]
+      )
+      return
+    }
+
+    recordVoipDiagnostic(
+      "accepted_call_open_app_requested",
+      data: [
+        "callKitId": call.data.uuid,
+        "conversationUuid": conversationUuid,
+        "url": url.absoluteString,
+        "appState": UIApplication.shared.applicationState.rawValue,
+      ]
+    )
+
+    bringAppToForeground()
+
+    UIApplication.shared.open(url, options: [:]) { [weak self] success in
+      self?.recordVoipDiagnostic(
+        success ? "accepted_call_open_app_succeeded" : "accepted_call_open_app_failed",
+        data: [
+          "callKitId": call.data.uuid,
+          "conversationUuid": conversationUuid,
+          "url": url.absoluteString,
+        ]
+      )
+    }
+  }
+
+  private func sanitizedDiagnosticValue(_ value: Any?) -> Any {
+    guard let value = value else {
+      return ""
+    }
+    if let string = value as? String {
+      return string
+    }
+    if let number = value as? NSNumber {
+      return number
+    }
+    if let bool = value as? Bool {
+      return bool
+    }
+    if let dictionary = value as? [AnyHashable: Any] {
+      return dictionary.reduce(into: [String: Any]()) { result, entry in
+        result[String(describing: entry.key)] = sanitizedDiagnosticValue(entry.value)
+      }
+    }
+    if let array = value as? [Any] {
+      return array.map { sanitizedDiagnosticValue($0) }
+    }
+    return String(describing: value)
+  }
+
+  private func recordVoipDiagnostic(_ name: String, data: [String: Any]) {
+    let defaults = UserDefaults.standard
+    var events = defaults.array(forKey: voipDiagnosticsStorageKey) as? [[String: Any]] ?? []
+    var event: [String: Any] = [
+      "name": name,
+      "timestamp": ISO8601DateFormatter().string(from: Date()),
+      "appState": UIApplication.shared.applicationState.rawValue,
+    ]
+    event["data"] = sanitizedDiagnosticValue(data)
+    events.append(event)
+    if events.count > 20 {
+      events = Array(events.suffix(20))
+    }
+    defaults.set(events, forKey: voipDiagnosticsStorageKey)
+    voipDiagnosticsChannel?.invokeMethod("voipDiagnosticsUpdated", arguments: nil)
+  }
+
+  private func drainVoipDiagnostics() -> [[String: Any]] {
+    let defaults = UserDefaults.standard
+    let events = defaults.array(forKey: voipDiagnosticsStorageKey) as? [[String: Any]] ?? []
+    defaults.removeObject(forKey: voipDiagnosticsStorageKey)
+    return events
+  }
+
+
+  func pushRegistry(
+    _ registry: PKPushRegistry,
+    didUpdate credentials: PKPushCredentials,
+    for type: PKPushType
+  ) {
+    let deviceToken = credentials.token.map { String(format: "%02x", $0) }.joined()
+    SwiftFlutterCallkitIncomingPlugin.sharedInstance?.setDevicePushTokenVoIP(deviceToken)
+  }
+
+  func pushRegistry(_ registry: PKPushRegistry, didInvalidatePushTokenFor type: PKPushType) {
+    SwiftFlutterCallkitIncomingPlugin.sharedInstance?.setDevicePushTokenVoIP("")
+  }
+
+  func pushRegistry(
+    _ registry: PKPushRegistry,
+    didReceiveIncomingPushWith payload: PKPushPayload,
+    for type: PKPushType,
+    completion: @escaping () -> Void
+  ) {
+    guard type == .voIP else {
+      completion()
+      return
+    }
+
+    let dict = payload.dictionaryPayload
+    let pushMarkers = [
+      dict["type"] as? String,
+      dict["notification_type"] as? String,
+      dict["event"] as? String,
+      dict["action"] as? String,
+      dict["push_type"] as? String,
+      dict["call_type"] as? String,
+    ]
+      .compactMap { $0?.lowercased().replacingOccurrences(of: "-", with: "_") }
+
+    if pushMarkers.contains(where: { $0.contains("video_call") })
+      && pushMarkers.contains(where: { $0.contains("end") || $0.contains("cancel") }) {
+      recordVoipDiagnostic(
+        "voip_end_or_cancel_received",
+        data: [
+          "markers": pushMarkers,
+          "payload": dict,
+        ]
+      )
+      SwiftFlutterCallkitIncomingPlugin.sharedInstance?.endAllCalls()
+      completion()
+      return
+    }
+
+    let nameCaller = (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 conversationUuid = (dict["conversation_uuid"] as? String)
+      ?? (dict["conversationUuid"] as? String)
+      ?? (dict["conversation_id"] as? String)
+      ?? (dict["chat_uuid"] as? String)
+      ?? (dict["uuid"] as? String)
+      ?? 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 isVideo = (dict["isVideo"] as? Bool)
+      ?? (dict["is_video"] as? Bool)
+      ?? true
+
+    var extra: [String: Any] = [:]
+    if !conversationUuid.isEmpty {
+      extra["conversationUuid"] = conversationUuid
+    }
+    if let avatar = dict["caller_avatar"] as? String ?? dict["avatar"] as? String
+      ?? dict["avatarUrl"] as? String
+      ?? dict["avatar_url"] as? String
+      ?? dict["counterpartAvatarUrl"] as? String
+      ?? dict["counterpart_avatar_url"] as? String
+    {
+      extra["counterpartAvatarUrl"] = avatar
+    }
+    if let messageId = dict["message_id"] as? String {
+      extra["messageId"] = messageId
+    }
+    if let roomName = dict["room_name"] as? String {
+      extra["roomName"] = roomName
+    }
+    if let localName = dict["localParticipantName"] as? String
+      ?? dict["local_participant_name"] as? String
+    {
+      extra["localParticipantName"] = localName
+    }
+    if let counterpartName = dict["counterpartName"] as? String {
+      extra["counterpartName"] = counterpartName
+    } else if let counterpartName = dict["counterpart_name"] as? String {
+      extra["counterpartName"] = counterpartName
+    } else if !nameCaller.isEmpty {
+      extra["counterpartName"] = nameCaller
+    }
+
+    let data = flutter_callkit_incoming.Data(
+      id: id,
+      nameCaller: nameCaller,
+      handle: conversationUuid.isEmpty ? nameCaller : conversationUuid,
+      type: isVideo ? 1 : 0
+    )
+    data.extra = extra as NSDictionary
+
+    NSLog(
+      "[EatvioVoIP] report incoming call id=\(id) conversation=\(conversationUuid) state=\(UIApplication.shared.applicationState.rawValue) markers=\(pushMarkers.joined(separator: ",")) payload=\(dict)"
+    )
+    recordVoipDiagnostic(
+      "voip_incoming_received",
+      data: [
+        "callKitId": id,
+        "callKitIdSource": callKitIdSourceName,
+        "conversationUuid": conversationUuid,
+        "nameCaller": nameCaller,
+        "isVideo": isVideo,
+        "markers": pushMarkers,
+        "payload": dict,
+      ]
+    )
+
+    guard let callkitPlugin = SwiftFlutterCallkitIncomingPlugin.sharedInstance else {
+      NSLog("[EatvioVoIP] CallKit plugin missing id=\(id)")
+      recordVoipDiagnostic(
+        "callkit_plugin_missing",
+        data: [
+          "callKitId": id,
+          "conversationUuid": conversationUuid,
+        ]
+      )
+      completion()
+      return
+    }
+
+    callkitPlugin.showCallkitIncoming(
+      data,
+      fromPushKit: true
+    ) {
+      let activeCalls = callkitPlugin.activeCalls()
+      let activeIds = activeCalls.compactMap { $0["id"] as? String }.joined(separator: ",")
+      NSLog(
+        "[EatvioVoIP] report incoming completed id=\(id) activeCallIds=\(activeIds)"
+      )
+      self.recordVoipDiagnostic(
+        "callkit_report_completed",
+        data: [
+          "callKitId": id,
+          "callKitIdSource": callKitIdSourceName,
+          "conversationUuid": conversationUuid,
+          "activeCallIds": activeIds,
+          "activeCallsCount": activeCalls.count,
+        ]
+      )
+      DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+        let delayedActiveCalls = callkitPlugin.activeCalls()
+        let delayedActiveIds = delayedActiveCalls.compactMap { $0["id"] as? String }.joined(separator: ",")
+        self.recordVoipDiagnostic(
+          "callkit_active_calls_delayed",
+          data: [
+            "callKitId": id,
+            "callKitIdSource": callKitIdSourceName,
+            "conversationUuid": conversationUuid,
+            "activeCallIds": delayedActiveIds,
+            "activeCallsCount": delayedActiveCalls.count,
+          ]
+        )
+      }
+      completion()
+    }
+  }
+
+
+  func onAccept(_ call: Call, _ action: CXAnswerCallAction) {
+    storePendingAcceptedCall(call)
+    recordVoipDiagnostic(
+      "callkit_accept_native",
+      data: [
+        "callKitId": call.data.uuid,
+        "conversationUuid": conversationUuid(fromCall: call) ?? "",
+        "data": call.data.toJSON(),
+      ]
+    )
+    voipDiagnosticsChannel?.invokeMethod("acceptedVoipCall", arguments: call.data.toJSON())
+    DispatchQueue.main.async { [weak self] in
+      self?.bringAppToForeground()
+      self?.openAppForAcceptedCall(call)
+    }
+    action.fulfill()
+  }
+
+  func onDecline(_ call: Call, _ action: CXEndCallAction) {
+    action.fulfill()
+  }
+
+  func onEnd(_ call: Call, _ action: CXEndCallAction) {
+    action.fulfill()
+  }
+
+  func onTimeOut(_ call: Call) {}
+
+  func didActivateAudioSession(_ audioSession: AVAudioSession) {}
+
+  func didDeactivateAudioSession(_ audioSession: AVAudioSession) {}
+
+  func providerDidReset() {}
 }
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index c5522c3b..71e74b60 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -31,20 +31,22 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
-	<key>NSAppleMusicUsageDescription</key>
-	<string>This permission is not needed by the app, but it is required by an underlying API. If you see this dialog, contact us.</string>
 	<key>NSCameraUsageDescription</key>
 	<string>Предоставление доступа позволит Вам делать фотографии и добавлять к записям</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Нужен для звука в видеозвонках с консультантом</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>Может использоваться для стабильного поддержания связи во время звонка.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string></string>
+	<string>Может использоваться для стабильного поддержания связи во время звонка.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Предоставление доступа позволит Вам добавлять фото к записям</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UIBackgroundModes</key>
 	<array>
+		<string>audio</string>
+		<string>voip</string>
 		<string>fetch</string>
 		<string>remote-notification</string>
 	</array>
@@ -138,6 +140,14 @@
 				<string>yx5399b03636104c6d920b87c1ad329254</string>
 			</array>
 		</dict>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>Eatvio</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>eatvio</string>
+			</array>
+		</dict>
 	</array>
 </dict>
 </plist>
diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
index 52aa7ae8..904991ee 100644
--- a/ios/fastlane/Fastfile
+++ b/ios/fastlane/Fastfile
@@ -75,16 +75,24 @@ platform :ios do
       xcodeproj: "Runner.xcodeproj",
       build_number: flutter_build_number
     )
+
+    update_code_signing_settings(
+      use_automatic_signing: false,
+      path: "Runner.xcodeproj",
+      team_id: "VL68C36HYS",
+      targets: ["Runner"],
+      code_sign_identity: "Apple Distribution",
+      profile_name: "match AppStore com.eatvioapp.app 1781098260"
+    )
     
     build_app(
       workspace: "Runner.xcworkspace", 
       scheme: "Runner", 
       export_method: "app-store", 
-      codesigning_identity: "Apple Distribution",
+      # codesigning_identity: "Apple Distribution",
+      export_team_id: "VL68C36HYS"
     )
-    
 
-    
     app_store_connect_api_key(
       key_id: "325JS9JCZH", 
       issuer_id: "dfa27d1d-2bb8-4d4d-847e-0b32f9b880b3", 
@@ -92,6 +100,7 @@ platform :ios do
       duration: 1200,
       in_house: false
     )
+  
     
     begin
       upload_to_testflight(
diff --git a/lib/core/app_config.dart b/lib/core/app_config.dart
index df87d259..d410565f 100644
--- a/lib/core/app_config.dart
+++ b/lib/core/app_config.dart
@@ -8,6 +8,7 @@ import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/new_
 import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_cubit.dart';
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
 import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
@@ -35,6 +36,7 @@ class AppConfig {
   /// Список глобальных BlocProvider'ов
   /// Используются lazy: true для отложенной инициализации, чтобы не блокировать старт приложения
   List<BlocProvider> get globalBlocProviders => [
+    BlocProvider<VideoCallSessionCubit>.value(value: sl<VideoCallSessionCubit>()),
     BlocProvider<NewMessagesCubit>(lazy: true, create: (context) => sl<NewMessagesCubit>()),
     BlocProvider<NotificationsCubit>(lazy: true, create: (context) => sl<NotificationsCubit>()),
     BlocProvider<FeedCubit>(lazy: true, create: (context) => sl<FeedCubit>()),
diff --git a/lib/core/app_initializer.dart b/lib/core/app_initializer.dart
index e9e3e9f6..a30364df 100644
--- a/lib/core/app_initializer.dart
+++ b/lib/core/app_initializer.dart
@@ -6,6 +6,7 @@ import 'package:eatvio_app/core/env_config.dart';
 import 'package:eatvio_app/core/error_reporting/error_report_policy.dart';
 import 'package:eatvio_app/core/locator_service.dart' as di;
 import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_fcm_handler.dart';
 import 'package:eatvio_app/firebase_options.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
@@ -47,6 +48,7 @@ class AppInitializer {
         throw TimeoutException('Firebase initialization timeout');
       },
     );
+    VideoCallFcmHandler.registerBackgroundHandler();
     if (sl<AppConfig>().buildType == AppBuildType.prod) {
       try {
         await FirebaseMessaging.instance.requestPermission().timeout(const Duration(seconds: 5));
diff --git a/lib/core/const.dart b/lib/core/const.dart
index 5aab4fd4..6811b710 100644
--- a/lib/core/const.dart
+++ b/lib/core/const.dart
@@ -9,4 +9,5 @@ const List<String> planTypeValues = ['fit', 'slim', 'wellness', 'behavior'];
 const newMessagesChannelName = 'private-new-chat-messages';
 const newNotificationsChannelName = 'private-message-events';
 const directChatChannelName = 'private-direct-chat';
+const presenceDirectChatChannelName = 'presence-direct-chat';
 const thresholdForPagination = 150;
diff --git a/lib/core/device/device_hw_id_provider.dart b/lib/core/device/device_hw_id_provider.dart
new file mode 100644
index 00000000..383aac2b
--- /dev/null
+++ b/lib/core/device/device_hw_id_provider.dart
@@ -0,0 +1,16 @@
+import 'dart:io';
+
+import 'package:device_info_plus/device_info_plus.dart';
+
+abstract final class DeviceHwIdProvider {
+  static Future<String?> current() async {
+    final deviceInfo = DeviceInfoPlugin();
+    if (Platform.isIOS) {
+      return (await deviceInfo.iosInfo).identifierForVendor;
+    }
+    if (Platform.isAndroid) {
+      return (await deviceInfo.androidInfo).id;
+    }
+    return null;
+  }
+}
diff --git a/lib/core/di/cubit_registrations.dart b/lib/core/di/cubit_registrations.dart
index e5a1f91b..d3886779 100644
--- a/lib/core/di/cubit_registrations.dart
+++ b/lib/core/di/cubit_registrations.dart
@@ -52,6 +52,8 @@ import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_
 import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart';
 import 'package:eatvio_app/features/user_details/presentation/cubit/user_details_cubit.dart';
+import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
 import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart';
 import 'package:get_it/get_it.dart';
 
@@ -72,6 +74,18 @@ class CubitRegistrations {
     sl.registerLazySingleton<ProfileAvatarCubit>(() => ProfileAvatarCubit(profileRepository: sl()));
     sl.registerLazySingleton<ChatsCubit>(() => ChatsCubit(chatRepository: sl(), wsManager: sl(), profileRepository: sl()));
     sl.registerLazySingleton<InternetConnectionCubit>(() => InternetConnectionCubit());
+    sl.registerLazySingleton<VideoCallManager>(
+      () => VideoCallManager(
+        videoCallRepository: sl(),
+        profileRepository: sl(),
+      ),
+    );
+    sl.registerLazySingleton<VideoCallSessionCubit>(
+      () => VideoCallSessionCubit(
+        videoCallManager: sl(),
+        systemPipCoordinator: sl(),
+      ),
+    );
   }
 
   /// Регистрация Cubit'ов как фабрик
diff --git a/lib/core/di/service_registrations.dart b/lib/core/di/service_registrations.dart
index bcbc4a6b..27152661 100644
--- a/lib/core/di/service_registrations.dart
+++ b/lib/core/di/service_registrations.dart
@@ -36,7 +36,9 @@ import 'package:eatvio_app/features/recipe/services/my_recipes_service.dart';
 import 'package:eatvio_app/features/registration/services/registration_service.dart';
 import 'package:eatvio_app/features/registration_v2/services/registration_service_v2.dart';
 import 'package:eatvio_app/features/settings/services/settings_service.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_callkit_coordinator.dart';
 import 'package:eatvio_app/features/video_calls/services/video_call_service.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_system_pip_coordinator.dart';
 import 'package:get_it/get_it.dart';
 
 /// Регистрация всех Service в системе внедрения зависимостей
@@ -76,6 +78,12 @@ class ServiceRegistrations {
     sl.registerLazySingleton<CreatePlanService>(() => CreatePlanService(sl()));
     sl.registerLazySingleton<NotificationsService>(() => NotificationsService(sl()));
     sl.registerLazySingleton<FirebaseApi>(() => FirebaseApi(errorReporter: sl()));
+    sl.registerLazySingleton<VideoCallCallKitCoordinator>(
+      () => VideoCallCallKitCoordinator(firebaseApi: sl()),
+    );
+    sl.registerLazySingleton<VideoCallSystemPipCoordinator>(
+      () => VideoCallSystemPipCoordinator(),
+    );
     sl.registerLazySingleton<ResetPasswordService>(() => ResetPasswordService(sl()));
     sl.registerLazySingleton<BlockedUserService>(() => BlockedUserService(sl()));
     sl.registerLazySingleton<CommentsService>(() => CommentsService(sl()));
diff --git a/lib/core/error_reporting/error_report_policy.dart b/lib/core/error_reporting/error_report_policy.dart
index fccc80b7..b7ff92ec 100644
--- a/lib/core/error_reporting/error_report_policy.dart
+++ b/lib/core/error_reporting/error_report_policy.dart
@@ -44,8 +44,8 @@ class ErrorReportPolicy {
       case DioExceptionType.connectionTimeout:
       case DioExceptionType.sendTimeout:
       case DioExceptionType.receiveTimeout:
-      case DioExceptionType.connectionError:
       case DioExceptionType.transformTimeout:
+      case DioExceptionType.connectionError:
         return true;
       case DioExceptionType.unknown:
       case DioExceptionType.badResponse:
diff --git a/lib/core/firebase_api.dart b/lib/core/firebase_api.dart
index 2c8c64c8..a371faa3 100644
--- a/lib/core/firebase_api.dart
+++ b/lib/core/firebase_api.dart
@@ -12,6 +12,7 @@ import 'package:eatvio_app/core/token_storage.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/services.dart' show MethodChannel, PlatformException;
 import 'package:eatvio_app/core/error_reporting/error_reporter.dart';
+import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart';
 
 class FirebaseApi {
   final ErrorReporter _errorReporter;
@@ -87,6 +88,9 @@ class FirebaseApi {
             throw TimeoutException('registerPushToken timeout');
           },
         );
+        if (Platform.isIOS) {
+          await _registerIosVoipPushToken();
+        }
       } catch (e, st) {
         log(e.toString(), stackTrace: st);
         await _errorReporter.report(e, st, origin: 'FirebaseApi');
@@ -95,6 +99,88 @@ class FirebaseApi {
     }
   }
 
+
+  Future<void> unregisterPushTokens() async {
+    if (!await TokenStorage.haveTokenInStorage()) return;
+    try {
+      await unregisterPushToken();
+    } catch (_) {}
+    if (Platform.isIOS) {
+      try {
+        await _unregisterIosVoipPushToken();
+      } catch (_) {}
+    }
+  }
+
+  Future<void> unregisterPushToken() async {
+    if (!await TokenStorage.haveTokenInStorage()) return;
+    try {
+      final isHuawei = Platform.isAndroid ? await _isHuaweiDevice() : false;
+      final platform = Platform.isIOS ? 'ios' : (isHuawei ? 'huawei' : 'android');
+      final token = (await getToken()) ?? '';
+      await sl<Dio>().post(
+        '/api/profile/notification/token/unregister',
+        data: {
+          'platform': platform,
+          'token': token,
+        },
+      ).timeout(
+        const Duration(seconds: 10),
+        onTimeout: () {
+          throw TimeoutException('unregisterPushToken timeout');
+        },
+      );
+    } catch (e, st) {
+      log(e.toString(), stackTrace: st);
+      await _errorReporter.report(e, st, origin: 'FirebaseApi');
+    }
+  }
+
+  Future<void> _registerIosVoipPushToken() async {
+    try {
+      final token = (await FlutterCallkitIncoming.getDevicePushTokenVoIP())?.trim();
+      if (token == null || token.isEmpty) return;
+
+      final deviceInfo = DeviceInfoPlugin();
+      await sl<Dio>().post(
+        '/api/profile/notification/token/voip/register',
+        data: {
+          'platform': 'ios',
+          'hw_id': (await deviceInfo.iosInfo).identifierForVendor,
+          'token': token,
+        },
+      ).timeout(
+        const Duration(seconds: 10),
+        onTimeout: () {
+          throw TimeoutException('registerPushToken voip timeout');
+        },
+      );
+    } catch (e, st) {
+      log(e.toString(), stackTrace: st);
+      await _errorReporter.report(e, st, origin: 'FirebaseApi');
+    }
+  }
+
+  Future<void> _unregisterIosVoipPushToken() async {
+    try {
+      final token = (await FlutterCallkitIncoming.getDevicePushTokenVoIP())?.trim() ?? '';
+      await sl<Dio>().post(
+        '/api/profile/notification/token/voip/unregister',
+        data: {
+          'token': token,
+        },
+      ).timeout(
+        const Duration(seconds: 10),
+        onTimeout: () {
+          throw TimeoutException('unregisterPushToken voip timeout');
+        },
+      );
+    } catch (e, st) {
+      log(e.toString(), stackTrace: st);
+      await _errorReporter.report(e, st, origin: 'FirebaseApi');
+    }
+  }
+
   Future<bool> _isHuaweiDevice() async {
     if (!Platform.isAndroid) return false;
     try {
diff --git a/lib/core/notifications/push_navigation_handler.dart b/lib/core/notifications/push_navigation_handler.dart
index a8d1d5d0..22191b85 100644
--- a/lib/core/notifications/push_navigation_handler.dart
+++ b/lib/core/notifications/push_navigation_handler.dart
@@ -1,6 +1,13 @@
 import 'dart:developer' as developer;
 
+import 'dart:async';
+
 import 'package:eatvio_app/core/app_router.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.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_ended_push_payload.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_notification_navigator.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_push_payload.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
@@ -50,7 +57,37 @@ class PushNavigationHandler {
   }
 
   static void _handleMessageInternal(RemoteMessage message, {required String source}) {
-    final data = message.data;
+    final data = Map<String, dynamic>.from(message.data);
+
+    final endedPayload = VideoCallEndedPushPayload.tryParse(data);
+    if (endedPayload != null) {
+      developer.log(
+        'PushNavigationHandler: dismiss incoming call UI, source=$source',
+        name: 'PushNavigationHandler',
+      );
+      unawaited(VideoCallEndedPushHandler.dismissIncomingCallUi());
+      return;
+    }
+
+    final videoCallPayload = VideoCallPushPayload.tryParse(data);
+    if (videoCallPayload != null) {
+      developer.log(
+        'PushNavigationHandler: opening incoming video call, source=$source, conversation=${videoCallPayload.conversationUuid}',
+        name: 'PushNavigationHandler',
+      );
+      unawaited(
+        VideoCallNotificationNavigator.openIncomingCall(
+          conversationUuid: videoCallPayload.conversationUuid,
+          counterpartName: videoCallPayload.counterpartName,
+          counterpartAvatarUrl: videoCallPayload.counterpartAvatarUrl,
+          localParticipantName: videoCallPayload.localParticipantName,
+          counterpartIsConsultant: videoCallPayload.counterpartIsConsultant,
+          entryMode: VideoCallEntryMode.incomingAccepted,
+        ),
+      );
+      return;
+    }
+
     final actionUrl = data['action_url'] as String?;
     if (actionUrl == null || actionUrl.isEmpty) {
       developer.log('PushNavigationHandler: no action_url in message data, source=$source, data=$data', name: 'PushNavigationHandler');
diff --git a/lib/core/routing/other_routes.dart b/lib/core/routing/other_routes.dart
index 91b6fab3..a97124f9 100644
--- a/lib/core/routing/other_routes.dart
+++ b/lib/core/routing/other_routes.dart
@@ -15,6 +15,7 @@ import 'package:eatvio_app/features/chat/presentation/pages/empty_chat_screen.da
 import 'package:eatvio_app/features/chat/presentation/pages/payment_screen.dart';
 import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
 import 'package:eatvio_app/features/video_calls/presentation/pages/video_call_screen.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart';
 import 'package:eatvio_app/features/consultant_rating/presentation/consultant_rating_screen.dart';
@@ -244,7 +245,13 @@ class OtherRoutes {
             return VideoCallScreen(
               conversationUuid: extra['conversationUuid'] as String,
               counterpartName: extra['counterpartName'] as String?,
+              counterpartAvatarUrl: extra['counterpartAvatarUrl'] as String?,
+              counterpartUserId: extra['counterpartUserId'] as int?,
+              counterpartIsOnline: extra['counterpartIsOnline'] as bool?,
+              counterpartLastSeenText: extra['counterpartLastSeenText'] as String?,
+              counterpartIsConsultant: extra['counterpartIsConsultant'] as bool?,
               localParticipantName: extra['localParticipantName'] as String?,
+              entryMode: _videoCallEntryModeFromRouteExtra(extra['entryMode']),
               onBackToChat: extra['onBackToChat'] as void Function()?,
               onHangUp: extra['onHangUp'] as void Function()?,
             );
@@ -258,7 +265,15 @@ class OtherRoutes {
       ),
 
       // Consultant routes
-      GoRoute(path: RouteConstants.becomeConsultantScreen, name: 'becomeConsultantScreen', builder: (context, state) => const BecomeConsultantScreen()),
+      GoRoute(
+        path: RouteConstants.becomeConsultantScreen,
+        name: 'becomeConsultantScreen',
+        builder: (context, state) {
+          final data = state.extra as Map<String, dynamic>?;
+          final slug = data?['slug'] as String?;
+          return BecomeConsultantScreen(slug: slug);
+        },
+      ),
       GoRoute(
         path: RouteConstants.stepperBecomeConsultantScreen,
         name: 'stepperBecomeConsultantScreen',
@@ -266,7 +281,12 @@ class OtherRoutes {
           final data = state.extra as Map<String, dynamic>;
           final slug = data['slug'] as String?;
           final isCanceled = data['isCanceled'] as bool?;
-          return StepperBecomeConsultantScreen(slug: slug, isCanceled: isCanceled);
+          final isNewRegistration = data['isNewRegistration'] as bool? ?? false;
+          return StepperBecomeConsultantScreen(
+            slug: slug,
+            isCanceled: isCanceled,
+            isNewRegistration: isNewRegistration,
+          );
         },
       ),
       GoRoute(path: RouteConstants.calendarScreen, name: 'calendarScreen', builder: (context, state) => const CalendarScreen()),
@@ -339,3 +359,11 @@ class OtherRoutes {
     ];
   }
 }
+
+VideoCallEntryMode _videoCallEntryModeFromRouteExtra(Object? raw) {
+  if (raw is VideoCallEntryMode) return raw;
+  if (raw == VideoCallEntryMode.incomingAccepted.name) {
+    return VideoCallEntryMode.incomingAccepted;
+  }
+  return VideoCallEntryMode.outgoing;
+}
diff --git a/lib/core/theme/custom_text_style.dart b/lib/core/theme/custom_text_style.dart
index f0d0661b..1e09ba93 100644
--- a/lib/core/theme/custom_text_style.dart
+++ b/lib/core/theme/custom_text_style.dart
@@ -80,6 +80,48 @@ class CustomTextStyles {
   static TextStyle get titleSmallSecondaryContainer_1 => theme.textTheme.titleSmall!.copyWith(color: theme.colorScheme.secondaryContainer);
 
   static TextStyle get titleSmallSegoeUIOnPrimary => theme.textTheme.titleSmall!.segoeUI.copyWith(color: theme.colorScheme.onPrimary);
+
+  static TextStyle get videoCallFlowPlaceholderTitle => theme.textTheme.headlineSmall!.copyWith(
+        fontWeight: FontWeight.w600,
+        height: 32 / 24,
+        color: appTheme.black900,
+      );
+
+  static TextStyle get videoCallFlowPlaceholderConnectionLostBody => theme.textTheme.bodyLarge!.copyWith(
+        fontWeight: FontWeight.w400,
+        fontSize: 16,
+        height: 24 / 16,
+        letterSpacing: 0.5,
+        color: appTheme.black900,
+      );
+
+  static TextStyle get videoCallFlowPlaceholderConnectingSubtitle => theme.textTheme.bodyMedium!.copyWith(
+        fontSize: 13,
+        fontWeight: FontWeight.w400,
+        height: 24 / 13,
+        letterSpacing: 0.5,
+        color: appTheme.black900,
+      );
+
+  static TextStyle get videoCallFlowPlaceholderReconnectingSubtitle => theme.textTheme.bodyMedium!.copyWith(
+        fontSize: 14,
+        fontWeight: FontWeight.w500,
+        height: 24 / 14,
+        color: appTheme.gray600,
+      );
+
+  static TextStyle get videoCallFlowPlaceholderConnectionLostDetail => theme.textTheme.bodyMedium!.copyWith(
+        fontSize: 13,
+        fontWeight: FontWeight.w400,
+        height: 1.35,
+        color: appTheme.red,
+      );
+
+  static TextStyle get videoCallFlowPlaceholderFilledButtonLabel => theme.textTheme.titleMedium!.copyWith(
+        fontSize: 16,
+        fontWeight: FontWeight.w600,
+        color: appTheme.whiteA700,
+      );
 }
 
 extension on TextStyle {
diff --git a/lib/core/websockets/ws_manager.dart b/lib/core/websockets/ws_manager.dart
index cb90f4f8..9ab8fe19 100644
--- a/lib/core/websockets/ws_manager.dart
+++ b/lib/core/websockets/ws_manager.dart
@@ -26,18 +26,28 @@ class WsManager {
   PrivateChannel? _privateNotificationChannel;
   PrivateChannel? _privateMessagesChannel;
   PrivateChannel? _privateDirectChatChannel;
+  PresenceChannel? _presenceDirectChatChannel;
+
+  StreamSubscription? _presenceMemberAddedSubscription;
+  StreamSubscription? _presenceMemberRemovedSubscription;
+  StreamSubscription? _presenceSubscriptionSucceededSubscription;
+  final List<_PresenceDirectChatListener> _presenceDirectChatListeners = [];
+  bool _presenceChannelEventsBound = false;
 
   StreamSubscription? _lifecycleSubscription;
   StreamSubscription? _eventSubscription;
   StreamSubscription? _connectionEstablishedSubscription;
 
+  Stream<ChannelReadEvent>? _directChatStream;
+  Stream<ChannelReadEvent>? _clientTypingStream;
+
   Stream<ChannelReadEvent>? get newMessagesStream => _privateMessagesChannel?.bind('App\\Events\\ChatMessageUpdated');
 
   Stream<ChannelReadEvent>? get newNotificationsStream => _privateNotificationChannel?.bind('Illuminate\\Notifications\\Events\\BroadcastNotificationCreated');
 
-  Stream<ChannelReadEvent>? get directChatStream => _privateDirectChatChannel?.bind('App\\Events\\ChatMessageUpdated');
+  Stream<ChannelReadEvent>? get directChatStream => _directChatStream;
 
-  Stream<ChannelReadEvent>? get clientTypingStream => _privateDirectChatChannel?.bind('client-typing');
+  Stream<ChannelReadEvent>? get clientTypingStream => _clientTypingStream;
 
   Future<void> initialize() async {
     if (client == null) {
@@ -100,6 +110,8 @@ class WsManager {
           if (data == PusherChannelsClientLifeCycleState.establishedConnection) {
             _unsubscribe();
             _subscribe();
+            _privateDirectChatChannel?.subscribe();
+            _presenceDirectChatChannel?.subscribe();
           }
         });
         _eventSubscription = client?.eventStream.listen((event) {
@@ -163,6 +175,7 @@ class WsManager {
   }
 
   Future<void> initPrivateDirectChatChannel(String chatId) async {
+    _privateDirectChatChannel?.unsubscribe();
     final token = await TokenStorage.getTokenFromStorage();
     _privateDirectChatChannel = client?.privateChannel(
       '$directChatChannelName.$chatId',
@@ -173,6 +186,109 @@ class WsManager {
         },
       ),
     );
+    _directChatStream = _privateDirectChatChannel?.bind('App\\Events\\ChatMessageUpdated');
+    _clientTypingStream = _privateDirectChatChannel?.bind('client-typing');
+  }
+
+  Future<void> initPresenceDirectChatChannel(String chatId) async {
+    final token = await TokenStorage.getTokenFromStorage();
+    _presenceDirectChatChannel = client?.presenceChannel(
+      '$presenceDirectChatChannelName.$chatId',
+      authorizationDelegate: EndpointAuthorizableChannelTokenAuthorizationDelegate.forPresenceChannel(
+        authorizationEndpoint: Uri.parse('${sl<AppConfig>().baseUrl}/broadcasting/auth'),
+        headers: {
+          'Authorization': 'Bearer $token',
+        },
+      ),
+    );
+  }
+
+  void addPresenceDirectChatListener({
+    required int counterpartUserId,
+    required void Function(bool isOnline) onCounterpartOnlineChanged,
+  }) {
+    final channel = _presenceDirectChatChannel;
+    if (channel == null) return;
+
+    _presenceDirectChatListeners.add(
+      _PresenceDirectChatListener(
+        counterpartUserId: counterpartUserId,
+        onCounterpartOnlineChanged: onCounterpartOnlineChanged,
+      ),
+    );
+
+    _bindPresenceChannelEventsIfNeeded();
+    channel.subscribe();
+    _emitCounterpartPresence(counterpartUserId);
+  }
+
+  void removePresenceDirectChatListener(
+    void Function(bool isOnline) onCounterpartOnlineChanged,
+  ) {
+    _presenceDirectChatListeners.removeWhere(
+      (listener) => listener.onCounterpartOnlineChanged == onCounterpartOnlineChanged,
+    );
+    if (_presenceDirectChatListeners.isEmpty) {
+      unsubscribePresenceDirectChatChannel();
+    }
+  }
+
+  void _bindPresenceChannelEventsIfNeeded() {
+    if (_presenceChannelEventsBound) return;
+    final channel = _presenceDirectChatChannel;
+    if (channel == null) return;
+
+    _presenceChannelEventsBound = true;
+
+    _presenceSubscriptionSucceededSubscription =
+        channel.whenSubscriptionSucceeded().listen((_) {
+      final counterpartIds = _presenceDirectChatListeners
+          .map((listener) => listener.counterpartUserId)
+          .toSet();
+      for (final counterpartUserId in counterpartIds) {
+        _emitCounterpartPresence(counterpartUserId);
+      }
+    });
+    _presenceMemberAddedSubscription = channel.whenMemberAdded().listen((event) {
+      final memberUserId = _parsePresenceMemberUserId(event.data);
+      if (memberUserId == null) return;
+      _notifyPresenceListeners(memberUserId, isOnline: true);
+    });
+    _presenceMemberRemovedSubscription = channel.whenMemberRemoved().listen((event) {
+      final memberUserId = _parsePresenceMemberUserId(event.data);
+      if (memberUserId == null) return;
+      _notifyPresenceListeners(memberUserId, isOnline: false);
+    });
+  }
+
+  void _emitCounterpartPresence(int counterpartUserId) {
+    final channel = _presenceDirectChatChannel;
+    if (channel == null) return;
+    final members = channel.state?.members;
+    if (members == null) return;
+    final isOnline = members.getMemberInfo(counterpartUserId.toString()) != null;
+    _notifyPresenceListeners(counterpartUserId, isOnline: isOnline);
+  }
+
+  void _notifyPresenceListeners(int counterpartUserId, {required bool isOnline}) {
+    for (final listener in _presenceDirectChatListeners) {
+      if (listener.counterpartUserId == counterpartUserId) {
+        listener.onCounterpartOnlineChanged(isOnline);
+      }
+    }
+  }
+
+  int? _parsePresenceMemberUserId(String? data) {
+    if (data == null || data.isEmpty) return null;
+    try {
+      final decoded = jsonDecode(data);
+      if (decoded is! Map) return null;
+      final rawId = decoded['user_id'] ?? decoded['id'];
+      if (rawId == null) return null;
+      return int.tryParse(rawId.toString());
+    } catch (_) {
+      return null;
+    }
   }
 
   void _subscribe() {
@@ -191,6 +307,21 @@ class WsManager {
 
   void unsubscribeDirectChatChannel() {
     _privateDirectChatChannel?.unsubscribe();
+    _directChatStream = null;
+    _clientTypingStream = null;
+  }
+
+  void unsubscribePresenceDirectChatChannel() {
+    _presenceSubscriptionSucceededSubscription?.cancel();
+    _presenceMemberAddedSubscription?.cancel();
+    _presenceMemberRemovedSubscription?.cancel();
+    _presenceSubscriptionSucceededSubscription = null;
+    _presenceMemberAddedSubscription = null;
+    _presenceMemberRemovedSubscription = null;
+    _presenceDirectChatListeners.clear();
+    _presenceChannelEventsBound = false;
+    _presenceDirectChatChannel?.unsubscribe();
+    _presenceDirectChatChannel = null;
   }
 
   Future<void> clear() async {
@@ -204,10 +335,23 @@ class WsManager {
     client = null;
     userId = null;
     _privateDirectChatChannel?.unsubscribe();
+    unsubscribePresenceDirectChatChannel();
     _privateMessagesChannel?.unsubscribe();
     _privateNotificationChannel?.unsubscribe();
     _privateDirectChatChannel = null;
     _privateMessagesChannel = null;
     _privateNotificationChannel = null;
+    _directChatStream = null;
+    _clientTypingStream = null;
   }
 }
+
+class _PresenceDirectChatListener {
+  const _PresenceDirectChatListener({
+    required this.counterpartUserId,
+    required this.onCounterpartOnlineChanged,
+  });
+
+  final int counterpartUserId;
+  final void Function(bool isOnline) onCounterpartOnlineChanged;
+}
diff --git a/lib/core/widgets/custom_popup.dart b/lib/core/widgets/custom_popup.dart
index dbe0090b..51f6f4ff 100644
--- a/lib/core/widgets/custom_popup.dart
+++ b/lib/core/widgets/custom_popup.dart
@@ -6,6 +6,7 @@ import 'package:eatvio_app/core/utils/toasts.dart';
 import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
 import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit.dart';
 import 'package:eatvio_app/features/complaining/presentation/complaining_bottom_sheet.dart';
+import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
 import 'package:eatvio_app/features/feed/models/recipes_model.dart';
@@ -13,9 +14,11 @@ import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_cub
 import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_cubit.dart';
 import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart';
 import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.dart';
+import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:share_plus/share_plus.dart';
@@ -30,6 +33,7 @@ class CustomPopup extends StatelessWidget {
   final Recipe? recipe;
   final Diet? diet;
   final String userSlug;
+  final VoidCallback? onPostsChanged;
 
   const CustomPopup({
     super.key,
@@ -41,7 +45,8 @@ class CustomPopup extends StatelessWidget {
     this.feedBlogPostModel,
     this.recipe,
     this.diet,
-    required this.userSlug
+    required this.userSlug,
+    this.onPostsChanged,
   });
 
   @override
@@ -103,7 +108,8 @@ class CustomPopup extends StatelessWidget {
       if (complainedContentType == ComplainedContent.posts) {
         addItem('assets/icons/edit_paint.svg', 'Редактировать', () async {
           if (complainedContentType == ComplainedContent.posts) {
-            GoRouter.of(context).pushNamed('blogPostCreateScreen', extra: feedBlogPostModel);
+            await GoRouter.of(context).pushNamed('blogPostCreateScreen', extra: feedBlogPostModel);
+            onPostsChanged?.call();
           }
         });
       }
@@ -114,7 +120,14 @@ class CustomPopup extends StatelessWidget {
             showErrorDialog(context, title: S.current.could_not_delete_blog_post);
             return;
           }
-          showSuccessToast('Пост удален, обновите ленту');
+          onPostsChanged?.call();
+          ProfileCubit.myProfileCubit?.reloadBlogPosts();
+          if (context.mounted) {
+            try {
+              context.read<FeedCubit>().loadFeedBlogPostList();
+            } catch (_) {}
+          }
+          showSuccessToast('Пост удален');
         } else if (complainedContentType == ComplainedContent.recipe) {
           final result = await sl<RecipesCubit>().deleteRecipe(slug!);
           if (!result && context.mounted) {
diff --git a/lib/features/blog_post/presentation/pages/blog_post_screen.dart b/lib/features/blog_post/presentation/pages/blog_post_screen.dart
index ce691fb9..915a61fb 100644
--- a/lib/features/blog_post/presentation/pages/blog_post_screen.dart
+++ b/lib/features/blog_post/presentation/pages/blog_post_screen.dart
@@ -1,4 +1,4 @@
-import 'package:cached_network_image/cached_network_image.dart';
+import 'package:dismissible_page/dismissible_page.dart';
 import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/enums/complained_content.dart';
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
@@ -9,7 +9,10 @@ import 'package:eatvio_app/features/blog_post/presentation/cubit/blog_post_cubit
 import 'package:eatvio_app/features/blog_post/presentation/cubit/blog_post_state.dart';
 import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart';
 import 'package:eatvio_app/core/comments/comments_cubit/comments_state.dart';
+import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_mapper.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
+import 'package:eatvio_app/features/feed/presentation/widgets/blog_post_media_content.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
@@ -33,6 +36,7 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
   final CommentsCubit commentsCubit = sl<CommentsCubit>();
   final textEditingController = TextEditingController();
   int? replyId;
+  int currentGalleryIndex = 0;
 
   @override
   void initState() {
@@ -40,6 +44,10 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
     super.initState();
   }
 
+  void _openGallery(List<String> imageUrls, int index, {Object? heroTag}) {
+    context.pushTransparentRoute(rootNavigator: true, PhotoViewScreen(imageUrls: imageUrls, index: index, heroTag: heroTag));
+  }
+
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
@@ -242,8 +250,30 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
                             child: MarkdownHtmlWidget(markdownText: blogPostState.blogPostModel!.description),
                           ),
                         const SizedBox(height: 8),
-                        if (blogPostState.blogPostModel?.image.isNotEmpty ?? false)
-                          CachedNetworkImage(imageUrl: '${sl<AppConfig>().baseUrl}/storage/${blogPostState.blogPostModel?.image ?? ''}'),
+                        Builder(
+                          builder: (context) {
+                            final post = blogPostState.blogPostModel;
+                            if (post == null) {
+                              return const SizedBox.shrink();
+                            }
+                            final imageUrl = PostFeedMapper.resolveMediaUrl(post.image);
+                            final embedUrl = post.videoEmbedUrl?.trim();
+                            return BlogPostMediaContent(
+                              galleryImages: post.images,
+                              imageUrl: imageUrl,
+                              videoEmbedUrl: embedUrl != null && embedUrl.isNotEmpty ? embedUrl : null,
+                              videoUrlThumb: post.videoUrlThumb != null ? PostFeedMapper.resolveMediaUrl(post.videoUrlThumb) : null,
+                              currentGalleryIndex: currentGalleryIndex,
+                              heroTag: 'blog-post-screen-${post.id}-cover',
+                              onOpenGallery: (urls, index) => _openGallery(urls, index, heroTag: urls.length == 1 ? 'blog-post-screen-${post.id}-cover' : null),
+                              onGalleryChanged: (index) {
+                                setState(() {
+                                  currentGalleryIndex = index;
+                                });
+                              },
+                            );
+                          },
+                        ),
                         Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
                           child: Row(
diff --git a/lib/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit.dart b/lib/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit.dart
index 5d04bdaf..33a584ac 100644
--- a/lib/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit.dart
+++ b/lib/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit.dart
@@ -3,38 +3,184 @@ import 'dart:developer';
 import 'package:eatvio_app/core/error_reporting/report_from.dart';
 import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_state.dart';
 import 'package:eatvio_app/features/blog_post_create/repositories/blog_post_repository.dart';
+import 'package:eatvio_app/features/blog_post_create/validation/blog_post_form_validator.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_image_compress/flutter_image_compress.dart';
 
 class BlogPostCreateCubit extends Cubit<BlogPostCreateState> {
   final BlogPostRepository blogPostRepository;
 
-  BlogPostCreateCubit({required this.blogPostRepository}) : super(const BlogPostCreateState());
+  BlogPostCreateCubit({required this.blogPostRepository})
+    : super(const BlogPostCreateState());
+
+  void clearTitleError() {
+    if (state.titleError != null || state.formError != null) {
+      emit(state.copyWith(titleError: null, formError: null));
+    }
+  }
+
+  void clearDescriptionError() {
+    if (state.descriptionError != null || state.formError != null) {
+      emit(state.copyWith(descriptionError: null, formError: null));
+    }
+  }
+
+  void clearVideoUrlError() {
+    if (state.videoUrlError != null || state.formError != null) {
+      emit(state.copyWith(videoUrlError: null, formError: null));
+    }
+  }
+
+  void clearImagesError() {
+    if (state.imagesError != null || state.formError != null) {
+      emit(state.copyWith(imagesError: null, formError: null));
+    }
+  }
+
+  void resetFormErrors() {
+    if (!state.hasValidationErrors &&
+        !state.isSuccess &&
+        state.errorMessage == null &&
+        !state.isLoading) {
+      return;
+    }
+    emit(const BlogPostCreateState());
+  }
+
+  /// Validates form fields and emits error messages on [BlogPostCreateState].
+  /// Returns `true` when the form is valid.
+  bool validateForm({
+    required String title,
+    required String description,
+    required String videoUrl,
+    required int imageCount,
+    Iterable<String> imagePaths = const [],
+  }) {
+    final titleError = BlogPostFormValidator.title(title);
+    final descriptionError = BlogPostFormValidator.description(description);
+    final videoUrlError = BlogPostFormValidator.videoUrl(videoUrl);
+    final imagesError =
+        BlogPostFormValidator.galleryCount(imageCount) ??
+        BlogPostFormValidator.imagePaths(imagePaths);
+    final formError = BlogPostFormValidator.contentRequiredMessage(
+      title: title,
+      description: description,
+      videoUrl: videoUrl,
+      imageCount: imageCount,
+    );
+
+    final hasFieldErrors =
+        titleError != null ||
+        descriptionError != null ||
+        videoUrlError != null ||
+        imagesError != null;
+    final resolvedFormError = hasFieldErrors ? null : formError;
+
+    emit(
+      state.copyWith(
+        titleError: titleError,
+        descriptionError: descriptionError,
+        videoUrlError: videoUrlError,
+        imagesError: imagesError,
+        // Form-level message only when individual fields are fine but content is empty.
+        formError: resolvedFormError,
+        isSuccess: false,
+        errorMessage: null,
+      ),
+    );
+
+    return titleError == null &&
+        descriptionError == null &&
+        videoUrlError == null &&
+        imagesError == null &&
+        resolvedFormError == null;
+  }
+
+  Future<bool> createBlogPost({
+    String? title,
+    String? videoUrl,
+    String? description,
+    List<XFile> images = const [],
+  }) async {
+    final trimmedTitle = title?.trim() ?? '';
+    final trimmedDescription = description?.trim() ?? '';
+    final trimmedVideoUrl = videoUrl?.trim() ?? '';
+
+    final isValid = validateForm(
+      title: trimmedTitle,
+      description: trimmedDescription,
+      videoUrl: trimmedVideoUrl,
+      imageCount: images.length,
+      imagePaths: images.map((image) => image.path),
+    );
+    if (!isValid) {
+      return false;
+    }
 
-  Future<bool> createBlogPost({String? title, String? videoUrl, String? description, XFile? image}) async {
     try {
-      emit(const BlogPostCreateState.loading());
-      await blogPostRepository.createBlogPost(title, videoUrl, description, image);
-      emit(const BlogPostCreateState.loaded());
+      emit(
+        state.copyWith(isLoading: true, isSuccess: false, errorMessage: null),
+      );
+      await blogPostRepository.createBlogPost(
+        title: trimmedTitle.isEmpty ? null : trimmedTitle,
+        videoUrl: trimmedVideoUrl.isEmpty ? null : trimmedVideoUrl,
+        description: trimmedDescription.isEmpty ? null : trimmedDescription,
+        images: images,
+      );
+      emit(const BlogPostCreateState(isSuccess: true));
       return true;
     } catch (error, stackTrace) {
       log('BlogPostCreateCubit: $error', stackTrace: stackTrace);
       await reportFrom(error, stackTrace, this);
-      emit(BlogPostCreateState.error(errorMessage: error.toString()));
+      emit(BlogPostCreateState(errorMessage: error.toString()));
       return false;
     }
   }
 
-  Future<bool> updateBlogPost({required int id, String? title, String? videoUrl, String? description, XFile? image, String? oldImageUrl}) async {
+  Future<bool> updateBlogPost({
+    required int id,
+    String? title,
+    String? videoUrl,
+    String? description,
+    List<int> existingMediaIds = const [],
+    List<XFile> newImages = const [],
+    List<int> mediaIdsToDelete = const [],
+  }) async {
+    final trimmedTitle = title?.trim() ?? '';
+    final trimmedDescription = description?.trim() ?? '';
+    final trimmedVideoUrl = videoUrl?.trim() ?? '';
+    final imageCount = existingMediaIds.length + newImages.length;
+
+    final isValid = validateForm(
+      title: trimmedTitle,
+      description: trimmedDescription,
+      videoUrl: trimmedVideoUrl,
+      imageCount: imageCount,
+      imagePaths: newImages.map((image) => image.path),
+    );
+    if (!isValid) {
+      return false;
+    }
+
     try {
-      emit(const BlogPostCreateState.loading());
-      await blogPostRepository.updateBlogPost(id, title, videoUrl, description, image, oldImageUrl);
-      emit(const BlogPostCreateState.loaded());
+      emit(
+        state.copyWith(isLoading: true, isSuccess: false, errorMessage: null),
+      );
+      await blogPostRepository.updateBlogPost(
+        id: id,
+        title: trimmedTitle,
+        videoUrl: trimmedVideoUrl,
+        description: trimmedDescription,
+        existingMediaIds: existingMediaIds,
+        newImages: newImages,
+        mediaIdsToDelete: mediaIdsToDelete,
+      );
+      emit(const BlogPostCreateState(isSuccess: true));
       return true;
     } catch (error, stackTrace) {
       log('BlogPostCreateCubit: $error', stackTrace: stackTrace);
       await reportFrom(error, stackTrace, this);
-      emit(BlogPostCreateState.error(errorMessage: error.toString()));
+      emit(BlogPostCreateState(errorMessage: error.toString()));
       return false;
     }
   }
diff --git a/lib/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_state.dart b/lib/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_state.dart
index 05919499..d4445fbf 100644
--- a/lib/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_state.dart
+++ b/lib/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_state.dart
@@ -4,13 +4,23 @@ part 'blog_post_create_state.freezed.dart';
 
 @freezed
 abstract class BlogPostCreateState with _$BlogPostCreateState {
-  const factory BlogPostCreateState() = _BlogPostCreateState;
+  const BlogPostCreateState._();
 
-  const factory BlogPostCreateState.loading() = BlogPostCreateStateLoading;
+  const factory BlogPostCreateState({
+    @Default(false) bool isLoading,
+    @Default(false) bool isSuccess,
+    String? errorMessage,
+    String? titleError,
+    String? descriptionError,
+    String? videoUrlError,
+    String? imagesError,
+    String? formError,
+  }) = _BlogPostCreateState;
 
-  const factory BlogPostCreateState.loaded() = BlogPostCreateStateLoaded;
-
-  const factory BlogPostCreateState.error({
-    required String errorMessage,
-  }) = BlogPostCreateStateError;
+  bool get hasValidationErrors =>
+      titleError != null ||
+      descriptionError != null ||
+      videoUrlError != null ||
+      imagesError != null ||
+      formError != null;
 }
diff --git a/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart b/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
index 6da09b9e..b3c9b42c 100644
--- a/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
+++ b/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:io';
+
 import 'package:eatvio_app/app_keys.dart';
-import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/app_router.dart';
 import 'package:eatvio_app/core/permission_handler/permission_handler.dart';
 import 'package:eatvio_app/core/theme/app_decoration.dart';
@@ -12,8 +12,13 @@ import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/features/blog_post_create/repositories/blog_post_repository.dart';
+import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_mapper.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_pagination_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
+import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -36,20 +41,31 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
   final blogPostCubit = sl<BlogPostCreateCubit>();
   bool shrinkImage = false;
   late StreamSubscription<bool> keyboardSubscription;
-  XFile? image;
+  final List<FeedGalleryImage> savedImages = [];
+  final List<XFile> pendingImages = [];
+  final List<int> mediaIdsToDelete = [];
   final titleController = TextEditingController();
   final descriptionController = TextEditingController();
   final videoUrlController = TextEditingController();
-  bool isLoading = false;
   bool enableMdPanel = false;
   bool isPreviewMode = false;
   final FocusNode descriptionFocusNode = FocusNode();
 
+  bool get _isEditMode => widget.feedBlogPostModel != null;
+
+  int get _galleryCount => savedImages.length + pendingImages.length;
+
+  int get _remainingSlots =>
+      BlogPostRepository.maxGalleryImages - _galleryCount;
+
   @override
   void initState() {
     super.initState();
+    blogPostCubit.resetFormErrors();
     var keyboardVisibilityController = KeyboardVisibilityController();
-    keyboardSubscription = keyboardVisibilityController.onChange.listen((bool visible) {
+    keyboardSubscription = keyboardVisibilityController.onChange.listen((
+      bool visible,
+    ) {
       setState(() {
         shrinkImage = visible;
         enableMdPanel = visible;
@@ -59,6 +75,9 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
       titleController.text = widget.feedBlogPostModel!.title;
       descriptionController.text = widget.feedBlogPostModel!.description;
       videoUrlController.text = widget.feedBlogPostModel!.videoUrl;
+      savedImages.addAll(
+        widget.feedBlogPostModel!.images.where((image) => image.id != null),
+      );
     }
   }
 
@@ -66,6 +85,9 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
   void dispose() {
     keyboardSubscription.cancel();
     descriptionFocusNode.dispose();
+    titleController.dispose();
+    descriptionController.dispose();
+    videoUrlController.dispose();
     super.dispose();
   }
 
@@ -78,9 +100,16 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
       return selectedText.startsWith(prefix) && selectedText.endsWith(suffix);
     } else {
       final cursorPosition = selection.baseOffset;
-      if (cursorPosition >= prefix.length && text.length >= cursorPosition + suffix.length) {
-        final beforeCursor = text.substring(cursorPosition - prefix.length, cursorPosition);
-        final afterCursor = text.substring(cursorPosition, cursorPosition + suffix.length);
+      if (cursorPosition >= prefix.length &&
+          text.length >= cursorPosition + suffix.length) {
+        final beforeCursor = text.substring(
+          cursorPosition - prefix.length,
+          cursorPosition,
+        );
+        final afterCursor = text.substring(
+          cursorPosition,
+          cursorPosition + suffix.length,
+        );
         return beforeCursor == prefix && afterCursor == suffix;
       }
     }
@@ -93,23 +122,36 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
 
     if (selection.isValid && !selection.isCollapsed) {
       final selectedText = text.substring(selection.start, selection.end);
-      final unformattedText = selectedText.substring(prefix.length, selectedText.length - suffix.length);
+      final unformattedText = selectedText.substring(
+        prefix.length,
+        selectedText.length - suffix.length,
+      );
 
-      final newText = text.replaceRange(selection.start, selection.end, unformattedText);
+      final newText = text.replaceRange(
+        selection.start,
+        selection.end,
+        unformattedText,
+      );
       descriptionController.text = newText;
 
-      final newSelection = TextSelection(baseOffset: selection.start, extentOffset: selection.start + unformattedText.length);
+      final newSelection = TextSelection(
+        baseOffset: selection.start,
+        extentOffset: selection.start + unformattedText.length,
+      );
       descriptionController.selection = newSelection;
     } else {
       final cursorPosition = selection.baseOffset;
-      if (cursorPosition >= prefix.length && text.length >= cursorPosition + suffix.length) {
+      if (cursorPosition >= prefix.length &&
+          text.length >= cursorPosition + suffix.length) {
         final beforeCursor = text.substring(0, cursorPosition - prefix.length);
         final afterCursor = text.substring(cursorPosition + suffix.length);
         final newText = beforeCursor + afterCursor;
         descriptionController.text = newText;
 
         final newCursorPosition = cursorPosition - prefix.length;
-        descriptionController.selection = TextSelection.collapsed(offset: newCursorPosition);
+        descriptionController.selection = TextSelection.collapsed(
+          offset: newCursorPosition,
+        );
       }
     }
   }
@@ -122,18 +164,28 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
       final selectedText = text.substring(selection.start, selection.end);
       final formattedText = '$prefix$selectedText$suffix';
 
-      final newText = text.replaceRange(selection.start, selection.end, formattedText);
+      final newText = text.replaceRange(
+        selection.start,
+        selection.end,
+        formattedText,
+      );
       descriptionController.text = newText;
 
-      final newSelection = TextSelection(baseOffset: selection.start, extentOffset: selection.start + formattedText.length);
+      final newSelection = TextSelection(
+        baseOffset: selection.start,
+        extentOffset: selection.start + formattedText.length,
+      );
       descriptionController.selection = newSelection;
     } else {
       final cursorPosition = selection.baseOffset;
-      final newText = '${text.substring(0, cursorPosition)}$prefix$suffix${text.substring(cursorPosition)}';
+      final newText =
+          '${text.substring(0, cursorPosition)}$prefix$suffix${text.substring(cursorPosition)}';
       descriptionController.text = newText;
 
       final newCursorPosition = cursorPosition + prefix.length;
-      descriptionController.selection = TextSelection.collapsed(offset: newCursorPosition);
+      descriptionController.selection = TextSelection.collapsed(
+        offset: newCursorPosition,
+      );
     }
   }
 
@@ -188,17 +240,31 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
       if (linkRegex.hasMatch(selectedText)) {
         final match = linkRegex.firstMatch(selectedText);
         final linkText = match?.group(1) ?? selectedText;
-        final newText = text.replaceRange(selection.start, selection.end, linkText);
+        final newText = text.replaceRange(
+          selection.start,
+          selection.end,
+          linkText,
+        );
         descriptionController.text = newText;
 
-        final newSelection = TextSelection(baseOffset: selection.start, extentOffset: selection.start + linkText.length);
+        final newSelection = TextSelection(
+          baseOffset: selection.start,
+          extentOffset: selection.start + linkText.length,
+        );
         descriptionController.selection = newSelection;
       } else {
         final formattedText = '[$selectedText](url)';
-        final newText = text.replaceRange(selection.start, selection.end, formattedText);
+        final newText = text.replaceRange(
+          selection.start,
+          selection.end,
+          formattedText,
+        );
         descriptionController.text = newText;
 
-        final newSelection = TextSelection(baseOffset: selection.start + selectedText.length + 2, extentOffset: selection.start + selectedText.length + 5);
+        final newSelection = TextSelection(
+          baseOffset: selection.start + selectedText.length + 2,
+          extentOffset: selection.start + selectedText.length + 5,
+        );
         descriptionController.selection = newSelection;
       }
     } else {
@@ -209,11 +275,14 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
   void _applyHorizontalRule() {
     final cursorPosition = descriptionController.selection.baseOffset;
     final text = descriptionController.text;
-    final newText = '${text.substring(0, cursorPosition)}\n---\n${text.substring(cursorPosition)}';
+    final newText =
+        '${text.substring(0, cursorPosition)}\n---\n${text.substring(cursorPosition)}';
     descriptionController.text = newText;
 
     final newCursorPosition = cursorPosition + 5;
-    descriptionController.selection = TextSelection.collapsed(offset: newCursorPosition);
+    descriptionController.selection = TextSelection.collapsed(
+      offset: newCursorPosition,
+    );
   }
 
   void _togglePreview() {
@@ -240,7 +309,9 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
         borderRadius: BorderRadius.circular(20),
         border: Border.all(color: const Color(0xFFE0E0E0)),
       ),
-      child: SingleChildScrollView(child: _parseMarkdown(descriptionController.text)),
+      child: SingleChildScrollView(
+        child: _parseMarkdown(descriptionController.text),
+      ),
     );
   }
 
@@ -248,7 +319,11 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
     if (text.isEmpty) {
       return const Text(
         'Описание',
-        style: TextStyle(fontSize: 16, color: Color(0xFF323F4B), fontWeight: FontWeight.w500),
+        style: TextStyle(
+          fontSize: 16,
+          color: Color(0xFF323F4B),
+          fontWeight: FontWeight.w500,
+        ),
       );
     }
 
@@ -267,21 +342,33 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
         widgets.add(
           Text(
             line.substring(2),
-            style: const TextStyle(fontSize: 24, fontWeight: FontWeight.bold, color: Colors.black),
+            style: const TextStyle(
+              fontSize: 24,
+              fontWeight: FontWeight.bold,
+              color: Colors.black,
+            ),
           ),
         );
       } else if (line.startsWith('## ')) {
         widgets.add(
           Text(
             line.substring(3),
-            style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold, color: Colors.black),
+            style: const TextStyle(
+              fontSize: 20,
+              fontWeight: FontWeight.bold,
+              color: Colors.black,
+            ),
           ),
         );
       } else if (line.startsWith('### ')) {
         widgets.add(
           Text(
             line.substring(4),
-            style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold, color: Colors.black),
+            style: const TextStyle(
+              fontSize: 18,
+              fontWeight: FontWeight.bold,
+              color: Colors.black,
+            ),
           ),
         );
       } else if (line.startsWith('- ') || line.startsWith('* ')) {
@@ -307,7 +394,11 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Text('$number. ', style: const TextStyle(fontSize: 16)),
-                Expanded(child: _parseInlineMarkdown(line.substring(number.length + 2))),
+                Expanded(
+                  child: _parseInlineMarkdown(
+                    line.substring(number.length + 2),
+                  ),
+                ),
               ],
             ),
           ),
@@ -323,7 +414,10 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
       }
     }
 
-    return Column(crossAxisAlignment: CrossAxisAlignment.start, children: widgets);
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: widgets,
+    );
   }
 
   Widget _parseInlineMarkdown(String text) {
@@ -347,14 +441,22 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
         spans.add(
           TextSpan(
             text: matchedText.substring(2, matchedText.length - 2),
-            style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold, color: Colors.black),
+            style: const TextStyle(
+              fontSize: 16,
+              fontWeight: FontWeight.bold,
+              color: Colors.black,
+            ),
           ),
         );
       } else if (matchedText.startsWith('*') && matchedText.endsWith('*')) {
         spans.add(
           TextSpan(
             text: matchedText.substring(1, matchedText.length - 1),
-            style: const TextStyle(fontSize: 16, fontStyle: FontStyle.italic, color: Colors.black),
+            style: const TextStyle(
+              fontSize: 16,
+              fontStyle: FontStyle.italic,
+              color: Colors.black,
+            ),
           ),
         );
       } else if (matchedText.startsWith('[') && matchedText.contains('](')) {
@@ -364,7 +466,11 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
           spans.add(
             TextSpan(
               text: linkText,
-              style: const TextStyle(fontSize: 16, color: Colors.blue, decoration: TextDecoration.underline),
+              style: const TextStyle(
+                fontSize: 16,
+                color: Colors.blue,
+                decoration: TextDecoration.underline,
+              ),
             ),
           );
         }
@@ -390,9 +496,11 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
     return BlocProvider<BlogPostCreateCubit>(
       create: (BuildContext context) => blogPostCubit,
       child: BlocListener<BlogPostCreateCubit, BlogPostCreateState>(
+        bloc: blogPostCubit,
         listener: (BuildContext context, BlogPostCreateState state) {
-          if (state is BlogPostCreateStateLoaded) {
+          if (state.isSuccess) {
             context.read<FeedCubit>().loadFeedBlogPostList();
+            ProfileCubit.myProfileCubit?.reloadBlogPosts();
           }
         },
         child: _buildBlogPostCreate(context),
@@ -401,6 +509,10 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
   }
 
   void _showImagePicker() {
+    if (_remainingSlots <= 0) {
+      return;
+    }
+
     showCupertinoModalPopup<void>(
       context: context,
       builder: (context) {
@@ -415,14 +527,27 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
                   description: s.allowAccessToCameraDescription,
                   onGranted: () async {
                     final picker = ImagePicker();
-                    image = await picker.pickImage(source: ImageSource.camera);
-                    setState(() {});
+                    final image = await picker.pickImage(
+                      source: ImageSource.camera,
+                    );
+                    if (image != null && _remainingSlots > 0) {
+                      setState(() {
+                        pendingImages.add(image);
+                      });
+                      blogPostCubit.clearImagesError();
+                    }
                     AppRouter.navigatorKey.currentContext?.pop();
                   },
                   context: context,
                 );
               },
-              child: const Row(children: [Icon(Icons.photo_camera), SizedBox(width: 8), Text('Фото')]),
+              child: const Row(
+                children: [
+                  Icon(Icons.photo_camera),
+                  SizedBox(width: 8),
+                  Text('Фото'),
+                ],
+              ),
             ),
             CupertinoActionSheetAction(
               onPressed: () async {
@@ -432,30 +557,88 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
                   description: s.allowAcessToGaleryDescription,
                   onGranted: () async {
                     final picker = ImagePicker();
-                    image = await picker.pickImage(source: ImageSource.gallery);
-                    setState(() {});
+                    final images = await picker.pickMultiImage(
+                      limit: _remainingSlots,
+                    );
+                    if (images.isNotEmpty) {
+                      setState(() {
+                        pendingImages.addAll(images.take(_remainingSlots));
+                      });
+                      blogPostCubit.clearImagesError();
+                    }
                     if (!context.mounted) return;
                     AppRouter.navigatorKey.currentContext?.pop();
                   },
                   context: context,
                 );
               },
-              child: const Row(children: [Icon(Icons.photo), SizedBox(width: 8), Text('Галерея')]),
+              child: const Row(
+                children: [
+                  Icon(Icons.photo),
+                  SizedBox(width: 8),
+                  Text('Галерея'),
+                ],
+              ),
             ),
           ],
-          cancelButton: CupertinoActionSheetAction(onPressed: () => Navigator.of(context).pop(), isDestructiveAction: true, child: const Text('Отмена')),
+          cancelButton: CupertinoActionSheetAction(
+            onPressed: () => Navigator.of(context).pop(),
+            isDestructiveAction: true,
+            child: const Text('Отмена'),
+          ),
         );
       },
     );
   }
 
+  void _removeSavedImage(int index) {
+    final image = savedImages[index];
+    final mediaId = image.id;
+    setState(() {
+      savedImages.removeAt(index);
+      if (mediaId != null) {
+        mediaIdsToDelete.add(mediaId);
+      }
+    });
+  }
+
+  void _removePendingImage(int index) {
+    setState(() {
+      pendingImages.removeAt(index);
+    });
+  }
+
+  void _onReorderGallery(int oldIndex, int newIndex) {
+    setState(() {
+      if (newIndex > oldIndex) {
+        newIndex -= 1;
+      }
+
+      if (oldIndex < savedImages.length && newIndex < savedImages.length) {
+        final item = savedImages.removeAt(oldIndex);
+        savedImages.insert(newIndex, item);
+        return;
+      }
+
+      final pendingOld = oldIndex - savedImages.length;
+      final pendingNew = newIndex - savedImages.length;
+      if (pendingOld >= 0 && pendingNew >= 0) {
+        final item = pendingImages.removeAt(pendingOld);
+        pendingImages.insert(pendingNew, item);
+      }
+    });
+  }
+
   Widget _mdButton(IconData icon, Function() onTap) {
     return Expanded(
       child: GestureDetector(
         onTap: onTap,
         child: Container(
           height: 36,
-          decoration: BoxDecoration(color: const Color(0xFFF1F2F6), borderRadius: BorderRadius.circular(10)),
+          decoration: BoxDecoration(
+            color: const Color(0xFFF1F2F6),
+            borderRadius: BorderRadius.circular(10),
+          ),
           child: Icon(icon),
         ),
       ),
@@ -468,11 +651,18 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
         onTap: onTap,
         child: Container(
           height: 36,
-          decoration: BoxDecoration(color: const Color(0xFFF1F2F6), borderRadius: BorderRadius.circular(10)),
+          decoration: BoxDecoration(
+            color: const Color(0xFFF1F2F6),
+            borderRadius: BorderRadius.circular(10),
+          ),
           child: Center(
             child: Text(
               text,
-              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w900, color: Colors.black87),
+              style: const TextStyle(
+                fontSize: 18,
+                fontWeight: FontWeight.w900,
+                color: Colors.black87,
+              ),
             ),
           ),
         ),
@@ -496,7 +686,12 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
                       color: Colors.white,
                       borderRadius: BorderRadius.circular(20),
                       boxShadow: [
-                        BoxShadow(color: const Color(0x00000000).withValues(alpha: 0.2), spreadRadius: 0, blurRadius: 32, offset: const Offset(0, 0)),
+                        BoxShadow(
+                          color: const Color(0x00000000).withValues(alpha: 0.2),
+                          spreadRadius: 0,
+                          blurRadius: 32,
+                          offset: const Offset(0, 0),
+                        ),
                       ],
                     ),
                     child: Row(
@@ -508,9 +703,15 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
                         const SizedBox(width: 8),
                         _mdButton(Icons.format_italic, _applyItalic),
                         const SizedBox(width: 8),
-                        _mdButton(Icons.format_list_numbered, _applyNumberedList),
+                        _mdButton(
+                          Icons.format_list_numbered,
+                          _applyNumberedList,
+                        ),
                         const SizedBox(width: 8),
-                        _mdButton(Icons.format_list_bulleted, _applyBulletedList),
+                        _mdButton(
+                          Icons.format_list_bulleted,
+                          _applyBulletedList,
+                        ),
                         const SizedBox(width: 8),
                         _mdButton(Icons.link, _applyLink),
                         const SizedBox(width: 8),
@@ -528,157 +729,297 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
                   decoration: BoxDecoration(
                     color: Colors.white,
                     borderRadius: BorderRadius.circular(20),
-                    boxShadow: [BoxShadow(color: const Color(0x00000000).withValues(alpha: 0.2), spreadRadius: 0, blurRadius: 32, offset: const Offset(0, 0))],
+                    boxShadow: [
+                      BoxShadow(
+                        color: const Color(0x00000000).withValues(alpha: 0.2),
+                        spreadRadius: 0,
+                        blurRadius: 32,
+                        offset: const Offset(0, 0),
+                      ),
+                    ],
+                  ),
+                  child: Row(
+                    children: [
+                      _mdButton(
+                        isPreviewMode ? Icons.edit : Icons.visibility,
+                        _togglePreview,
+                      ),
+                    ],
                   ),
-                  child: Row(children: [_mdButton(isPreviewMode ? Icons.edit : Icons.visibility, _togglePreview)]),
                 ),
               ],
             )
           : null,
       appBar: AppBar(),
-      body: SingleChildScrollView(
-        padding: const EdgeInsets.all(16),
+      body: BlocBuilder<BlogPostCreateCubit, BlogPostCreateState>(
+        bloc: blogPostCubit,
+        builder: (context, state) {
+          return SingleChildScrollView(
+            padding: const EdgeInsets.all(16),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(height: 16),
+                const Text('Заголовок'),
+                const SizedBox(height: 8),
+                CustomTextFormField(
+                  key: AppKeys.blogPostCreateScreenTitleTextField,
+                  controller: titleController,
+                  hasError: state.titleError != null,
+                  onChanged: (_) => blogPostCubit.clearTitleError(),
+                ),
+                if (state.titleError != null) ...[
+                  const SizedBox(height: 4),
+                  ValidationErrorWidget(error: state.titleError!),
+                ],
+                const SizedBox(height: 16),
+                const Text('Описание'),
+                const SizedBox(height: 8),
+                isPreviewMode
+                    ? _buildMarkdownPreview()
+                    : CustomTextFormField(
+                        key: AppKeys.blogPostCreateScreenContentTextField,
+                        controller: descriptionController,
+                        focusNode: descriptionFocusNode,
+                        maxLines: 6,
+                        minLines: 4,
+                        hasError: state.descriptionError != null,
+                        onChanged: (_) => blogPostCubit.clearDescriptionError(),
+                      ),
+                if (state.descriptionError != null) ...[
+                  const SizedBox(height: 4),
+                  ValidationErrorWidget(error: state.descriptionError!),
+                ],
+                const SizedBox(height: 16),
+                Text(
+                  'Изображения ($_galleryCount/${BlogPostRepository.maxGalleryImages})',
+                ),
+                const SizedBox(height: 8),
+                _buildGallery(),
+                if (state.imagesError != null) ...[
+                  const SizedBox(height: 4),
+                  ValidationErrorWidget(error: state.imagesError!),
+                ],
+                const SizedBox(height: 16),
+                const Text('Ссылка на видео'),
+                const SizedBox(height: 4),
+                Text(
+                  'Rutube, VK или OK',
+                  style: TextStyle(fontSize: 13, color: appTheme.blueGray300),
+                ),
+                const SizedBox(height: 8),
+                CustomTextFormField(
+                  key: AppKeys.blogPostCreateScreenVideoLinkTextField,
+                  controller: videoUrlController,
+                  hasError: state.videoUrlError != null,
+                  keyboardType: TextInputType.url,
+                  onChanged: (_) => blogPostCubit.clearVideoUrlError(),
+                ),
+                if (state.videoUrlError != null) ...[
+                  const SizedBox(height: 4),
+                  ValidationErrorWidget(error: state.videoUrlError!),
+                ],
+                if (state.formError != null) ...[
+                  const SizedBox(height: 16),
+                  ValidationErrorWidget(error: state.formError!),
+                ],
+                const SizedBox(height: 80),
+                _createBlogPostButton(isSubmitting: state.isLoading),
+                const SizedBox(height: 80),
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  Future<void> _submitBlogPost() async {
+    if (blogPostCubit.state.isLoading) {
+      return;
+    }
+
+    final title = titleController.text.trim();
+    final description = descriptionController.text.trim();
+    final videoUrl = videoUrlController.text.trim();
+    final existingMediaIds = savedImages.map((image) => image.id!).toList();
+
+    final bool result;
+    if (_isEditMode) {
+      result = await blogPostCubit.updateBlogPost(
+        id: widget.feedBlogPostModel!.id,
+        title: title,
+        description: description,
+        videoUrl: videoUrl,
+        existingMediaIds: existingMediaIds,
+        newImages: pendingImages,
+        mediaIdsToDelete: List<int>.from(mediaIdsToDelete),
+      );
+    } else {
+      result = await blogPostCubit.createBlogPost(
+        title: title,
+        description: description,
+        videoUrl: videoUrl,
+        images: pendingImages,
+      );
+    }
+
+    if (!result) {
+      if (!mounted) return;
+      if (blogPostCubit.state.hasValidationErrors) {
+        return;
+      }
+      showErrorDialog(
+        context,
+        title: _isEditMode
+            ? S.current.could_not_update_blog_post
+            : S.current.could_not_publish_blog_post,
+      );
+    } else {
+      if (!mounted) return;
+      if (context.canPop()) {
+        context.pop();
+      }
+    }
+  }
+
+  Widget _createBlogPostButton({required bool isSubmitting}) {
+    return InkWell(
+      key: AppKeys.blogPostCreateScreenCreateButton,
+      onTap: isSubmitting ? null : _submitBlogPost,
+      borderRadius: BorderRadius.circular(16),
+      child: isSubmitting
+          ? const Center(child: Loader())
+          : Ink(
+              width: MediaQuery.of(context).size.width - 32,
+              height: 52,
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(16),
+                color: appTheme.blueA400,
+              ),
+              child: Center(
+                child: Text(
+                  _isEditMode ? 'Сохранить' : 'Создать',
+                  style: const TextStyle(color: Colors.white),
+                ),
+              ),
+            ),
+    );
+  }
+
+  Widget _buildGallery() {
+    final itemHeight = shrinkImage ? 72.0 : 112.0;
+
+    return SizedBox(
+      height: itemHeight,
+      child: ReorderableListView.builder(
+        scrollDirection: Axis.horizontal,
+        buildDefaultDragHandles: false,
+        onReorder: _onReorderGallery,
+        itemCount: _galleryCount + (_remainingSlots > 0 ? 1 : 0),
+        itemBuilder: (context, index) {
+          if (index == _galleryCount) {
+            return KeyedSubtree(
+              key: const ValueKey('add-photo'),
+              child: _buildAddPhotoTile(itemHeight),
+            );
+          }
+
+          if (index < savedImages.length) {
+            final image = savedImages[index];
+            final url = PostFeedMapper.resolveMediaUrl(image.url);
+            return KeyedSubtree(
+              key: ValueKey('saved-${image.id}'),
+              child: _buildGalleryTile(
+                index: index,
+                height: itemHeight,
+                imageProvider: NetworkImage(url),
+                onRemove: () => _removeSavedImage(index),
+              ),
+            );
+          }
+
+          final pendingIndex = index - savedImages.length;
+          final pending = pendingImages[pendingIndex];
+          return KeyedSubtree(
+            key: ValueKey('pending-${pending.path}'),
+            child: _buildGalleryTile(
+              index: index,
+              height: itemHeight,
+              imageProvider: FileImage(File(pending.path)),
+              onRemove: () => _removePendingImage(pendingIndex),
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  Widget _buildAddPhotoTile(double height) {
+    return GestureDetector(
+      onTap: _showImagePicker,
+      child: Container(
+        width: height,
+        height: height,
+        margin: const EdgeInsets.only(right: 8),
+        decoration: AppDecoration.fillGray.copyWith(
+          borderRadius: BorderRadius.circular(16),
+        ),
         child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            const SizedBox(height: 16),
-            const Text('Заголовок'),
-            const SizedBox(height: 8),
-            CustomTextFormField(key: AppKeys.blogPostCreateScreenTitleTextField, controller: titleController),
-            const SizedBox(height: 16),
-            const Text('Описание'),
-            const SizedBox(height: 8),
-            isPreviewMode
-                ? _buildMarkdownPreview()
-                : CustomTextFormField(
-                    key: AppKeys.blogPostCreateScreenContentTextField,
-                    controller: descriptionController,
-                    focusNode: descriptionFocusNode,
-                    maxLines: 6,
-                    minLines: 4,
-                  ),
-            const SizedBox(height: 16),
-            if (videoUrlController.text.isEmpty) const Text('Изображение поста'),
-            if (videoUrlController.text.isEmpty) const SizedBox(height: 8),
-            if (videoUrlController.text.isEmpty) _buildAddPhoto(),
-            const SizedBox(height: 16),
-            if (image == null && widget.feedBlogPostModel?.image == null) const Text('Ссылка на видео'),
-            if (image == null && widget.feedBlogPostModel?.image == null) const SizedBox(height: 8),
-            if (image == null && widget.feedBlogPostModel?.image == null)
-              CustomTextFormField(key: AppKeys.blogPostCreateScreenVideoLinkTextField, controller: videoUrlController),
-            const SizedBox(height: 80),
-            _createBlogPostButton(),
-            const SizedBox(height: 80),
+            Icon(Icons.photo_library, color: appTheme.blueGray300),
+            const SizedBox(height: 4),
+            Text(
+              'Добавить',
+              style: TextStyle(fontSize: 12, color: appTheme.blueGray300),
+            ),
           ],
         ),
       ),
     );
   }
 
-  Widget _createBlogPostButton() {
-    return InkWell(
-      onTap: isLoading
-          ? null
-          : () async {
-              setState(() {
-                isLoading = true;
-              });
-              if (widget.feedBlogPostModel != null) {
-                final result = await blogPostCubit.updateBlogPost(
-                  id: widget.feedBlogPostModel!.id,
-                  title: titleController.text,
-                  description: descriptionController.text,
-                  videoUrl: videoUrlController.text,
-                  image: image,
-                  oldImageUrl: widget.feedBlogPostModel!.image,
-                );
-                setState(() {
-                  isLoading = false;
-                });
-                if (!result) {
-                  if (!mounted) return;
-                  showErrorDialog(context, title: S.current.could_not_update_blog_post);
-                } else {
-                  if (!mounted) return;
-                  if (context.canPop()) {
-                    context.pop();
-                  }
-                }
-              } else {
-                final result = await blogPostCubit.createBlogPost(
-                  title: titleController.text,
-                  description: descriptionController.text,
-                  videoUrl: videoUrlController.text,
-                  image: image,
-                );
-                setState(() {
-                  isLoading = false;
-                });
-                if (!result) {
-                  if (!mounted) return;
-                  showErrorDialog(context, title: S.current.could_not_publish_blog_post);
-                } else {
-                  if (!mounted) return;
-                  if (context.canPop()) {
-                    context.pop();
-                  }
-                }
-              }
-            },
-      borderRadius: BorderRadius.circular(16),
-      child: isLoading
-          ? const Center(child: Loader())
-          : Ink(
-              width: MediaQuery.of(context).size.width - 32,
-              height: 52,
-              decoration: BoxDecoration(borderRadius: BorderRadius.circular(16), color: appTheme.blueA400),
-              child: const Center(
-                child: Text('Создать', style: TextStyle(color: Colors.white)),
-              ),
-            ),
-    );
-  }
-
-  GestureDetector _buildAddPhoto() {
-    return GestureDetector(
-      onTap: () {
-        _showImagePicker();
-      },
-      child: Stack(
-        children: [
-          if (image == null && widget.feedBlogPostModel?.image == null)
-            AnimatedContainer(
-              height: shrinkImage ? 52 : 128,
-              curve: Curves.easeIn,
-              duration: const Duration(milliseconds: 150),
-              decoration: AppDecoration.fillGray.copyWith(borderRadius: BorderRadius.circular(16)),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.center,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  Icon(Icons.photo_library, color: appTheme.blueGray300),
-                  const SizedBox(width: 8),
-                  Text("Добавить фото", selectionColor: appTheme.blueA400),
-                ],
-              ),
-            ),
-          if (image != null)
-            SizedBox(
-              width: shrinkImage ? 52 : MediaQuery.of(context).size.width - 32,
+  Widget _buildGalleryTile({
+    required int index,
+    required double height,
+    required ImageProvider imageProvider,
+    required VoidCallback onRemove,
+  }) {
+    return ReorderableDelayedDragStartListener(
+      index: index,
+      child: Container(
+        width: height,
+        height: height,
+        margin: const EdgeInsets.only(right: 8),
+        child: Stack(
+          clipBehavior: Clip.none,
+          children: [
+            Positioned.fill(
               child: ClipRRect(
                 borderRadius: BorderRadius.circular(16),
-                child: Image(image: FileImage(File(image!.path))),
+                child: Image(image: imageProvider, fit: BoxFit.cover),
               ),
             ),
-          if (widget.feedBlogPostModel?.image != null && image == null)
-            SizedBox(
-              width: shrinkImage ? 52 : MediaQuery.of(context).size.width - 32,
-              child: ClipRRect(
-                borderRadius: BorderRadius.circular(16),
-                child: Image(image: NetworkImage('${sl<AppConfig>().baseUrl}/storage/${widget.feedBlogPostModel!.image}')),
+            Positioned(
+              top: -6,
+              right: -6,
+              child: Material(
+                color: Colors.white,
+                shape: const CircleBorder(),
+                elevation: 1,
+                child: InkWell(
+                  customBorder: const CircleBorder(),
+                  onTap: onRemove,
+                  child: const Padding(
+                    padding: EdgeInsets.all(4),
+                    child: Icon(Icons.close, size: 16),
+                  ),
+                ),
               ),
             ),
-        ],
+          ],
+        ),
       ),
     );
   }
diff --git a/lib/features/blog_post_create/repositories/blog_post_repository.dart b/lib/features/blog_post_create/repositories/blog_post_repository.dart
index 337854dc..6cd544a6 100644
--- a/lib/features/blog_post_create/repositories/blog_post_repository.dart
+++ b/lib/features/blog_post_create/repositories/blog_post_repository.dart
@@ -1,79 +1,122 @@
 import 'dart:io';
 
 import 'package:dio/dio.dart';
-import 'package:eatvio_app/core/app_config.dart';
-import 'package:eatvio_app/core/locator_service.dart';
-import 'package:http/http.dart' as http;
 import 'package:eatvio_app/core/image_compressing/image_compress_utility.dart';
 import 'package:eatvio_app/features/blog_post_create/services/blog_post_service.dart';
 import 'package:flutter_image_compress/flutter_image_compress.dart';
-import 'package:path_provider/path_provider.dart';
 
 class BlogPostRepository {
+  static const maxGalleryImages = 10;
+
   final BlogPostService blogPostService;
 
-  BlogPostRepository({
-    required this.blogPostService,
-  });
+  BlogPostRepository({required this.blogPostService});
 
-  Future<void> createBlogPost(
+  Future<void> createBlogPost({
     String? title,
     String? videoUrl,
     String? description,
-    XFile? image,
-  ) async {
-    final formData = FormData.fromMap({
-      if (title != null && title.isNotEmpty) 'title': title,
-      if (description != null && description.isNotEmpty) 'description_md': description,
-      if (videoUrl != null && videoUrl.isNotEmpty) 'video_url': videoUrl,
-      if (image != null) 'image': await MultipartFile.fromFile((await ImageCompressUtility.compressFile(File(image.path))).path, filename: image.name),
-    });
-
-    return blogPostService.createBlogPost(
-      formData: formData,
+    List<XFile> images = const [],
+  }) async {
+    final formData = await _buildFormData(
+      title: title,
+      videoUrl: videoUrl,
+      description: description,
+      newImages: images,
     );
+
+    return blogPostService.createBlogPost(formData: formData);
   }
 
-  Future<XFile?> downloadImage(String imageUrl) async {
-    final response = await http.get(Uri.parse('${sl<AppConfig>().baseUrl}/storage/$imageUrl'));
-
-    if (response.statusCode == 200) {
-      final directory = await getTemporaryDirectory();
-      final filePath = '${directory.path}/image.jpg';
-      final file = File(filePath);
-      await file.writeAsBytes(response.bodyBytes);
-
-      return XFile(file.path);
+  Future<void> updateBlogPost({
+    required int id,
+    String? title,
+    String? videoUrl,
+    String? description,
+    List<int> existingMediaIds = const [],
+    List<XFile> newImages = const [],
+    List<int> mediaIdsToDelete = const [],
+  }) async {
+    if (mediaIdsToDelete.isNotEmpty) {
+      await Future.wait(
+        mediaIdsToDelete.map(
+          (mediaId) =>
+              blogPostService.deleteBlogPostMedia(postId: id, mediaId: mediaId),
+        ),
+      );
     }
-    return null;
+
+    final formData = await _buildFormData(
+      title: title ?? '',
+      videoUrl: videoUrl ?? '',
+      description: description ?? '',
+      existingMediaIds: existingMediaIds,
+      newImages: newImages,
+      includeExistingMediaIds: true,
+      includeEmptyTextFields: true,
+    );
+
+    return blogPostService.updateBlogPost(id: id, formData: formData);
   }
 
-  Future<void> updateBlogPost(
-    int id,
-    String? title,
-    String? videoUrl,
-    String? description,
-    XFile? image,
-    String? oldImageUrl,
-  ) async {
-    final formData = FormData.fromMap({
-      'title': title,
-      'description_md': description,
-      'video_url': videoUrl,
-      'image': image != null
-          ? await MultipartFile.fromFile((await ImageCompressUtility.compressFile(File(image.path))).path, filename: image.name)
-          : oldImageUrl != '' && oldImageUrl != null
-              ? await MultipartFile.fromFile((await downloadImage(oldImageUrl))?.path ?? '', filename: oldImageUrl.split('/').last)
-              : null,
-    });
-
-    return blogPostService.updateBlogPost(
-      id: id,
-      formData: formData,
-    );
+  Future<void> deleteBlogPostMedia({
+    required int postId,
+    required int mediaId,
+  }) async {
+    await blogPostService.deleteBlogPostMedia(postId: postId, mediaId: mediaId);
   }
 
   Future<void> deleteBlogPost(int id) async {
     await blogPostService.deleteBlogPost(id: id);
   }
+
+  Future<FormData> _buildFormData({
+    String? title,
+    String? videoUrl,
+    String? description,
+    List<int> existingMediaIds = const [],
+    List<XFile> newImages = const [],
+    bool includeExistingMediaIds = false,
+    bool includeEmptyTextFields = false,
+  }) async {
+    final formData = FormData();
+
+    if (includeEmptyTextFields) {
+      formData.fields.add(MapEntry('title', title ?? ''));
+      formData.fields.add(MapEntry('description_md', description ?? ''));
+      formData.fields.add(MapEntry('video_url', videoUrl ?? ''));
+    } else {
+      if (title != null && title.isNotEmpty) {
+        formData.fields.add(MapEntry('title', title));
+      }
+      if (description != null && description.isNotEmpty) {
+        formData.fields.add(MapEntry('description_md', description));
+      }
+      if (videoUrl != null && videoUrl.isNotEmpty) {
+        formData.fields.add(MapEntry('video_url', videoUrl));
+      }
+    }
+
+    if (includeExistingMediaIds) {
+      for (final mediaId in existingMediaIds) {
+        formData.fields.add(
+          MapEntry('existing_media_ids[]', mediaId.toString()),
+        );
+      }
+    }
+
+    for (final image in newImages) {
+      final compressed = await ImageCompressUtility.compressFile(
+        File(image.path),
+      );
+      formData.files.add(
+        MapEntry(
+          'images[]',
+          await MultipartFile.fromFile(compressed.path, filename: image.name),
+        ),
+      );
+    }
+
+    return formData;
+  }
 }
diff --git a/lib/features/blog_post_create/services/blog_post_service.dart b/lib/features/blog_post_create/services/blog_post_service.dart
index 56fc5461..72c0be12 100644
--- a/lib/features/blog_post_create/services/blog_post_service.dart
+++ b/lib/features/blog_post_create/services/blog_post_service.dart
@@ -7,21 +7,23 @@ part 'blog_post_service.g.dart';
 abstract class BlogPostService {
   factory BlogPostService(Dio dio, {String baseUrl}) = _BlogPostService;
 
-  @POST('/api/blogPosts/create/published')
+  @POST('/api/v2/blogPosts/create/published')
   @MultiPart()
-  Future<void> createBlogPost({
-    @Body() required FormData formData,
-  });
+  Future<void> createBlogPost({@Body() required FormData formData});
 
-  @POST('/api/blogPosts/update/published/{id}')
+  @PUT('/api/v2/blogPosts/update/published/{id}')
   @MultiPart()
   Future<void> updateBlogPost({
     @Path('id') required int id,
     @Body() required FormData formData,
   });
 
-  @DELETE('/api/blogPosts/delete/{id}')
-  Future<void> deleteBlogPost({
-    @Path('id') required int id,
+  @DELETE('/api/v2/blogPosts/{postId}/media/{mediaId}')
+  Future<void> deleteBlogPostMedia({
+    @Path('postId') required int postId,
+    @Path('mediaId') required int mediaId,
   });
+
+  @DELETE('/api/blogPosts/delete/{id}')
+  Future<void> deleteBlogPost({@Path('id') required int id});
 }
diff --git a/lib/features/blog_post_create/validation/blog_post_form_validator.dart b/lib/features/blog_post_create/validation/blog_post_form_validator.dart
new file mode 100644
index 00000000..bb4fbb86
--- /dev/null
+++ b/lib/features/blog_post_create/validation/blog_post_form_validator.dart
@@ -0,0 +1,158 @@
+/// Client-side validation aligned with backend BlogPost V2 create/update rules.
+abstract final class BlogPostFormValidator {
+  static const minTextLength = 3;
+  static const maxVideoUrlLength = 2048;
+  static const maxGalleryImages = 10;
+  static const allowedImageExtensions = {'jpg', 'jpeg', 'png'};
+
+  static const titleTooShort = 'Заголовок должен содержать минимум 3 символа';
+  static const descriptionTooShort =
+      'Описание должно содержать минимум 3 символа';
+  static const contentRequired =
+      'Добавьте заголовок, описание, изображение или ссылку на видео';
+  static const galleryTooLarge = 'Можно загрузить не более 10 изображений';
+  static const imageTypeInvalid = 'Допустимы только изображения JPG или PNG';
+  static const videoUrlTooLong = 'Ссылка на видео слишком длинная';
+  static const videoUrlInvalid = 'Укажите корректную ссылку на видео';
+  static const videoUrlUnsupportedHost =
+      'Поддерживаются только Rutube, VK и OK';
+  static const videoUrlRutubeFormat = 'Неверный формат ссылки Rutube';
+  static const videoUrlVkFormat = 'Неверный формат ссылки VK';
+  static const videoUrlOkFormat = 'Неверный формат ссылки OK';
+
+  /// Empty is allowed; non-empty must be at least [minTextLength] chars (after trim).
+  static String? title(String? value) {
+    final text = value?.trim() ?? '';
+    if (text.isEmpty) {
+      return null;
+    }
+    if (text.length < minTextLength) {
+      return titleTooShort;
+    }
+    return null;
+  }
+
+  /// Empty is allowed; non-empty must be at least [minTextLength] chars (after trim).
+  static String? description(String? value) {
+    final text = value?.trim() ?? '';
+    if (text.isEmpty) {
+      return null;
+    }
+    if (text.length < minTextLength) {
+      return descriptionTooShort;
+    }
+    return null;
+  }
+
+  /// Empty is allowed; non-empty must match allowed video hosts/paths.
+  static String? videoUrl(String? value) {
+    final url = value?.trim() ?? '';
+    if (url.isEmpty) {
+      return null;
+    }
+    if (url.length > maxVideoUrlLength) {
+      return videoUrlTooLong;
+    }
+
+    final uri = Uri.tryParse(url);
+    if (uri == null || !uri.hasScheme || uri.host.isEmpty) {
+      return videoUrlInvalid;
+    }
+    if (uri.scheme != 'http' && uri.scheme != 'https') {
+      return videoUrlInvalid;
+    }
+
+    final host = uri.host.toLowerCase();
+    if (!_hostMatchesRootAllowlist(host, const [
+      'vk.com',
+      'vkvideo.ru',
+      'ok.ru',
+      'rutube.ru',
+    ])) {
+      return videoUrlUnsupportedHost;
+    }
+
+    final path = uri.path;
+    if (_hostMatchesRootAllowlist(host, const ['rutube.ru'])) {
+      if (!_rutubePath.hasMatch(path)) {
+        return videoUrlRutubeFormat;
+      }
+      return null;
+    }
+    if (_hostMatchesRootAllowlist(host, const ['vk.com', 'vkvideo.ru'])) {
+      if (!_vkPath.hasMatch(path)) {
+        return videoUrlVkFormat;
+      }
+      return null;
+    }
+    if (_hostMatchesRootAllowlist(host, const ['ok.ru'])) {
+      if (!_okPath.hasMatch(path)) {
+        return videoUrlOkFormat;
+      }
+    }
+    return null;
+  }
+
+  /// At least one of title / description / images / video must be meaningfully filled.
+  static String? contentRequiredMessage({
+    required String title,
+    required String description,
+    required String videoUrl,
+    required int imageCount,
+  }) {
+    final hasTitle = title.trim().length >= minTextLength;
+    final hasDescription = description.trim().length >= minTextLength;
+    final trimmedVideo = videoUrl.trim();
+    final hasVideo =
+        trimmedVideo.isNotEmpty &&
+        BlogPostFormValidator.videoUrl(trimmedVideo) == null;
+    final hasImages = imageCount > 0;
+
+    if (hasTitle || hasDescription || hasVideo || hasImages) {
+      return null;
+    }
+    return contentRequired;
+  }
+
+  static String? galleryCount(int count) {
+    if (count > maxGalleryImages) {
+      return galleryTooLarge;
+    }
+    return null;
+  }
+
+  /// Returns error if any path has a non-allowed extension. Empty path is ignored.
+  static String? imagePaths(Iterable<String> paths) {
+    for (final path in paths) {
+      final name = path.split(RegExp(r'[\\/]')).last;
+      final dot = name.lastIndexOf('.');
+      if (dot < 0 || dot == name.length - 1) {
+        return imageTypeInvalid;
+      }
+      final ext = name.substring(dot + 1).toLowerCase();
+      if (!allowedImageExtensions.contains(ext)) {
+        return imageTypeInvalid;
+      }
+    }
+    return null;
+  }
+
+  static final _rutubePath = RegExp(
+    r'^/(video|shorts)/[a-z0-9]+/?$',
+    caseSensitive: false,
+  );
+  static final _vkPath = RegExp(r'^/video-?\d+_\d+/?$', caseSensitive: false);
+  static final _okPath = RegExp(r'^/video/\d+/?$');
+
+  static bool _hostMatchesRootAllowlist(
+    String host,
+    List<String> allowedRootHosts,
+  ) {
+    for (final allowed in allowedRootHosts) {
+      if (host == allowed || host.endsWith('.$allowed')) {
+        return true;
+      }
+    }
+    return false;
+  }
+}
diff --git a/lib/features/chat/models/chat_message_model.dart b/lib/features/chat/models/chat_message_model.dart
index c50a68f8..4bffd8b7 100644
--- a/lib/features/chat/models/chat_message_model.dart
+++ b/lib/features/chat/models/chat_message_model.dart
@@ -33,7 +33,7 @@ abstract class ChatMessageModel with _$ChatMessageModel {
     @JsonKey(name: 'read_by_to_user', defaultValue: false) required bool isRead,
     @JsonKey(name: 'is_author_message_auth_user') required bool? isCurrentUserAuthor,
     @JsonKey(name: 'room_id') required String? roomId,
-    @JsonKey(name: 'type') String? type,
+    @JsonKey(name: 'type', unknownEnumValue: ChatMessageType.unknown) ChatMessageType? type,
     @Default(MessageState.sent) @JsonKey(includeToJson: false, includeFromJson: false) MessageState messageState,
     @Default(null) @JsonKey(includeToJson: false, includeFromJson: false) String? uuid,
   }) = _ChatMessageModel;
@@ -42,3 +42,22 @@ abstract class ChatMessageModel with _$ChatMessageModel {
 }
 
 enum MessageState { loading, sent, error }
+
+enum ChatMessageType {
+  @JsonValue('text')
+  text,
+  @JsonValue('system')
+  system,
+  @JsonValue('attachment')
+  attachment,
+  @JsonValue('image')
+  image,
+  @JsonValue('plan_order')
+  planOrder,
+  @JsonValue('video_call_started')
+  videoCallStarted,
+  @JsonValue('video_call_ended')
+  videoCallEnded,
+  @JsonValue('unknown')
+  unknown;
+}
diff --git a/lib/features/chat/models/chat_room_pagination_model.dart b/lib/features/chat/models/chat_room_pagination_model.dart
index 52cb9f7c..fa62adc3 100644
--- a/lib/features/chat/models/chat_room_pagination_model.dart
+++ b/lib/features/chat/models/chat_room_pagination_model.dart
@@ -54,6 +54,8 @@ abstract class ChatUser with _$ChatUser {
     @JsonKey(name: "name") required String name,
     @JsonKey(name: "profile_photo_path") required String? profilePhotoPath,
     @JsonKey(name: "profile_photo_url") required String profilePhotoUrl,
+    @Default(false) @JsonKey(name: 'is_online') bool isOnline,
+    @Default('') @JsonKey(name: 'last_seen_text') String lastSeenText,
   }) = _ChatUser;
 
   factory ChatUser.fromJson(Map<String, dynamic> json) => _$ChatUserFromJson(json);
diff --git a/lib/features/chat/models/chat_user_model.dart b/lib/features/chat/models/chat_user_model.dart
index ad876727..184c7889 100644
--- a/lib/features/chat/models/chat_user_model.dart
+++ b/lib/features/chat/models/chat_user_model.dart
@@ -10,6 +10,8 @@ abstract class ChatUserModel with _$ChatUserModel {
     required String name,
     required String slug,
     @JsonKey(name: 'profile_photo_url') String? profilePhotoUrl,
+    @Default(false) @JsonKey(name: 'is_online') bool isOnline,
+    @Default('') @JsonKey(name: 'last_seen_text') String lastSeenText,
   }) = _ChatUserModel;
 
   factory ChatUserModel.fromJson(Map<String, Object?> json) => _$ChatUserModelFromJson(json);
diff --git a/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart b/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart
index 2161393d..27b81f50 100644
--- a/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart
+++ b/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart
@@ -16,6 +16,7 @@ import 'package:eatvio_app/features/chat/models/plan_complain_model.dart';
 import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.dart';
 import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
 import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
+import 'package:eatvio_app/features/chat/utils/chat_counterpart_utils.dart';
 import 'package:eatvio_app/features/my_finance/models/card_model.dart';
 import 'package:eatvio_app/features/my_finance/repositories/cards_repository.dart';
 import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
@@ -34,6 +35,8 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
   late int lastPage;
   bool isLoading = false;
   Timer? _timer;
+  String? _activeChatUuid;
+  void Function(bool isOnline)? _presenceOnlineListener;
   var uuid = const Uuid();
 
   ChatRoomCubit({required this.chatRepository, required this.wsManager, required this.cardsRepository}) : super(const ChatRoomState.loading());
@@ -51,16 +54,16 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     if (currentPage < lastPage && !isLoading) {
       isLoading = true;
 
-      emit((state as ChatRoomStateLoaded).copyWith(isLoading: isLoading));
+      _emitLoaded((current) => current.copyWith(isLoading: isLoading));
 
       try {
         final chatMessages = await chatRepository.getChatMessages(uuid, currentPage + 1);
 
         isLoading = false;
-        emit(
-          (state as ChatRoomStateLoaded).copyWith(
+        _emitLoaded(
+          (current) => current.copyWith(
             isLoading: isLoading,
-            chatMessages: [...(state as ChatRoomStateLoaded).chatMessages, ...chatMessages.messagesList],
+            chatMessages: [...current.chatMessages, ...chatMessages.messagesList],
           ),
         );
 
@@ -83,11 +86,8 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
   }
 
   void _setCard({required List<CardModel> cards}) {
-    final currentState = state;
-    if (currentState is ChatRoomStateLoaded) {
-      if (cards.where((card) => card.isDefault).isNotEmpty) {
-        emit(currentState.copyWith(hasCard: true));
-      }
+    if (cards.where((card) => card.isDefault).isNotEmpty) {
+      _emitLoaded((current) => current.copyWith(hasCard: true));
     }
   }
 
@@ -114,6 +114,9 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
         throw ArgumentError('initChat requires uuid or orderId');
       }
 
+      currentPage = 1;
+      isLoading = false;
+
       final chatRoom = await chatRepository.getChatRoom(resolvedUuid);
       ChosenPlanModel? chosenPlan;
       final planId = resolvedChosenPlanId ?? chatRoom.chosenPlanId;
@@ -132,6 +135,7 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
           hasCard: false,
         ),
       );
+      await _subscribeToPresenceChannel(chatId: chatRoom.id);
 
       if (chosenPlan?.consultantId == chatRoom.users.sender.id) {
         await checkCards();
@@ -151,13 +155,15 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
   Future<void> updateChosenPlanState() async {
     try {
       final currentState = state;
-      if (currentState is ChatRoomStateLoaded) {
-        final chosenPlanId = currentState.chatRoom.chosenPlanId;
-        if (chosenPlanId != null) {
-          final chosenPlan = await chatRepository.getChosenPlan(id: chosenPlanId);
-          emit(currentState.copyWith.chatRoom(chosenPlan: chosenPlan));
-        }
+      if (currentState is! ChatRoomStateLoaded) {
+        return;
       }
+      final chosenPlanId = currentState.chatRoom.chosenPlanId;
+      if (chosenPlanId == null) {
+        return;
+      }
+      final chosenPlan = await chatRepository.getChosenPlan(id: chosenPlanId);
+      _emitLoaded((latest) => latest.copyWith.chatRoom(chosenPlan: chosenPlan));
     } catch (e, st) {
       await reportFrom(e, st, this);
     }
@@ -190,93 +196,240 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     }
   }
 
+  bool _emitLoaded(ChatRoomStateLoaded Function(ChatRoomStateLoaded current) update) {
+    if (isClosed) {
+      return false;
+    }
+    final currentState = state;
+    if (currentState is! ChatRoomStateLoaded) {
+      return false;
+    }
+    emit(update(currentState));
+    return true;
+  }
+
   Future<void> _subscribeToChatChannel({required String uuid, required String chatId}) async {
     final client = wsManager.client;
     if (client == null) return;
+    _activeChatUuid = uuid;
+    await messagesSubscription?.cancel();
+    await typingSubscription?.cancel();
+    messagesSubscription = null;
+    typingSubscription = null;
     await wsManager.initPrivateDirectChatChannel(chatId);
     wsManager.subscribeDirectChatChannel();
-    messagesSubscription = wsManager.directChatStream?.listen((event) {
-      AudioPlayer().play((AssetSource('audio/recive_message.wav')));
-      final message = ChatMessageModel.fromJson(jsonDecode(event.data));
-      final currentState = state as ChatRoomStateLoaded;
-
-      // Сообщения от текущего пользователя не приходят через WebSocket,
-      // они обрабатываются через ответ API в sendMessage
-      // Здесь обрабатываем только входящие сообщения от других пользователей
-      List<ChatMessageModel> messagesList = [message, ...currentState.chatMessages];
-
-      chatRepository.emitNewMessageToChats(message);
-      emit(currentState.copyWith(chatMessages: messagesList, isLoading: isLoading));
-      EasyDebounce.debounce('searchChatRoom', const Duration(milliseconds: 300), () => sl<ChatsCubit>().getChatRooms());
-    });
+    messagesSubscription = wsManager.directChatStream?.listen(
+      _onDirectChatEvent,
+      onError: (Object e, StackTrace st) {
+        unawaited(reportFrom(e, st, this));
+      },
+    );
 
     typingSubscription = wsManager.clientTypingStream?.listen((event) {
-      emit((state as ChatRoomStateLoaded).copyWith(isTyping: true, isLoading: isLoading));
+      _emitLoaded((current) => current.copyWith(isTyping: true, isLoading: isLoading));
       EasyDebounce.debounce(
         'client-typing',
         const Duration(seconds: 3),
-        () => emit((state as ChatRoomStateLoaded).copyWith(isTyping: false, isLoading: isLoading)),
+        () => _emitLoaded((current) => current.copyWith(isTyping: false, isLoading: isLoading)),
       );
     });
   }
 
+  void _onDirectChatEvent(ChannelReadEvent event) {
+    try {
+      if (addIncomingMessage(ChatMessageModel.fromJson(jsonDecode(event.data) as Map<String, dynamic>))) {
+        unawaited(_playIncomingSound());
+      }
+    } catch (e, st) {
+      unawaited(reportFrom(e, st, this));
+    }
+  }
+
+  Future<void> _playIncomingSound() async {
+    try {
+      await AudioPlayer().play(AssetSource('audio/recive_message.wav'));
+    } catch (_) {}
+  }
+
+  /// Добавляет входящее сообщение в текущий список, не затирая более новый state.
+  bool addIncomingMessage(ChatMessageModel message) {
+    final currentUserId = wsManager.userId;
+    if (currentUserId != null && message.authorId == currentUserId) {
+      return false;
+    }
+
+    final currentState = state;
+    if (currentState is! ChatRoomStateLoaded) {
+      return false;
+    }
+    if (currentState.chatMessages.any((existing) => existing.id == message.id && message.id != 0)) {
+      return false;
+    }
+
+    final added = _emitLoaded((current) {
+      if (current.chatMessages.any((existing) => existing.id == message.id && message.id != 0)) {
+        return current;
+      }
+      return current.copyWith(
+        chatMessages: [message, ...current.chatMessages],
+        isLoading: isLoading,
+      );
+    });
+    if (!added) {
+      return false;
+    }
+    chatRepository.emitNewMessageToChats(message);
+    return true;
+  }
+
+  Future<void> _subscribeToPresenceChannel({required String chatId}) async {
+    final currentState = state;
+    if (currentState is! ChatRoomStateLoaded) return;
+
+    final counterpart = resolveChatCounterpart(
+      users: currentState.chatRoom.users,
+      currentUserId: wsManager.userId,
+    );
+
+    await wsManager.initPresenceDirectChatChannel(chatId);
+    _presenceOnlineListener = (isOnline) {
+      unawaited(_handleCounterpartOnlineChanged(
+        counterpartField: counterpart.id == currentState.chatRoom.users.receiver.id
+            ? _ChatCounterpartField.receiver
+            : _ChatCounterpartField.sender,
+        isOnline: isOnline,
+      ));
+    };
+    wsManager.addPresenceDirectChatListener(
+      counterpartUserId: counterpart.id,
+      onCounterpartOnlineChanged: _presenceOnlineListener!,
+    );
+  }
+
+  Future<void> _handleCounterpartOnlineChanged({
+    required _ChatCounterpartField counterpartField,
+    required bool isOnline,
+  }) async {
+    final currentState = state;
+    if (currentState is! ChatRoomStateLoaded) return;
+
+    final counterpart = counterpartField == _ChatCounterpartField.receiver
+        ? currentState.chatRoom.users.receiver
+        : currentState.chatRoom.users.sender;
+
+    if (counterpart.isOnline == isOnline && (isOnline || counterpart.lastSeenText.isNotEmpty)) {
+      return;
+    }
+
+    if (!isOnline) {
+      await _refreshCounterpartOnlineStatus(counterpartField: counterpartField);
+      return;
+    }
+
+    _emitCounterpartOnlineStatus(
+      counterpartField: counterpartField,
+      isOnline: true,
+      lastSeenText: '',
+    );
+  }
+
+  Future<void> _refreshCounterpartOnlineStatus({
+    required _ChatCounterpartField counterpartField,
+  }) async {
+    final chatUuid = _activeChatUuid;
+    if (chatUuid == null) return;
+
+    try {
+      final chatRoom = await chatRepository.getChatRoom(chatUuid);
+      final currentState = state;
+      if (currentState is! ChatRoomStateLoaded) return;
+
+      final counterpart = resolveChatCounterpart(
+        users: chatRoom.users,
+        currentUserId: wsManager.userId,
+      );
+      final field = counterpart.id == currentState.chatRoom.users.receiver.id
+          ? _ChatCounterpartField.receiver
+          : _ChatCounterpartField.sender;
+
+      if (field != counterpartField) return;
+
+      _emitCounterpartOnlineStatus(
+        counterpartField: counterpartField,
+        isOnline: counterpart.isOnline,
+        lastSeenText: counterpart.lastSeenText,
+      );
+    } catch (e, st) {
+      await reportFrom(e, st, this);
+    }
+  }
+
+  void _emitCounterpartOnlineStatus({
+    required _ChatCounterpartField counterpartField,
+    required bool isOnline,
+    required String lastSeenText,
+  }) {
+    final currentState = state;
+    if (currentState is! ChatRoomStateLoaded) return;
+
+    final users = currentState.chatRoom.users;
+    final updatedUsers = counterpartField == _ChatCounterpartField.receiver
+        ? users.copyWith(
+            receiver: users.receiver.copyWith(
+              isOnline: isOnline,
+              lastSeenText: lastSeenText,
+            ),
+          )
+        : users.copyWith(
+            sender: users.sender.copyWith(
+              isOnline: isOnline,
+              lastSeenText: lastSeenText,
+            ),
+          );
+
+    emit(
+      currentState.copyWith(
+        chatRoom: currentState.chatRoom.copyWith(users: updatedUsers),
+      ),
+    );
+  }
+
   Future<bool> sendMessage({String? data, List<File>? files, required String userSlug}) async {
     try {
       final messageUuid = uuid.v4();
       final compressedFiles = files != null ? await ImageCompressUtility.compressFilesList(List<File>.from(files)) : null;
-      AudioPlayer().play((AssetSource('audio/send_message.wav')));
+      try {
+        unawaited(AudioPlayer().play(AssetSource('audio/send_message.wav')));
+      } catch (_) {}
 
-      // Создаем временное сообщение с состоянием loading
-      emit(
-        (state as ChatRoomStateLoaded).copyWith(
+      _emitLoaded(
+        (current) => current.copyWith(
           chatMessages: [
             ChatMessageModel(
-              id: 1,
+              id: -messageUuid.hashCode.abs(),
               data: data ?? '',
               mediaData: compressedFiles,
-              authorId: 1,
+              authorId: wsManager.userId ?? 0,
               updatedAt: DateTime.now(),
               isRead: true,
               isCurrentUserAuthor: true,
-              roomId: '',
+              roomId: current.chatRoom.id,
               messageState: MessageState.loading,
               uuid: messageUuid,
             ),
-            ...(state as ChatRoomStateLoaded).chatMessages,
+            ...current.chatMessages,
           ],
         ),
       );
 
       try {
-        // Отправляем сообщение и получаем ответ от сервера с правильными данными
         final serverMessage = await chatRepository.sendMessage(data: data, files: compressedFiles, slug: userSlug);
-
-        // Заменяем локальное сообщение данными с сервера (с правильными URL файлов)
-        emit(
-          (state as ChatRoomStateLoaded).copyWith(
-            chatMessages: (state as ChatRoomStateLoaded).chatMessages.map((elem) {
-              if (elem.uuid == messageUuid) {
-                // Сохраняем UUID, состояние и обновляем данные из ответа сервера
-                // Используем значения из локального сообщения для полей, которые могут отсутствовать в ответе
-                return serverMessage.copyWith(
-                  uuid: messageUuid,
-                  messageState: MessageState.sent,
-                  isCurrentUserAuthor: true,
-                  isRead: elem.isRead,
-                  roomId: elem.roomId ?? serverMessage.roomId,
-                  authorId: serverMessage.authorId,
-                  updatedAt: serverMessage.updatedAt,
-                );
-              }
-              return elem;
-            }).toList(),
-          ),
-        );
+        _replaceOptimisticMessage(messageUuid: messageUuid, serverMessage: serverMessage);
       } catch (e, st) {
         await reportFrom(e, st, this);
-        emit(
-          (state as ChatRoomStateLoaded).copyWith(
-            chatMessages: (state as ChatRoomStateLoaded).chatMessages.map((elem) {
+        _emitLoaded(
+          (current) => current.copyWith(
+            chatMessages: current.chatMessages.map((elem) {
               if (elem.uuid == messageUuid) {
                 return elem.copyWith(messageState: MessageState.error);
               }
@@ -294,21 +447,21 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     }
   }
 
-  Future<bool> markMessagesAsRead(String chatId, List<({int id, int index})> messagesIds) async {
+  Future<bool> markMessagesAsRead(String chatId, List<int> messageIds) async {
     try {
-      if (state is ChatRoomStateLoaded) {
-        final ids = messagesIds.map((e) => e.id).toList();
-        await chatRepository.markMessagesAsRead(chatId, ids);
-        final currentMessages = [...(state as ChatRoomStateLoaded).chatMessages];
-        for (var elem in messagesIds) {
-          currentMessages[elem.index] = currentMessages[elem.index].copyWith(isRead: true);
-        }
-        if (!isClosed) {
-          emit((state as ChatRoomStateLoaded).copyWith(chatMessages: currentMessages));
-        }
-        return true;
+      if (state is! ChatRoomStateLoaded) {
+        return false;
       }
-      return false;
+      await chatRepository.markMessagesAsRead(chatId, messageIds);
+      final idSet = messageIds.toSet();
+      _emitLoaded(
+        (current) => current.copyWith(
+          chatMessages: current.chatMessages
+              .map((message) => idSet.contains(message.id) ? message.copyWith(isRead: true) : message)
+              .toList(),
+        ),
+      );
+      return true;
     } catch (e, st) {
       await reportFrom(e, st, this);
       log(e.toString(), stackTrace: st);
@@ -316,6 +469,35 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     }
   }
 
+  void _replaceOptimisticMessage({
+    required String messageUuid,
+    required ChatMessageModel serverMessage,
+  }) {
+    _emitLoaded((current) {
+      final sentMessage = serverMessage.copyWith(
+        uuid: messageUuid,
+        messageState: MessageState.sent,
+        isCurrentUserAuthor: true,
+      );
+      final withoutDuplicate = current.chatMessages.where((message) => message.id != serverMessage.id || message.uuid == messageUuid);
+      final hasOptimistic = withoutDuplicate.any((message) => message.uuid == messageUuid);
+      if (!hasOptimistic) {
+        return current.copyWith(chatMessages: [sentMessage, ...withoutDuplicate]);
+      }
+      return current.copyWith(
+        chatMessages: withoutDuplicate.map((elem) {
+          if (elem.uuid == messageUuid) {
+            return sentMessage.copyWith(
+              isRead: elem.isRead,
+              roomId: elem.roomId?.isNotEmpty == true ? elem.roomId : serverMessage.roomId,
+            );
+          }
+          return elem;
+        }).toList(),
+      );
+    });
+  }
+
   Future<String?> getPaymentLink() async {
     try {
       final planId = (state as ChatRoomStateLoaded).chatRoom.chosenPlan?.id;
@@ -360,10 +542,16 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
 
   @override
   Future<void> close() async {
+    EasyDebounce.cancel('client-typing');
+    EasyDebounce.cancel('searchChatRoom');
+    if (_presenceOnlineListener != null) {
+      wsManager.removePresenceDirectChatListener(_presenceOnlineListener!);
+      _presenceOnlineListener = null;
+    }
     wsManager.unsubscribeDirectChatChannel();
     _timer?.cancel();
-    messagesSubscription?.cancel();
-    typingSubscription?.cancel();
+    await messagesSubscription?.cancel();
+    await typingSubscription?.cancel();
     super.close();
   }
 
@@ -380,67 +568,46 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
       final message = currentState.chatMessages.firstWhereOrNull((message) => message.uuid == uuid);
       if (message != null) {
         try {
-          AudioPlayer().play((AssetSource('audio/send_message.wav')));
+          try {
+            unawaited(AudioPlayer().play(AssetSource('audio/send_message.wav')));
+          } catch (_) {}
 
-          // Определяем, есть ли файлы для повторной отправки
           List<File>? filesToResend;
           if (message.mediaData != null && message.mediaData!.isNotEmpty) {
-            // Если mediaData содержит File объекты, используем их
-            // Если это строки (URL), то файлы уже на сервере и повторная отправка не нужна
             final firstItem = message.mediaData!.first;
             if (firstItem is File) {
               filesToResend = message.mediaData!.cast<File>();
             }
           }
 
-          emit(
-            (state as ChatRoomStateLoaded).copyWith(
+          _emitLoaded(
+            (current) => current.copyWith(
               chatMessages: [
                 ChatMessageModel(
-                  id: 1,
+                  id: -uuid.hashCode.abs(),
                   data: message.data,
                   mediaData: message.mediaData,
-                  authorId: 1,
+                  authorId: wsManager.userId ?? 0,
                   updatedAt: DateTime.now(),
                   isRead: true,
                   isCurrentUserAuthor: true,
-                  roomId: '',
+                  roomId: current.chatRoom.id,
                   messageState: MessageState.loading,
                   uuid: uuid,
                 ),
-                ...(state as ChatRoomStateLoaded).chatMessages.where((message) => message.uuid != uuid),
+                ...current.chatMessages.where((item) => item.uuid != uuid),
               ],
             ),
           );
 
           try {
-            // Отправляем сообщение и получаем ответ от сервера
             final serverMessage = await chatRepository.sendMessage(data: message.data, files: filesToResend, slug: userSlug);
-
-            // Заменяем локальное сообщение данными с сервера
-            emit(
-              (state as ChatRoomStateLoaded).copyWith(
-                chatMessages: (state as ChatRoomStateLoaded).chatMessages.map((elem) {
-                  if (elem.uuid == uuid) {
-                    return serverMessage.copyWith(
-                      uuid: uuid,
-                      messageState: MessageState.sent,
-                      isCurrentUserAuthor: true,
-                      isRead: elem.isRead,
-                      roomId: elem.roomId ?? serverMessage.roomId,
-                      authorId: serverMessage.authorId,
-                      updatedAt: serverMessage.updatedAt,
-                    );
-                  }
-                  return elem;
-                }).toList(),
-              ),
-            );
+            _replaceOptimisticMessage(messageUuid: uuid, serverMessage: serverMessage);
           } catch (e, st) {
             await reportFrom(e, st, this);
-            emit(
-              (state as ChatRoomStateLoaded).copyWith(
-                chatMessages: (state as ChatRoomStateLoaded).chatMessages.map((elem) {
+            _emitLoaded(
+              (current) => current.copyWith(
+                chatMessages: current.chatMessages.map((elem) {
                   if (elem.uuid == uuid) {
                     return elem.copyWith(messageState: MessageState.error);
                   }
@@ -458,3 +625,5 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     }
   }
 }
+
+enum _ChatCounterpartField { sender, receiver }
diff --git a/lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart b/lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart
index 52e1631e..10f91095 100644
--- a/lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart
+++ b/lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart
@@ -141,8 +141,8 @@ class ChatsCubit extends Cubit<ChatsState> {
 
   Future<void> _handleNewMessageViaSocket(dynamic data) async {
     try {
-      final json = jsonDecode(data);
-      final message = ChatMessageModel.fromJson(json['message']);
+      final json = jsonDecode(data) as Map<String, dynamic>;
+      final message = ChatMessageModel.fromJson(json);
 
       final currentChatRooms = [...state.chatRooms];
 
diff --git a/lib/features/chat/presentation/pages/chat_screen.dart b/lib/features/chat/presentation/pages/chat_screen.dart
index 8a2d42e6..4ef7ba4e 100644
--- a/lib/features/chat/presentation/pages/chat_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_screen.dart
@@ -13,13 +13,19 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cub
 import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/about_order_button.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/chat_bubble_widget.dart';
+import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
+import 'package:eatvio_app/features/chat/models/chat_user_model.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/plan_order_message_widget.dart';
+import 'package:eatvio_app/features/chat/presentation/widgets/video_call_chat_message_widget.dart';
 import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/websockets/ws_manager.dart';
 import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart';
 import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_state.dart';
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/chat/presentation/widgets/chat_user_online_status_line.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/notification_banner.dart';
+import 'package:eatvio_app/features/chat/utils/chat_counterpart_utils.dart';
 import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
 import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
 import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
@@ -50,8 +56,7 @@ class _ChatScreenState extends State<ChatScreen> {
   final scrollController = ScrollController();
   final TextEditingController textEditingController = TextEditingController();
   final ChatRoomCubit chatRoomCubit = sl<ChatRoomCubit>();
-  final List<({int id, int index})> unreadMessagesIds = [];
-  final List<({int id, int index})> unreadMessagesIdsCopy = [];
+  final List<int> unreadMessageIds = [];
   final showableChatBadgeStates = ChosenPlanStateEnum.getShowableChatBadgeStates();
   late AppLifecycleListener _listener;
   List<File> pickedFiles = [];
@@ -59,7 +64,7 @@ class _ChatScreenState extends State<ChatScreen> {
   /// Conversation uuid после успешного init (в т.ч. после resolve по orderId).
   String? _effectiveUuid;
 
-  String? get _conversationUuid => _effectiveUuid ?? widget.uuid;
+  String? get conversationUuid => _effectiveUuid ?? widget.uuid;
 
   void _onHide() {
     chatRoomCubit.cancelTimer();
@@ -72,7 +77,7 @@ class _ChatScreenState extends State<ChatScreen> {
 
   Future<void> _initChatRoom() async {
     final uuid = await chatRoomCubit.initChat(
-      _conversationUuid,
+      conversationUuid,
       orderId: _effectiveUuid == null ? widget.orderId : null,
       sendInitialMessage: widget.sendInitialMessage ?? false,
     );
@@ -101,7 +106,7 @@ class _ChatScreenState extends State<ChatScreen> {
   }
 
   void _onScroll() {
-    final uuid = _conversationUuid;
+    final uuid = conversationUuid;
     if (uuid == null) return;
     if (scrollController.offset >= scrollController.position.maxScrollExtent && !scrollController.position.outOfRange) {
       chatRoomCubit.loadNextPage(uuid);
@@ -110,6 +115,7 @@ class _ChatScreenState extends State<ChatScreen> {
 
   @override
   void dispose() {
+    EasyDebounce.cancel('mark_as_read');
     scrollController.dispose();
     _listener.dispose();
     chatRoomCubit.close();
@@ -162,6 +168,7 @@ class _ChatScreenState extends State<ChatScreen> {
   }
 
   Scaffold _buildChat(BuildContext context, ChatRoomStateLoaded state) {
+    final chatCounterpart = resolveChatCounterpart(users: state.chatRoom.users, currentUserId: sl<WsManager>().userId);
     final chosenPlan = state.chatRoom.chosenPlan;
     final amIConsultant = chosenPlan?.consultantId == state.chatRoom.users.sender.id;
     final showUserDetailsButton = [
@@ -238,19 +245,31 @@ class _ChatScreenState extends State<ChatScreen> {
                   ),
                 ),
               const SizedBox(width: 16),
-              Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(state.chatRoom.users.receiver.name, style: CustomTextStyles.titleSmallBold.copyWith(color: PrimaryColors().black)),
-                  AnimatedCrossFade(
-                    firstChild: Text('Печатает...', style: CustomTextStyles.bodySmallMulishPrimary),
-                    firstCurve: Curves.easeIn,
-                    secondCurve: Curves.easeOut,
-                    secondChild: const SizedBox.shrink(),
-                    crossFadeState: state.isTyping ? CrossFadeState.showFirst : CrossFadeState.showSecond,
-                    duration: const Duration(milliseconds: 150),
-                  ),
-                ],
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      state.chatRoom.users.receiver.name,
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      style: CustomTextStyles.titleSmallBold.copyWith(color: PrimaryColors().black),
+                    ),
+                    AnimatedCrossFade(
+                      firstChild: Text('Печатает...', maxLines: 1, overflow: TextOverflow.ellipsis, style: CustomTextStyles.bodySmallMulishPrimary),
+                      firstCurve: Curves.easeIn,
+                      secondCurve: Curves.easeOut,
+                      secondChild: ChatUserOnlineStatusLine(
+                        isOnline: chatCounterpart.isOnline,
+                        lastSeenText: chatCounterpart.lastSeenText,
+                        style: CustomTextStyles.bodySmallMulishPrimary,
+                        showOnlineDot: false,
+                      ),
+                      crossFadeState: state.isTyping ? CrossFadeState.showFirst : CrossFadeState.showSecond,
+                      duration: const Duration(milliseconds: 150),
+                    ),
+                  ],
+                ),
               ),
             ],
           ),
@@ -258,18 +277,7 @@ class _ChatScreenState extends State<ChatScreen> {
         actions: [
           Padding(
             padding: const EdgeInsetsDirectional.only(end: 8),
-            child: _ChatHeaderVideoCallButton(
-              onPressed: () {
-                GoRouter.of(context).pushNamed(
-                  VideoCallScreen.name,
-                  extra: <String, dynamic>{
-                    'conversationUuid': _conversationUuid,
-                    'counterpartName': state.chatRoom.users.receiver.name,
-                    'localParticipantName': state.chatRoom.users.sender.name,
-                  },
-                );
-              },
-            ),
+            child: _ChatHeaderVideoCallButton(onPressed: () => _openVideoCall(context, state, chatCounterpart)),
           ),
         ],
       ),
@@ -304,7 +312,7 @@ class _ChatScreenState extends State<ChatScreen> {
                                   index + 1 == state.chatMessages.length) {
                                 final isCurrentUserAuthor = state.chatRoom.users.receiver.id != state.chatMessages[index].authorId;
                                 final message = state.chatMessages[index];
-                                final isPlanOrderMessage = message.type == 'plan_order';
+                                final isPlanOrderMessage = message.type == ChatMessageType.planOrder;
 
                                 PacketOptions? messageOption;
                                 if (isPlanOrderMessage && chosenPlan != null) {
@@ -329,34 +337,23 @@ class _ChatScreenState extends State<ChatScreen> {
                                         isCurrentUser: isCurrentUserAuthor,
                                       ),
                                     VisibilityDetector(
-                                      key: Key(message.id.toString()),
+                                      key: ValueKey('msg-${message.uuid ?? message.id}'),
                                       onVisibilityChanged: (VisibilityInfo info) {
-                                        if (!message.isRead && !isCurrentUserAuthor && info.visibleFraction > 0) {
-                                          unreadMessagesIdsCopy.add((id: message.id, index: index));
-                                          EasyDebounce.debounce('mark_as_read', const Duration(milliseconds: 500), () async {
-                                            final result = await context.read<ChatRoomCubit>().markMessagesAsRead(state.chatRoom.id, unreadMessagesIdsCopy);
-                                            if (!result) return;
-                                            if (!context.mounted) return;
-                                            context.read<ChatsCubit>().reduceUnreadMessagesCount(
-                                              chatId: state.chatRoom.id,
-                                              count: unreadMessagesIdsCopy.length,
-                                            );
-                                            unreadMessagesIdsCopy.clear();
-                                          });
-                                        }
+                                        _queueMarkAsRead(
+                                          context: context,
+                                          chatId: state.chatRoom.id,
+                                          message: message,
+                                          isCurrentUserAuthor: isCurrentUserAuthor,
+                                          visibleFraction: info.visibleFraction,
+                                        );
                                       },
-                                      child: ChatBubbleWidget(
-                                        isRead: message.isRead,
-                                        sendTime: message.updatedAt,
-                                        text: message.data.trim(),
-                                        isCurrentUser: isCurrentUserAuthor,
-                                        mediaData: message.mediaData ?? [],
-                                        messageState: message.messageState,
-                                        messageUuid: message.uuid ?? '',
-                                        userSlug: state.chatRoom.users.receiver.slug,
-                                        messageType: message.type,
-                                        isConsultant: amIConsultant,
-                                        urlsMediaInfo: message.urlsMediaInfo,
+                                      child: _buildMessageBubble(
+                                        context: context,
+                                        state: state,
+                                        chatCounterpart: chatCounterpart,
+                                        isCurrentUserAuthor: isCurrentUserAuthor,
+                                        message: message,
+                                        amIConsultant: amIConsultant,
                                       ),
                                     ),
                                   ],
@@ -364,7 +361,7 @@ class _ChatScreenState extends State<ChatScreen> {
                               }
                               final isCurrentUserAuthor = state.chatRoom.users.receiver.id != state.chatMessages[index].authorId;
                               final message = state.chatMessages[index];
-                              final isPlanOrderMessage = message.type == 'plan_order';
+                              final isPlanOrderMessage = message.type == ChatMessageType.planOrder;
 
                               PacketOptions? messageOption;
                               if (isPlanOrderMessage && chosenPlan != null) {
@@ -388,31 +385,23 @@ class _ChatScreenState extends State<ChatScreen> {
                                       isCurrentUser: isCurrentUserAuthor,
                                     ),
                                   VisibilityDetector(
-                                    key: Key(message.id.toString()),
+                                    key: ValueKey('msg-${message.uuid ?? message.id}'),
                                     onVisibilityChanged: (VisibilityInfo info) {
-                                      if (!message.isRead && !isCurrentUserAuthor && info.visibleFraction > 0) {
-                                        unreadMessagesIds.add((id: message.id, index: index));
-                                        EasyDebounce.debounce('mark_as_read', const Duration(milliseconds: 500), () async {
-                                          final result = await context.read<ChatRoomCubit>().markMessagesAsRead(state.chatRoom.id, unreadMessagesIds);
-                                          if (!result) return;
-                                          if (!context.mounted) return;
-                                          context.read<ChatsCubit>().reduceUnreadMessagesCount(chatId: state.chatRoom.id, count: unreadMessagesIds.length);
-                                          unreadMessagesIds.clear();
-                                        });
-                                      }
+                                      _queueMarkAsRead(
+                                        context: context,
+                                        chatId: state.chatRoom.id,
+                                        message: message,
+                                        isCurrentUserAuthor: isCurrentUserAuthor,
+                                        visibleFraction: info.visibleFraction,
+                                      );
                                     },
-                                    child: ChatBubbleWidget(
-                                      isRead: message.isRead,
-                                      sendTime: message.updatedAt,
-                                      text: message.data.trim(),
-                                      isCurrentUser: isCurrentUserAuthor,
-                                      mediaData: message.mediaData ?? [],
-                                      messageState: message.messageState,
-                                      messageUuid: message.uuid ?? '',
-                                      userSlug: state.chatRoom.users.receiver.slug,
-                                      messageType: message.type,
-                                      isConsultant: amIConsultant,
-                                      urlsMediaInfo: message.urlsMediaInfo,
+                                    child: _buildMessageBubble(
+                                      context: context,
+                                      state: state,
+                                      chatCounterpart: chatCounterpart,
+                                      isCurrentUserAuthor: isCurrentUserAuthor,
+                                      message: message,
+                                      amIConsultant: amIConsultant,
                                     ),
                                   ),
                                 ],
@@ -779,6 +768,79 @@ class _ChatScreenState extends State<ChatScreen> {
       ),
     );
   }
+
+  void _openVideoCall(BuildContext context, ChatRoomStateLoaded state, ChatUserModel chatCounterpart) {
+    GoRouter.of(context).pushNamed(
+      VideoCallScreen.name,
+      extra: <String, dynamic>{
+        'conversationUuid': conversationUuid,
+        'counterpartName': chatCounterpart.name,
+        'counterpartAvatarUrl': chatCounterpart.profilePhotoUrl,
+        'counterpartUserId': chatCounterpart.id,
+        'counterpartIsOnline': chatCounterpart.isOnline,
+        'counterpartLastSeenText': chatCounterpart.lastSeenText,
+        'localParticipantName': state.chatRoom.users.sender.name,
+      },
+    );
+  }
+
+  void _queueMarkAsRead({
+    required BuildContext context,
+    required String chatId,
+    required ChatMessageModel message,
+    required bool isCurrentUserAuthor,
+    required double visibleFraction,
+  }) {
+    if (message.isRead || isCurrentUserAuthor || visibleFraction <= 0) {
+      return;
+    }
+    if (!unreadMessageIds.contains(message.id)) {
+      unreadMessageIds.add(message.id);
+    }
+    EasyDebounce.debounce('mark_as_read', const Duration(milliseconds: 500), () async {
+      final ids = List<int>.from(unreadMessageIds);
+      if (ids.isEmpty) {
+        return;
+      }
+      unreadMessageIds.clear();
+      final result = await context.read<ChatRoomCubit>().markMessagesAsRead(chatId, ids);
+      if (!result || !context.mounted) {
+        return;
+      }
+      context.read<ChatsCubit>().reduceUnreadMessagesCount(chatId: chatId, count: ids.length);
+    });
+  }
+
+  Widget _buildMessageBubble({
+    required BuildContext context,
+    required ChatRoomStateLoaded state,
+    required ChatUserModel chatCounterpart,
+    required bool isCurrentUserAuthor,
+    required ChatMessageModel message,
+    required bool? amIConsultant,
+  }) {
+    if (message.type == ChatMessageType.videoCallStarted && !isCurrentUserAuthor) {
+      return VideoCallChatMessageWidget(
+        text: message.data.trim(),
+        sendTime: message.updatedAt,
+        onVideoCallPressed: () => _openVideoCall(context, state, chatCounterpart),
+      );
+    }
+
+    return ChatBubbleWidget(
+      isRead: message.isRead,
+      sendTime: message.updatedAt,
+      text: message.data.trim(),
+      isCurrentUser: isCurrentUserAuthor,
+      mediaData: message.mediaData ?? [],
+      messageState: message.messageState,
+      messageUuid: message.uuid ?? '',
+      userSlug: state.chatRoom.users.receiver.slug,
+      messageType: message.type,
+      isConsultant: amIConsultant,
+      urlsMediaInfo: message.urlsMediaInfo,
+    );
+  }
 }
 
 class _ChatHeaderVideoCallButton extends StatelessWidget {
@@ -800,9 +862,7 @@ class _ChatHeaderVideoCallButton extends StatelessWidget {
         child: SizedBox(
           width: 40,
           height: 40,
-          child: Center(
-            child: Icon(Icons.videocam_rounded, color: appTheme.blueA400, size: 18),
-          ),
+          child: Center(child: Icon(Icons.videocam_rounded, color: appTheme.blueA400, size: 18)),
         ),
       ),
     );
diff --git a/lib/features/chat/presentation/pages/photo_view_screen.dart b/lib/features/chat/presentation/pages/photo_view_screen.dart
index 3cbdc744..b9910feb 100644
--- a/lib/features/chat/presentation/pages/photo_view_screen.dart
+++ b/lib/features/chat/presentation/pages/photo_view_screen.dart
@@ -14,11 +14,15 @@ class PhotoViewScreen extends StatefulWidget {
   final int index;
   final bool isLocal;
 
+  /// When set, used instead of the image URL so source/destination tags stay unique.
+  final Object? heroTag;
+
   const PhotoViewScreen({
     super.key,
     required this.imageUrls,
     required this.index,
     this.isLocal = false,
+    this.heroTag,
   });
 
   @override
@@ -36,6 +40,23 @@ class _PhotoViewScreenState extends State<PhotoViewScreen> {
     super.initState();
   }
 
+  PhotoViewHeroAttributes? _heroAttributesFor(int index) {
+    if (widget.heroTag != null) {
+      if (index != widget.index) {
+        return null;
+      }
+      return PhotoViewHeroAttributes(
+        tag: widget.heroTag!,
+        transitionOnUserGestures: true,
+      );
+    }
+
+    return PhotoViewHeroAttributes(
+      tag: widget.imageUrls[index],
+      transitionOnUserGestures: true,
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return DismissiblePage(
@@ -44,23 +65,19 @@ class _PhotoViewScreenState extends State<PhotoViewScreen> {
       direction: DismissiblePageDismissDirection.vertical,
       isFullScreen: true,
       child: PhotoViewGallery.builder(
-        backgroundDecoration: const BoxDecoration(
-          color: Colors.transparent,
-        ),
+        backgroundDecoration: const BoxDecoration(color: Colors.transparent),
         scrollPhysics: const BouncingScrollPhysics(),
         builder: (BuildContext context, int index) {
           final imageProvider = widget.isLocal
               ? FileImage(widget.imageUrls[index]) as ImageProvider<Object>
-              : CachedNetworkImageProvider(widget.imageUrls[index]) as ImageProvider<Object>;
+              : CachedNetworkImageProvider(widget.imageUrls[index])
+                    as ImageProvider<Object>;
 
           return PhotoViewGalleryPageOptions(
             imageProvider: imageProvider,
             initialScale: PhotoViewComputedScale.contained,
             minScale: PhotoViewComputedScale.contained,
-            heroAttributes: PhotoViewHeroAttributes(
-              tag: widget.imageUrls[index],
-              transitionOnUserGestures: true,
-            ),
+            heroAttributes: _heroAttributesFor(index),
             errorBuilder: (context, object, stackTrace) {
               return Scaffold(
                 backgroundColor: Colors.black,
@@ -76,8 +93,12 @@ class _PhotoViewScreenState extends State<PhotoViewScreen> {
                         ),
                         contentPadding: const EdgeInsets.all(16),
                         onTap: () async {
-                          if (!await launchUrl(Uri.parse(widget.imageUrls[index]))) {
-                            throw Exception('Could not launch ${widget.imageUrls[index]}');
+                          if (!await launchUrl(
+                            Uri.parse(widget.imageUrls[index]),
+                          )) {
+                            throw Exception(
+                              'Could not launch ${widget.imageUrls[index]}',
+                            );
                           }
                         },
                         leading: const Icon(
@@ -89,7 +110,10 @@ class _PhotoViewScreenState extends State<PhotoViewScreen> {
                           color: Colors.white,
                         ),
                         title: Text(
-                          widget.imageUrls[index].replaceAll('${sl<AppConfig>().baseUrl}/storage/chat_files/', ''),
+                          widget.imageUrls[index].replaceAll(
+                            '${sl<AppConfig>().baseUrl}/storage/chat_files/',
+                            '',
+                          ),
                           style: const TextStyle(
                             color: Colors.white,
                             fontSize: 12,
@@ -109,7 +133,9 @@ class _PhotoViewScreenState extends State<PhotoViewScreen> {
             width: 20.0,
             height: 20.0,
             child: CircularProgressIndicator(
-              value: event == null ? 0 : event.cumulativeBytesLoaded / event.expectedTotalBytes!,
+              value: event == null
+                  ? 0
+                  : event.cumulativeBytesLoaded / event.expectedTotalBytes!,
             ),
           ),
         ),
diff --git a/lib/features/chat/presentation/widgets/chat_bubble_widget.dart b/lib/features/chat/presentation/widgets/chat_bubble_widget.dart
index 5b634d9d..8d83e961 100644
--- a/lib/features/chat/presentation/widgets/chat_bubble_widget.dart
+++ b/lib/features/chat/presentation/widgets/chat_bubble_widget.dart
@@ -39,7 +39,7 @@ class ChatBubbleWidget extends StatelessWidget {
   final MessageState messageState;
   final String messageUuid;
   final String userSlug;
-  final String? messageType;
+  final ChatMessageType? messageType;
   final bool? isConsultant;
   final List<Map<String, dynamic>>? urlsMediaInfo;
   @override
@@ -182,33 +182,36 @@ class ChatBubbleWidget extends StatelessWidget {
                                     }
                                   }
 
-                                  return ListTile(
-                                    contentPadding: const EdgeInsets.all(4),
-                                    horizontalTitleGap: 8,
-                                    onTap: () async {
-                                      if (mediaItem is File) {
-                                        // Для локальных файлов используем file:// URI
-                                        final fileUri = Uri.file(mediaItem.path);
-                                        if (await canLaunchUrl(fileUri)) {
-                                          await launchUrl(fileUri, mode: LaunchMode.externalApplication);
+                                  return Material(
+                                    color: Colors.transparent,
+                                    child: ListTile(
+                                      contentPadding: const EdgeInsets.all(4),
+                                      horizontalTitleGap: 8,
+                                      onTap: () async {
+                                        if (mediaItem is File) {
+                                          // Для локальных файлов используем file:// URI
+                                          final fileUri = Uri.file(mediaItem.path);
+                                          if (await canLaunchUrl(fileUri)) {
+                                            await launchUrl(fileUri, mode: LaunchMode.externalApplication);
+                                          }
+                                        } else {
+                                          // Для URL файлов используем обычный launchUrl
+                                          final urlString = mediaItem.toString();
+                                          final uri = urlString.startsWith('http://') || urlString.startsWith('https://')
+                                              ? Uri.parse(urlString)
+                                              : Uri.parse('https://$urlString');
+                                          if (await canLaunchUrl(uri)) {
+                                            await launchUrl(uri, mode: LaunchMode.externalApplication);
+                                          }
                                         }
-                                      } else {
-                                        // Для URL файлов используем обычный launchUrl
-                                        final urlString = mediaItem.toString();
-                                        final uri = urlString.startsWith('http://') || urlString.startsWith('https://')
-                                            ? Uri.parse(urlString)
-                                            : Uri.parse('https://$urlString');
-                                        if (await canLaunchUrl(uri)) {
-                                          await launchUrl(uri, mode: LaunchMode.externalApplication);
-                                        }
-                                      }
-                                    },
-                                    leading: const Icon(Icons.file_copy_outlined, color: Colors.black),
-                                    trailing: const Icon(Icons.download_outlined, color: Colors.black),
-                                    title: Text(
-                                      fileName,
-                                      maxLines: 2,
-                                      style: const TextStyle(color: Colors.black, fontSize: 12, overflow: TextOverflow.ellipsis),
+                                      },
+                                      leading: const Icon(Icons.file_copy_outlined, color: Colors.black),
+                                      trailing: const Icon(Icons.download_outlined, color: Colors.black),
+                                      title: Text(
+                                        fileName,
+                                        maxLines: 2,
+                                        style: const TextStyle(color: Colors.black, fontSize: 12, overflow: TextOverflow.ellipsis),
+                                      ),
                                     ),
                                   );
                                 }
@@ -255,7 +258,7 @@ class ChatBubbleWidget extends StatelessWidget {
   }
 
   String _getDisplayText() {
-    if (messageType == 'plan_order') {
+    if (messageType == ChatMessageType.planOrder) {
       if (isConsultant == true) {
         // Текст для консультанта
         return '1. Уточните у подопечного его цели и пожелания\n'
diff --git a/lib/features/chat/presentation/widgets/chat_user_online_status_line.dart b/lib/features/chat/presentation/widgets/chat_user_online_status_line.dart
new file mode 100644
index 00000000..8f851ab2
--- /dev/null
+++ b/lib/features/chat/presentation/widgets/chat_user_online_status_line.dart
@@ -0,0 +1,70 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+
+class ChatUserOnlineStatusLine extends StatelessWidget {
+  const ChatUserOnlineStatusLine({
+    super.key,
+    required this.isOnline,
+    required this.lastSeenText,
+    this.style,
+    this.showOnlineDot = true,
+  });
+
+  final bool isOnline;
+  final String lastSeenText;
+  final TextStyle? style;
+  final bool showOnlineDot;
+
+  @override
+  Widget build(BuildContext context) {
+    final textStyle = style ??
+        CustomTextStyles.bodySmallMulishBlack900.copyWith(height: 14 / 12);
+
+    if (isOnline) {
+      if (!showOnlineDot) {
+        return Text(
+          S.of(context).video_call_status_online,
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: textStyle,
+        );
+      }
+      return Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Container(
+            width: 8,
+            height: 8,
+            decoration: BoxDecoration(
+              color: appTheme.greenA700,
+              shape: BoxShape.circle,
+            ),
+          ),
+          const SizedBox(width: 8),
+          Flexible(
+            child: Text(
+              S.of(context).video_call_status_online,
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+              style: textStyle,
+            ),
+          ),
+        ],
+      );
+    }
+
+    final trimmedLastSeen = lastSeenText.trim();
+    if (trimmedLastSeen.isEmpty) {
+      return const SizedBox.shrink();
+    }
+
+    return Text(
+      trimmedLastSeen,
+      maxLines: 1,
+      overflow: TextOverflow.ellipsis,
+      style: textStyle,
+    );
+  }
+}
diff --git a/lib/features/chat/presentation/widgets/video_call_chat_message_widget.dart b/lib/features/chat/presentation/widgets/video_call_chat_message_widget.dart
new file mode 100644
index 00000000..90930e1d
--- /dev/null
+++ b/lib/features/chat/presentation/widgets/video_call_chat_message_widget.dart
@@ -0,0 +1,103 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/utils/date_time_utils.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+class VideoCallChatMessageWidget extends StatelessWidget {
+  const VideoCallChatMessageWidget({
+    super.key,
+    required this.text,
+    required this.sendTime,
+    required this.onVideoCallPressed,
+  });
+
+  final String text;
+  final DateTime sendTime;
+  final VoidCallback onVideoCallPressed;
+
+  @override
+  Widget build(BuildContext context) {
+    final size = MediaQuery.sizeOf(context);
+    final textStyle = TextStyles.textFS13FW400.copyWith(color: appTheme.black, fontSize: 16);
+
+    return SizedBox(
+      width: size.width,
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(16, 10, 64, 4),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.end,
+          children: [
+            Container(
+              constraints: BoxConstraints(maxWidth: size.width * 0.7),
+              decoration: BoxDecoration(
+                color: appTheme.gray60004,
+                borderRadius: const BorderRadius.horizontal(
+                  left: Radius.circular(16),
+                  right: Radius.circular(24),
+                ),
+              ),
+              child: Padding(
+                padding: const EdgeInsets.fromLTRB(8, 8, 16, 8),
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    if (text.isNotEmpty)
+                      Flexible(
+                        child: Text(text, style: textStyle),
+                      ),
+                    if (text.isNotEmpty) const SizedBox(width: 8),
+                    _VideoCallBubbleActionButton(onPressed: onVideoCallPressed),
+                  ],
+                ),
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.only(left: 4, bottom: 4),
+              child: Text(
+                sendTime.format('HH:mm', 'ru'),
+                style: const TextStyle(
+                  color: Color(0xFF7B8794),
+                  height: 1,
+                  fontSize: 10,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _VideoCallBubbleActionButton extends StatelessWidget {
+  const _VideoCallBubbleActionButton({required this.onPressed});
+
+  final VoidCallback onPressed;
+
+  @override
+  Widget build(BuildContext context) {
+    return Material(
+      color: appTheme.greenA700,
+      borderRadius: BorderRadius.circular(10),
+      clipBehavior: Clip.antiAlias,
+      child: InkWell(
+        onTap: onPressed,
+        child: SizedBox(
+          width: 36,
+          height: 36,
+          child: Center(
+            child: SvgPicture.asset(
+              'assets/icons/video_call/vc_control_enter.svg',
+              width: 20,
+              height: 20,
+              fit: BoxFit.contain,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/features/chat/services/chat_service.dart b/lib/features/chat/services/chat_service.dart
index 2d5ceaac..3bd6a505 100644
--- a/lib/features/chat/services/chat_service.dart
+++ b/lib/features/chat/services/chat_service.dart
@@ -6,6 +6,10 @@ import 'package:eatvio_app/features/chat/models/chat_room_pagination_model.dart'
 import 'package:eatvio_app/features/chat/models/order_id_to_conversation_model.dart';
 import 'package:eatvio_app/features/chat/models/payment_model.dart';
 import 'package:eatvio_app/features/chat/models/plan_complain_model.dart';
+import 'package:eatvio_app/features/payment/models/promo_applied_list_response.dart';
+import 'package:eatvio_app/features/payment/models/promo_apply_response.dart';
+import 'package:eatvio_app/features/payment/models/promo_remove_response.dart';
+import 'package:eatvio_app/features/payment/models/promo_validate_response.dart';
 import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
 import 'package:retrofit/retrofit.dart';
 
@@ -69,6 +73,26 @@ abstract class ChatService {
     @Body() required Map<String, String> body,
   });
 
+  @GET('/api/chosen_plans/applied_promos')
+  Future<PromoAppliedListResponse> listAppliedPromoCodes();
+
+  @POST('/api/chosen_plans/{id}/validate_promo')
+  Future<PromoValidateResponse> validatePromoCode({
+    @Path() required int id,
+    @Body() required Map<String, String> body,
+  });
+
+  @POST('/api/chosen_plans/{id}/apply_promo')
+  Future<PromoApplyResponse> applyPromoCode({
+    @Path() required int id,
+    @Body() required Map<String, String> body,
+  });
+
+  @DELETE('/api/chosen_plans/{id}/remove_promo_code')
+  Future<PromoRemoveResponse> removePromoCode({
+    @Path() required int id,
+  });
+
   @GET('/api/consultation/resolve/order_id_to_conversation/{orderId}')
   Future<OrderIdToConversationModel> resolveOrderIdToConversation({
     @Path() required String orderId,
diff --git a/lib/features/chat/utils/chat_counterpart_utils.dart b/lib/features/chat/utils/chat_counterpart_utils.dart
new file mode 100644
index 00000000..1fe562c5
--- /dev/null
+++ b/lib/features/chat/utils/chat_counterpart_utils.dart
@@ -0,0 +1,15 @@
+import 'package:eatvio_app/features/chat/models/chat_room_model.dart';
+import 'package:eatvio_app/features/chat/models/chat_user_model.dart';
+
+ChatUserModel resolveChatCounterpart({
+  required Users users,
+  required int? currentUserId,
+}) {
+  if (currentUserId != null && users.sender.id == currentUserId) {
+    return users.receiver;
+  }
+  if (currentUserId != null && users.receiver.id == currentUserId) {
+    return users.sender;
+  }
+  return users.receiver;
+}
diff --git a/lib/features/consultant/become_consultant/enums/alfa_scoring_status.dart b/lib/features/consultant/become_consultant/enums/alfa_scoring_status.dart
new file mode 100644
index 00000000..60d5b86c
--- /dev/null
+++ b/lib/features/consultant/become_consultant/enums/alfa_scoring_status.dart
@@ -0,0 +1,51 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+enum AlfaScoringStatus {
+  @JsonValue('none')
+  none,
+  @JsonValue('beneficiary_creating')
+  beneficiaryCreating,
+  @JsonValue('beneficiary_failed')
+  beneficiaryFailed,
+  @JsonValue('scoring_pending')
+  scoringPending,
+  @JsonValue('scoring_complete')
+  scoringComplete,
+  @JsonValue('scoring_failed')
+  scoringFailed;
+
+  static AlfaScoringStatus fromString(String? value) {
+    switch (value) {
+      case 'beneficiary_creating':
+        return AlfaScoringStatus.beneficiaryCreating;
+      case 'beneficiary_failed':
+        return AlfaScoringStatus.beneficiaryFailed;
+      case 'scoring_pending':
+        return AlfaScoringStatus.scoringPending;
+      case 'scoring_complete':
+        return AlfaScoringStatus.scoringComplete;
+      case 'scoring_failed':
+        return AlfaScoringStatus.scoringFailed;
+      case 'none':
+      case null:
+      case '':
+        return AlfaScoringStatus.none;
+      default:
+        return AlfaScoringStatus.none;
+    }
+  }
+
+  bool get isProcessing =>
+      this == AlfaScoringStatus.beneficiaryCreating ||
+      this == AlfaScoringStatus.scoringPending;
+
+  bool get isFailed =>
+      this == AlfaScoringStatus.beneficiaryFailed ||
+      this == AlfaScoringStatus.scoringFailed;
+
+  bool get canRetry => isFailed;
+
+  bool get isComplete => this == AlfaScoringStatus.scoringComplete;
+
+  bool get isTerminal => isComplete || isFailed;
+}
diff --git a/lib/features/consultant/become_consultant/models/consultant_cert_photo_model.dart b/lib/features/consultant/become_consultant/models/consultant_cert_photo_model.dart
index aaec9b68..79735be5 100644
--- a/lib/features/consultant/become_consultant/models/consultant_cert_photo_model.dart
+++ b/lib/features/consultant/become_consultant/models/consultant_cert_photo_model.dart
@@ -18,7 +18,8 @@ abstract class ConsultantCertPhotoModel with _$ConsultantCertPhotoModel {
 
   const ConsultantCertPhotoModel._();
 
-  factory ConsultantCertPhotoModel.fromJson(Map<String, dynamic> json) => _$ConsultantCertPhotoModelFromJson(json);
+  factory ConsultantCertPhotoModel.fromJson(Map<String, dynamic> json) =>
+      _$ConsultantCertPhotoModelFromJson(json);
 
   static const String visibleGroup = 'user_certs';
   static const String hiddenGroup = 'hidden_user_certs';
diff --git a/lib/features/consultant/become_consultant/models/consultant_profile_model.dart b/lib/features/consultant/become_consultant/models/consultant_profile_model.dart
index 535b58fd..c80e46b2 100644
--- a/lib/features/consultant/become_consultant/models/consultant_profile_model.dart
+++ b/lib/features/consultant/become_consultant/models/consultant_profile_model.dart
@@ -1,3 +1,4 @@
+import 'package:eatvio_app/features/consultant/become_consultant/utils/passport_data_validator.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'consultant_profile_model.freezed.dart';
@@ -6,27 +7,70 @@ part 'consultant_profile_model.g.dart';
 
 @freezed
 abstract class ConsultantProfileModel with _$ConsultantProfileModel {
+  const ConsultantProfileModel._();
+
   const factory ConsultantProfileModel({
-    @JsonKey(name: 'has_medical_education', includeIfNull:  false) bool? hasMedicalEducation,
-    @JsonKey(name: 'social_links', includeIfNull:  false) SocialLinksModel? socialLinks,
-    @JsonKey(name: 'cert_photos', includeIfNull:  false) List<String>? photos,
-    @JsonKey(name: 'completed_courses', includeIfNull:  false) List<CertificatesModel>? certificates,
+    @JsonKey(name: 'has_medical_education', includeIfNull: false)
+    bool? hasMedicalEducation,
+    @JsonKey(name: 'social_links', includeIfNull: false)
+    SocialLinksModel? socialLinks,
+    @JsonKey(name: 'cert_photos', includeIfNull: false) List<String>? photos,
+    @JsonKey(name: 'completed_courses', includeIfNull: false)
+    List<CertificatesModel>? certificates,
+    @JsonKey(name: 'legal_type', includeIfNull: false) String? legalType,
+    @JsonKey(name: 'last_name', includeIfNull: false) String? lastName,
+    @JsonKey(name: 'first_name', includeIfNull: false) String? firstName,
+    @JsonKey(name: 'middle_name', includeIfNull: false) String? middleName,
+    @JsonKey(name: 'inn', includeIfNull: false) String? inn,
+    @JsonKey(name: 'snils', includeIfNull: false) String? snils,
+    @JsonKey(name: 'passport_series', includeIfNull: false)
+    String? passportSeries,
+    @JsonKey(name: 'passport_number', includeIfNull: false)
+    String? passportNumber,
+    @JsonKey(name: 'passport_issue_date', includeIfNull: false)
+    String? passportIssueDate,
+    @JsonKey(name: 'passport_issuer', includeIfNull: false)
+    String? passportIssuer,
+    @JsonKey(name: 'passport_issuer_code', includeIfNull: false)
+    String? passportIssuerCode,
+    @JsonKey(name: 'birth_date', includeIfNull: false) String? birthDate,
+    @JsonKey(name: 'birth_place', includeIfNull: false) String? birthPlace,
+    @JsonKey(name: 'registration_address', includeIfNull: false)
+    String? registrationAddress,
+    @JsonKey(name: 'residence_address', includeIfNull: false)
+    String? residenceAddress,
+    @JsonKey(name: 'citizenship', includeIfNull: false) String? citizenship,
+    @JsonKey(name: 'tax_resident_us', includeIfNull: false) bool? taxResidentUs,
+    @JsonKey(name: 'foreign_tax_resident', includeIfNull: false)
+    bool? foreignTaxResident,
+    @JsonKey(name: 'sbp_phone', includeIfNull: false) String? sbpPhone,
+    @JsonKey(name: 'sbp_bank_member_id', includeIfNull: false)
+    String? sbpBankMemberId,
+    @JsonKey(name: 'agreement_accepted', includeIfNull: false)
+    bool? agreementAccepted,
+    @JsonKey(name: 'frdo_agreement_accepted', includeIfNull: false)
+    bool? frdoAgreementAccepted,
   }) = _ConsultantProfileModel;
 
-  factory ConsultantProfileModel.fromJson(Map<String, Object?> json) => _$ConsultantProfileModelFromJson(json);
+  factory ConsultantProfileModel.fromJson(Map<String, Object?> json) =>
+      _$ConsultantProfileModelFromJson(json);
+
+  bool get hasValidPassportData => PassportDataValidator.validate(this).isEmpty;
 }
 
 @freezed
 abstract class SocialLinksModel with _$SocialLinksModel {
   const factory SocialLinksModel({
-    @JsonKey(name: 'vk_link', includeIfNull:  false) String? vkLink,
-    @JsonKey(name: 'tg_link', includeIfNull:  false) String? tgLink,
-    @JsonKey(name: 'fb_link', includeIfNull:  false) String? fbLink,
-    @JsonKey(name: 'insta_link', includeIfNull:  false) String? instaLink,
-    @JsonKey(name: 'personal_site_link', includeIfNull:  false) String? personalSiteLink,
+    @JsonKey(name: 'vk_link', includeIfNull: false) String? vkLink,
+    @JsonKey(name: 'tg_link', includeIfNull: false) String? tgLink,
+    @JsonKey(name: 'fb_link', includeIfNull: false) String? fbLink,
+    @JsonKey(name: 'insta_link', includeIfNull: false) String? instaLink,
+    @JsonKey(name: 'personal_site_link', includeIfNull: false)
+    String? personalSiteLink,
   }) = _SocialLinksModel;
 
-  factory SocialLinksModel.fromJson(Map<String, Object?> json) => _$SocialLinksModelFromJson(json);
+  factory SocialLinksModel.fromJson(Map<String, Object?> json) =>
+      _$SocialLinksModelFromJson(json);
 }
 
 @freezed
@@ -36,5 +80,6 @@ abstract class CertificatesModel with _$CertificatesModel {
     required String date,
   }) = _CertificatesModel;
 
-  factory CertificatesModel.fromJson(Map<String, Object?> json) => _$CertificatesModelFromJson(json);
+  factory CertificatesModel.fromJson(Map<String, Object?> json) =>
+      _$CertificatesModelFromJson(json);
 }
diff --git a/lib/features/consultant/become_consultant/models/consultation_request_model.dart b/lib/features/consultant/become_consultant/models/consultation_request_model.dart
index 13cc0e77..c15649fd 100644
--- a/lib/features/consultant/become_consultant/models/consultation_request_model.dart
+++ b/lib/features/consultant/become_consultant/models/consultation_request_model.dart
@@ -1,3 +1,4 @@
+import 'package:eatvio_app/features/consultant/become_consultant/enums/alfa_scoring_status.dart';
 import 'package:eatvio_app/features/profile/models/profile_model.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
@@ -11,26 +12,81 @@ abstract class ConsultationRequestModel with _$ConsultationRequestModel {
     @JsonKey(name: 'rating_place') int? ratingPlace,
     @JsonKey(name: 'education_resource') required EducationModel educationModel,
     @JsonKey(name: 'cert_photos') required List<CertPhotosModel> photos,
-    @JsonKey(name: 'canceled_moderation') CanceledModerationModel? canceledModeration,
+    @JsonKey(name: 'canceled_moderation')
+    CanceledModerationModel? canceledModeration,
+    @JsonKey(name: 'legal_entity_resource') LegalEntityModel? legalEntity,
   }) = _ConsultationRequestModel;
 
-  factory ConsultationRequestModel.fromJson(Map<String, dynamic> json) => _$ConsultationRequestModelFromJson(json);
+  factory ConsultationRequestModel.fromJson(Map<String, dynamic> json) =>
+      _$ConsultationRequestModelFromJson(json);
+}
+
+@freezed
+abstract class LegalEntityModel with _$LegalEntityModel {
+  const LegalEntityModel._();
+
+  const factory LegalEntityModel({
+    required int id,
+    required String type,
+    String? inn,
+    String? snils,
+    String? state,
+    @JsonKey(
+      name: 'alfa_scoring_status',
+      unknownEnumValue: AlfaScoringStatus.none,
+      defaultValue: AlfaScoringStatus.none,
+    )
+    @Default(AlfaScoringStatus.none)
+    AlfaScoringStatus alfaScoringStatus,
+    @JsonKey(name: 'alfa_scoring_request_id') String? alfaScoringRequestId,
+    @JsonKey(name: 'last_name') String? lastName,
+    @JsonKey(name: 'first_name') String? firstName,
+    @JsonKey(name: 'middle_name') String? middleName,
+    @JsonKey(name: 'passport_series') String? passportSeries,
+    @JsonKey(name: 'passport_number') String? passportNumber,
+    @JsonKey(name: 'passport_issue_date') String? passportIssueDate,
+    @JsonKey(name: 'passport_issuer') String? passportIssuer,
+    @JsonKey(name: 'passport_issuer_code') String? passportIssuerCode,
+    @JsonKey(name: 'birth_date') String? birthDate,
+    @JsonKey(name: 'birth_place') String? birthPlace,
+    @JsonKey(name: 'registration_address') String? registrationAddress,
+    @JsonKey(name: 'residence_address') String? residenceAddress,
+    String? citizenship,
+    @JsonKey(name: 'tax_resident_us') bool? taxResidentUs,
+    @JsonKey(name: 'foreign_tax_resident') bool? foreignTaxResident,
+    @JsonKey(name: 'sbp_phone') String? sbpPhone,
+    @JsonKey(name: 'sbp_bank_member_id') String? sbpBankMemberId,
+  }) = _LegalEntityModel;
+
+  factory LegalEntityModel.fromJson(Map<String, dynamic> json) =>
+      _$LegalEntityModelFromJson(json);
+
+  /// Normalizes API date (`Y-m-d` or ISO datetime) to `Y-m-d`.
+  static String? normalizeApiDate(String? value) {
+    if (value == null || value.isEmpty) {
+      return null;
+    }
+    if (value.length >= 10 && RegExp(r'^\d{4}-\d{2}-\d{2}').hasMatch(value)) {
+      return value.substring(0, 10);
+    }
+    return value;
+  }
+
+  String? get normalizedPassportIssueDate =>
+      normalizeApiDate(passportIssueDate);
+
+  String? get normalizedBirthDate => normalizeApiDate(birthDate);
 }
 
 @freezed
 abstract class CertPhotosModel with _$CertPhotosModel {
-  const factory CertPhotosModel({
-    required String url,
-  }) = _CertPhotosModel;
+  const factory CertPhotosModel({required String url}) = _CertPhotosModel;
 
-  factory CertPhotosModel.fromJson(Map<String, dynamic> json) => _$CertPhotosModelFromJson(json);
+  factory CertPhotosModel.fromJson(Map<String, dynamic> json) =>
+      _$CertPhotosModelFromJson(json);
 }
 
-enum ModerationStatus {
-  approved,
-  created,
-  canceled
-}
+enum ModerationStatus { approved, created, canceled }
 
 @freezed
 abstract class CanceledModerationModel with _$CanceledModerationModel {
@@ -40,5 +96,6 @@ abstract class CanceledModerationModel with _$CanceledModerationModel {
     required List<String>? additional,
   }) = _CanceledModerationModel;
 
-  factory CanceledModerationModel.fromJson(Map<String, dynamic> json) => _$CanceledModerationModelFromJson(json);
+  factory CanceledModerationModel.fromJson(Map<String, dynamic> json) =>
+      _$CanceledModerationModelFromJson(json);
 }
diff --git a/lib/features/consultant/become_consultant/models/sbp_bank_model.dart b/lib/features/consultant/become_consultant/models/sbp_bank_model.dart
new file mode 100644
index 00000000..1ffb0c5f
--- /dev/null
+++ b/lib/features/consultant/become_consultant/models/sbp_bank_model.dart
@@ -0,0 +1,18 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'sbp_bank_model.freezed.dart';
+part 'sbp_bank_model.g.dart';
+
+@freezed
+abstract class SbpBankModel with _$SbpBankModel {
+  const factory SbpBankModel({
+    @JsonKey(name: 'bank_member_id') required String bankMemberId,
+    @JsonKey(name: 'bank_name') required String bankName,
+    @JsonKey(name: 'short_name') String? shortName,
+    @JsonKey(name: 'logo_url') String? logoUrl,
+    String? bic,
+  }) = _SbpBankModel;
+
+  factory SbpBankModel.fromJson(Map<String, dynamic> json) =>
+      _$SbpBankModelFromJson(json);
+}
diff --git a/lib/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart b/lib/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart
index 0410ae04..c131bbcb 100644
--- a/lib/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart
+++ b/lib/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart
@@ -1,42 +1,118 @@
+import 'dart:async';
 import 'dart:developer';
 import 'dart:io';
+
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/error_reporting/report_from.dart';
 import 'package:eatvio_app/core/image_compressing/image_compress_utility.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/enums/alfa_scoring_status.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_profile_model.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/models/consultation_request_model.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/models/sbp_bank_model.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/repositories/consultant_repository.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/utils/laravel_validation_errors.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/utils/passport_data_validator.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:eatvio_app/core/error_reporting/report_from.dart';
 
 class RegisterConsultantCubit extends Cubit<RegisterConsultantState> {
   final ConsultantRepository consultantRepository;
+  final Duration scoringPollInterval;
   bool _update = false;
+  String? _userSlug;
+  Timer? _scoringPollTimer;
 
-  RegisterConsultantCubit({required this.consultantRepository})
-    : super(
-        const RegisterConsultantState(
-          consultant: ConsultantProfileModel(socialLinks: SocialLinksModel(), hasMedicalEducation: true),
-          loading: true,
-          acceptOffer: false,
-          isUpdating: false,
-        ),
-      );
+  static const String individualPersonLegalType = 'individualPerson';
+
+  RegisterConsultantCubit({
+    required this.consultantRepository,
+    this.scoringPollInterval = const Duration(seconds: 3),
+  }) : super(
+         const RegisterConsultantState(
+           consultant: ConsultantProfileModel(
+             socialLinks: SocialLinksModel(),
+             hasMedicalEducation: true,
+             legalType: individualPersonLegalType,
+           ),
+           loading: true,
+           acceptOffer: false,
+           acceptFrdoAgreement: false,
+           isUpdating: false,
+         ),
+       );
+
+  String? get userSlug => _userSlug;
+
+  void setUserSlug(String? slug) {
+    if (slug != null && slug.isNotEmpty) {
+      _userSlug = slug;
+    }
+  }
+
+  Future<List<SbpBankModel>> _loadSbpBanks() async {
+    try {
+      return await consultantRepository.getSbpBanks();
+    } catch (e, st) {
+      await reportFrom(e, st, this);
+      log(e.toString());
+      return const <SbpBankModel>[];
+    }
+  }
+
+  List<SbpBankModel> searchSbpBanks(String query) {
+    final normalized = query.trim().toLowerCase();
+    if (normalized.isEmpty) {
+      return state.sbpBanks;
+    }
+    return state.sbpBanks.where((bank) {
+      final name = bank.bankName.toLowerCase();
+      final shortName = (bank.shortName ?? '').toLowerCase();
+      final bic = (bank.bic ?? '').toLowerCase();
+      return name.contains(normalized) ||
+          shortName.contains(normalized) ||
+          bic.contains(normalized);
+    }).toList();
+  }
+
+  SbpBankModel? findSbpBankById(String? bankMemberId) {
+    if (bankMemberId == null || bankMemberId.isEmpty) {
+      return null;
+    }
+    for (final bank in state.sbpBanks) {
+      if (bank.bankMemberId == bankMemberId) {
+        return bank;
+      }
+    }
+    return null;
+  }
 
   Future<void> getMyRequestStatus(String slug) async {
     try {
       _update = true;
-      final myRequestStatus = await consultantRepository.getMyRequestStatus(slug);
+      _userSlug = slug;
+      final myRequestStatus = await consultantRepository.getMyRequestStatus(
+        slug,
+      );
       final certPhotos = await consultantRepository.getConsultantCertPhotos();
+      final sbpBanks = await _loadSbpBanks();
 
-      List<CertificatesModel>? certificates = myRequestStatus.educationModel.completedCourses?.map((courseMap) {
-        final course = courseMap.values.first;
+      List<CertificatesModel>? certificates = myRequestStatus
+          .educationModel
+          .completedCourses
+          ?.map((courseMap) {
+            final course = courseMap.values.first;
 
-        return CertificatesModel(title: course.title, date: course.date);
-      }).toList();
+            return CertificatesModel(title: course.title, date: course.date);
+          })
+          .toList();
 
       String? sanitizeLink(String? link) {
         return (link != null && link.isNotEmpty) ? link : null;
       }
 
+      final legal = myRequestStatus.legalEntity;
+      final scoringStatus = legal?.alfaScoringStatus ?? AlfaScoringStatus.none;
+
       emit(
         RegisterConsultantState(
           consultant: ConsultantProfileModel(
@@ -46,33 +122,107 @@ class RegisterConsultantCubit extends Cubit<RegisterConsultantState> {
               tgLink: sanitizeLink(myRequestStatus.educationModel.tgLink),
               fbLink: sanitizeLink(myRequestStatus.educationModel.fbLink),
               instaLink: sanitizeLink(myRequestStatus.educationModel.instaLink),
-              personalSiteLink: sanitizeLink(myRequestStatus.educationModel.personalSiteLink),
+              personalSiteLink: sanitizeLink(
+                myRequestStatus.educationModel.personalSiteLink,
+              ),
             ),
-            hasMedicalEducation: myRequestStatus.educationModel.hasMedicalEducation == 1,
+            hasMedicalEducation:
+                myRequestStatus.educationModel.hasMedicalEducation == 1,
+            legalType: legal?.type ?? individualPersonLegalType,
+            lastName: _emptyToNull(legal?.lastName),
+            firstName: _emptyToNull(legal?.firstName),
+            middleName: _emptyToNull(legal?.middleName),
+            inn: _emptyToNull(legal?.inn),
+            snils: _emptyToNull(legal?.snils),
+            passportSeries: _emptyToNull(legal?.passportSeries),
+            passportNumber: _emptyToNull(legal?.passportNumber),
+            passportIssueDate: legal?.normalizedPassportIssueDate,
+            passportIssuer: _emptyToNull(legal?.passportIssuer),
+            passportIssuerCode: _emptyToNull(legal?.passportIssuerCode),
+            birthDate: legal?.normalizedBirthDate,
+            birthPlace: _emptyToNull(legal?.birthPlace),
+            registrationAddress: _emptyToNull(legal?.registrationAddress),
+            residenceAddress: _emptyToNull(legal?.residenceAddress),
+            citizenship: _emptyToNull(legal?.citizenship),
+            taxResidentUs: legal?.taxResidentUs ?? false,
+            foreignTaxResident: legal?.foreignTaxResident ?? false,
+            sbpPhone: _emptyToNull(legal?.sbpPhone),
+            sbpBankMemberId: _emptyToNull(legal?.sbpBankMemberId),
           ),
           acceptOffer: false,
+          acceptFrdoAgreement: false,
           loading: false,
           requestModel: myRequestStatus,
           certPhotos: certPhotos,
+          sbpBanks: sbpBanks,
           isUpdating: _update,
+          alfaScoringStatus: scoringStatus,
+          isScoringPolling: scoringStatus.isProcessing,
+          scoringRetryInProgress: false,
+          awaitingScoringOutcome: false,
+          fieldErrors: const <String, String>{},
           error: null,
         ),
       );
+
+      if (scoringStatus.isProcessing) {
+        startScoringPoll();
+      }
+    } catch (e, st) {
+      await reportFrom(e, st, this);
+      log(e.toString());
+      final parsed = parseLaravelValidationErrors(e);
+      emit(
+        state.copyWith(
+          loading: false,
+          error: parsed.summary,
+          fieldErrors: parsed.fieldErrors,
+          awaitingScoringOutcome: false,
+        ),
+      );
+    }
+  }
+
+  String? _emptyToNull(String? value) {
+    if (value == null || value.trim().isEmpty) {
+      return null;
+    }
+    return value.trim();
+  }
+
+  Future<void> disableLoading({String? slug}) async {
+    try {
+      setUserSlug(slug);
+      final certPhotos = await consultantRepository.getConsultantCertPhotos();
+      final sbpBanks = await _loadSbpBanks();
+      emit(
+        state.copyWith(
+          loading: false,
+          certPhotos: certPhotos,
+          sbpBanks: sbpBanks,
+          error: null,
+          fieldErrors: const <String, String>{},
+          awaitingScoringOutcome: false,
+          consultant: state.consultant.copyWith(
+            legalType: individualPersonLegalType,
+            citizenship: state.consultant.citizenship,
+            taxResidentUs: state.consultant.taxResidentUs ?? false,
+            foreignTaxResident: state.consultant.foreignTaxResident ?? false,
+          ),
+        ),
+      );
     } catch (e, st) {
       await reportFrom(e, st, this);
       log(e.toString());
-      emit(state.copyWith(loading: false, error: e.toString()));
-    }
-  }
-
-  Future<void> disableLoading() async {
-    try {
-      final certPhotos = await consultantRepository.getConsultantCertPhotos();
-      emit(state.copyWith(loading: false, certPhotos: certPhotos, error: null));
-    } catch (e, st) {
-      await reportFrom(e, st, this);
-      log(e.toString());
-      emit(state.copyWith(loading: false, error: e.toString()));
+      final parsed = parseLaravelValidationErrors(e);
+      emit(
+        state.copyWith(
+          loading: false,
+          error: parsed.summary,
+          fieldErrors: parsed.fieldErrors,
+          awaitingScoringOutcome: false,
+        ),
+      );
     }
   }
 
@@ -82,41 +232,326 @@ class RegisterConsultantCubit extends Cubit<RegisterConsultantState> {
     if (slug != null) {
       await getMyRequestStatus(slug);
     } else {
-      await disableLoading();
+      await disableLoading(slug: _userSlug);
     }
   }
 
-  void updateConsultantProfileModel(ConsultantProfileModel consultant, [bool acceptOffer = false]) {
-    emit(state.copyWith(consultant: consultant, acceptOffer: acceptOffer, loading: false, error: null));
+  void updateConsultantProfileModel(
+    ConsultantProfileModel consultant, [
+    bool? acceptOffer,
+    bool? acceptFrdoAgreement,
+  ]) {
+    final nextFieldErrors = state.fieldErrors.isEmpty
+        ? const <String, String>{}
+        : PassportDataValidator.validate(consultant);
+    emit(
+      state.copyWith(
+        consultant: consultant,
+        acceptOffer: acceptOffer ?? state.acceptOffer,
+        acceptFrdoAgreement: acceptFrdoAgreement ?? state.acceptFrdoAgreement,
+        loading: false,
+        error: null,
+        fieldErrors: nextFieldErrors,
+      ),
+    );
+  }
+
+  Map<String, String> validatePassportFields() {
+    final errors = PassportDataValidator.validate(state.consultant);
+    emit(state.copyWith(fieldErrors: errors, error: null));
+    return errors;
+  }
+
+  void updateAgreements({bool? acceptOffer, bool? acceptFrdoAgreement}) {
+    emit(
+      state.copyWith(
+        acceptOffer: acceptOffer ?? state.acceptOffer,
+        acceptFrdoAgreement: acceptFrdoAgreement ?? state.acceptFrdoAgreement,
+        error: null,
+      ),
+    );
+  }
+
+  bool get hasAcceptedRequiredAgreements {
+    if (_update) {
+      return state.acceptOffer;
+    }
+    return state.acceptOffer && state.acceptFrdoAgreement;
+  }
+
+  ConsultantProfileModel buildSubmitPayload() {
+    final withLegalType = state.consultant.copyWith(
+      legalType: individualPersonLegalType,
+      citizenship: state.consultant.citizenship,
+      taxResidentUs: state.consultant.taxResidentUs ?? false,
+      foreignTaxResident: state.consultant.foreignTaxResident ?? false,
+      certificates: state.consultant.certificates
+          ?.map(
+            (course) => CertificatesModel(
+              title: course.title,
+              date:
+                  LegalEntityModel.normalizeApiDate(course.date) ?? course.date,
+            ),
+          )
+          .toList(),
+    );
+
+    if (_update) {
+      return ConsultantProfileModel(
+        hasMedicalEducation: withLegalType.hasMedicalEducation,
+        socialLinks: withLegalType.socialLinks,
+        photos: withLegalType.photos,
+        certificates: withLegalType.certificates,
+        legalType: withLegalType.legalType,
+        lastName: withLegalType.lastName,
+        firstName: withLegalType.firstName,
+        middleName: withLegalType.middleName,
+        inn: withLegalType.inn,
+        snils: withLegalType.snils,
+        passportSeries: withLegalType.passportSeries,
+        passportNumber: withLegalType.passportNumber,
+        passportIssueDate: withLegalType.passportIssueDate,
+        passportIssuer: withLegalType.passportIssuer,
+        passportIssuerCode: withLegalType.passportIssuerCode,
+        birthDate: withLegalType.birthDate,
+        birthPlace: withLegalType.birthPlace,
+        registrationAddress: withLegalType.registrationAddress,
+        residenceAddress: withLegalType.residenceAddress,
+        citizenship: withLegalType.citizenship,
+        taxResidentUs: withLegalType.taxResidentUs,
+        foreignTaxResident: withLegalType.foreignTaxResident,
+        sbpPhone: withLegalType.sbpPhone,
+        sbpBankMemberId: withLegalType.sbpBankMemberId,
+      );
+    }
+
+    return withLegalType.copyWith(
+      agreementAccepted: state.acceptOffer,
+      frdoAgreementAccepted: state.acceptFrdoAgreement,
+    );
   }
 
   Future<void> registerConsultant() async {
-    emit(state.copyWith(error: null));
+    final passportErrors = validatePassportFields();
+    if (passportErrors.isNotEmpty) {
+      return;
+    }
+
+    // Show scoring widget immediately while request / job are in progress.
+    emit(
+      state.copyWith(
+        error: null,
+        fieldErrors: const <String, String>{},
+        alfaScoringStatus: AlfaScoringStatus.beneficiaryCreating,
+        awaitingScoringOutcome: true,
+        scoringRetryInProgress: false,
+      ),
+    );
+
     try {
       if (state.newAddedPhotos.isNotEmpty) {
-        await consultantRepository.storeConsultantCertPhotos(files: state.newAddedPhotos);
+        await consultantRepository.storeConsultantCertPhotos(
+          files: state.newAddedPhotos,
+        );
       }
       if (state.deletedPhotoIds.isNotEmpty) {
         for (final int id in state.deletedPhotoIds) {
           await consultantRepository.deletePhoto(id);
         }
       }
-      await consultantRepository.registerConsultant(consultant: state.consultant, update: _update);
+      await consultantRepository.registerConsultant(
+        consultant: buildSubmitPayload(),
+        update: _update,
+      );
+      _update = true;
+      emit(
+        state.copyWith(
+          isUpdating: true,
+          alfaScoringStatus: AlfaScoringStatus.beneficiaryCreating,
+          isScoringPolling: true,
+          scoringRetryInProgress: false,
+          awaitingScoringOutcome: true,
+          newAddedPhotos: const <File>[],
+          deletedPhotoIds: const <int>[],
+          fieldErrors: const <String, String>{},
+          error: null,
+        ),
+      );
+      startScoringPoll();
+    } on DioException catch (e, st) {
+      await reportFrom(e, st, this);
+      log(e.toString());
+      final parsed = parseLaravelValidationErrors(e);
+      emit(
+        state.copyWith(
+          error: parsed.summary,
+          fieldErrors: parsed.fieldErrors,
+          scoringRetryInProgress: false,
+          awaitingScoringOutcome: false,
+          isScoringPolling: false,
+          alfaScoringStatus: AlfaScoringStatus.none,
+        ),
+      );
     } catch (e, st) {
       await reportFrom(e, st, this);
       log(e.toString());
-      emit(state.copyWith(error: e.toString()));
+      emit(
+        state.copyWith(
+          error: e.toString(),
+          scoringRetryInProgress: false,
+          awaitingScoringOutcome: false,
+          isScoringPolling: false,
+          alfaScoringStatus: AlfaScoringStatus.none,
+        ),
+      );
     }
   }
 
+  Future<void> retryScoring() async {
+    if (!state.alfaScoringStatus.canRetry || state.scoringRetryInProgress) {
+      return;
+    }
+    final passportErrors = validatePassportFields();
+    if (passportErrors.isNotEmpty) {
+      return;
+    }
+    emit(
+      state.copyWith(
+        scoringRetryInProgress: true,
+        error: null,
+        fieldErrors: const <String, String>{},
+        alfaScoringStatus: AlfaScoringStatus.beneficiaryCreating,
+        isScoringPolling: true,
+        awaitingScoringOutcome: true,
+      ),
+    );
+    _update = true;
+    try {
+      await consultantRepository.registerConsultant(
+        consultant: buildSubmitPayload(),
+        update: true,
+      );
+      startScoringPoll();
+      emit(
+        state.copyWith(
+          scoringRetryInProgress: false,
+          isUpdating: true,
+          awaitingScoringOutcome: true,
+        ),
+      );
+    } on DioException catch (e, st) {
+      await reportFrom(e, st, this);
+      log(e.toString());
+      final parsed = parseLaravelValidationErrors(e);
+      emit(
+        state.copyWith(
+          scoringRetryInProgress: false,
+          isScoringPolling: false,
+          awaitingScoringOutcome: false,
+          alfaScoringStatus: AlfaScoringStatus.scoringFailed,
+          error: parsed.summary,
+          fieldErrors: parsed.fieldErrors,
+        ),
+      );
+    } catch (e, st) {
+      await reportFrom(e, st, this);
+      log(e.toString());
+      emit(
+        state.copyWith(
+          scoringRetryInProgress: false,
+          isScoringPolling: false,
+          awaitingScoringOutcome: false,
+          alfaScoringStatus: AlfaScoringStatus.scoringFailed,
+          error: e.toString(),
+        ),
+      );
+    }
+  }
+
+  void startScoringPoll() {
+    final slug = _userSlug;
+    if (slug == null || slug.isEmpty) {
+      emit(
+        state.copyWith(isScoringPolling: false, awaitingScoringOutcome: false),
+      );
+      return;
+    }
+    _stopScoringPoll();
+    emit(state.copyWith(isScoringPolling: true));
+    _scoringPollTimer = Timer.periodic(
+      scoringPollInterval,
+      (_) => _pollScoringStatus(slug),
+    );
+    unawaited(_pollScoringStatus(slug));
+  }
+
+  Future<void> _pollScoringStatus(String slug) async {
+    if (isClosed) {
+      return;
+    }
+    try {
+      final status = await consultantRepository.getMyRequestStatus(slug);
+      if (isClosed) {
+        return;
+      }
+      final scoringStatus =
+          status.legalEntity?.alfaScoringStatus ?? AlfaScoringStatus.none;
+      // API stays on `none` until ProcessConsultantScoringJob starts
+      // (ScoringStarted → beneficiary_creating). Keep optimistic processing
+      // UI and continue polling until a real terminal/processing status arrives.
+      if (scoringStatus == AlfaScoringStatus.none) {
+        emit(
+          state.copyWith(
+            requestModel: status,
+            alfaScoringStatus: AlfaScoringStatus.beneficiaryCreating,
+            isScoringPolling: true,
+          ),
+        );
+        return;
+      }
+      final isTerminal = scoringStatus.isTerminal;
+      emit(
+        state.copyWith(
+          requestModel: status,
+          alfaScoringStatus: scoringStatus,
+          isScoringPolling: scoringStatus.isProcessing,
+          // Clear session flag on terminal so success sheet can fire once
+          // (listenWhen: previous.awaiting && !current.awaiting && complete).
+          awaitingScoringOutcome: isTerminal
+              ? false
+              : state.awaitingScoringOutcome,
+        ),
+      );
+      if (!scoringStatus.isProcessing) {
+        _stopScoringPoll();
+      }
+    } catch (e, st) {
+      await reportFrom(e, st, this);
+      log(e.toString());
+      // Keep polling on transient errors while scoring is in progress.
+    }
+  }
+
+  void _stopScoringPoll() {
+    _scoringPollTimer?.cancel();
+    _scoringPollTimer = null;
+  }
+
   Future<void> addCertPhotos(List<File> files) async {
     if (files.isEmpty) {
       return;
     }
     try {
-      final compressedFiles = await ImageCompressUtility.compressFilesList(files);
+      final compressedFiles = await ImageCompressUtility.compressFilesList(
+        files,
+      );
 
-      emit(state.copyWith(newAddedPhotos: [...state.newAddedPhotos, ...compressedFiles], error: null));
+      emit(
+        state.copyWith(
+          newAddedPhotos: [...state.newAddedPhotos, ...compressedFiles],
+          error: null,
+        ),
+      );
     } catch (e, st) {
       await reportFrom(e, st, this);
       log(e.toString());
@@ -130,7 +565,19 @@ class RegisterConsultantCubit extends Cubit<RegisterConsultantState> {
       return;
     }
     if (path != null) {
-      emit(state.copyWith(newAddedPhotos: state.newAddedPhotos.where((file) => file.uri.path != path).toList()));
+      emit(
+        state.copyWith(
+          newAddedPhotos: state.newAddedPhotos
+              .where((file) => file.uri.path != path)
+              .toList(),
+        ),
+      );
     }
   }
+
+  @override
+  Future<void> close() {
+    _stopScoringPoll();
+    return super.close();
+  }
 }
diff --git a/lib/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart b/lib/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart
index e9635eb6..42daeb1e 100644
--- a/lib/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart
+++ b/lib/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart
@@ -1,8 +1,10 @@
 import 'dart:io';
 
+import 'package:eatvio_app/features/consultant/become_consultant/enums/alfa_scoring_status.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_cert_photo_model.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_profile_model.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultation_request_model.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/models/sbp_bank_model.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'register_consultant_state.freezed.dart';
@@ -12,12 +14,22 @@ abstract class RegisterConsultantState with _$RegisterConsultantState {
   const factory RegisterConsultantState({
     required ConsultantProfileModel consultant,
     required bool acceptOffer,
+    @Default(false) bool acceptFrdoAgreement,
     required bool loading,
     required bool isUpdating,
     ConsultationRequestModel? requestModel,
-    @Default(<ConsultantCertPhotoModel>[]) List<ConsultantCertPhotoModel> certPhotos,
+    @Default(<ConsultantCertPhotoModel>[])
+    List<ConsultantCertPhotoModel> certPhotos,
+    @Default(<SbpBankModel>[]) List<SbpBankModel> sbpBanks,
     @Default(<File>[]) List<File> newAddedPhotos,
     @Default(<int>[]) List<int> deletedPhotoIds,
+    @Default(AlfaScoringStatus.none) AlfaScoringStatus alfaScoringStatus,
+    @Default(false) bool isScoringPolling,
+    @Default(false) bool scoringRetryInProgress,
+
+    /// True only after successful register/retry in this session until scoring is terminal.
+    @Default(false) bool awaitingScoringOutcome,
+    @Default(<String, String>{}) Map<String, String> fieldErrors,
     String? error,
   }) = _RegisterConsultantState;
 }
diff --git a/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart
index ce13f905..90b673a5 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart
@@ -8,7 +8,8 @@ class AdditionalSettingsScreen extends StatefulWidget {
   const AdditionalSettingsScreen({super.key});
 
   @override
-  State<AdditionalSettingsScreen> createState() => _AdditionalSettingsScreenState();
+  State<AdditionalSettingsScreen> createState() =>
+      _AdditionalSettingsScreenState();
 }
 
 class _AdditionalSettingsScreenState extends State<AdditionalSettingsScreen> {
@@ -17,7 +18,12 @@ class _AdditionalSettingsScreenState extends State<AdditionalSettingsScreen> {
 
   @override
   void initState() {
-    if (context.read<RegisterConsultantCubit>().state.consultant.hasMedicalEducation != null) {
+    if (context
+            .read<RegisterConsultantCubit>()
+            .state
+            .consultant
+            .hasMedicalEducation !=
+        null) {
       haveMedicalDegree = context
           .read<RegisterConsultantCubit>()
           .state
@@ -52,7 +58,8 @@ class _AdditionalSettingsScreenState extends State<AdditionalSettingsScreen> {
             value: publishDiplomasAndCertificatesInProfile,
             onTap: () {
               setState(() {
-                publishDiplomasAndCertificatesInProfile = !publishDiplomasAndCertificatesInProfile;
+                publishDiplomasAndCertificatesInProfile =
+                    !publishDiplomasAndCertificatesInProfile;
               });
             },
           ),
@@ -64,11 +71,15 @@ class _AdditionalSettingsScreenState extends State<AdditionalSettingsScreen> {
               setState(() {
                 haveMedicalDegree = !haveMedicalDegree;
               });
-              context.read<RegisterConsultantCubit>().updateConsultantProfileModel(
-                context.read<RegisterConsultantCubit>().state.consultant.copyWith(
-                  hasMedicalEducation: haveMedicalDegree,
-                ),
-              );
+              context
+                  .read<RegisterConsultantCubit>()
+                  .updateConsultantProfileModel(
+                    context
+                        .read<RegisterConsultantCubit>()
+                        .state
+                        .consultant
+                        .copyWith(hasMedicalEducation: haveMedicalDegree),
+                  );
             },
           ),
         ],
diff --git a/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart
index 40d4a352..2955ee09 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart
@@ -3,7 +3,9 @@ import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
 class BecomeConsultantScreen extends StatefulWidget {
-  const BecomeConsultantScreen({super.key});
+  final String? slug;
+
+  const BecomeConsultantScreen({super.key, this.slug});
 
   @override
   State<BecomeConsultantScreen> createState() => _BecomeConsultantScreenState();
@@ -17,7 +19,10 @@ class _BecomeConsultantScreenState extends State<BecomeConsultantScreen> {
         title: const Text('Стать консультантом'),
         automaticallyImplyLeading: false,
         centerTitle: false,
-        leading: IconButton(onPressed: () => GoRouter.of(context).pop(), icon: const Icon(Icons.close)),
+        leading: IconButton(
+          onPressed: () => GoRouter.of(context).pop(),
+          icon: const Icon(Icons.close),
+        ),
       ),
       body: const Padding(
         padding: EdgeInsets.all(16),
@@ -32,16 +37,27 @@ class _BecomeConsultantScreenState extends State<BecomeConsultantScreen> {
 
   InkWell _startRegistrationButton() {
     return InkWell(
-      onTap: () => GoRouter.of(context).pushReplacementNamed('stepperBecomeConsultantScreen', extra: {'slug': null}),
+      onTap: () => GoRouter.of(context).pushReplacementNamed(
+        'stepperBecomeConsultantScreen',
+        extra: {'slug': widget.slug, 'isNewRegistration': true},
+      ),
       borderRadius: BorderRadius.circular(20),
       child: Ink(
         height: 52,
         width: MediaQuery.of(context).size.width - 32,
-        decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: appTheme.blueA400),
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(20),
+          color: appTheme.blueA400,
+        ),
         child: const Center(
           child: Text(
             'Начать регистрацию',
-            style: TextStyle(color: Colors.white, height: 1, fontWeight: FontWeight.w600, fontSize: 18),
+            style: TextStyle(
+              color: Colors.white,
+              height: 1,
+              fontWeight: FontWeight.w600,
+              fontSize: 18,
+            ),
           ),
         ),
       ),
diff --git a/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart
index b2b26c0e..33772eb5 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart
@@ -7,15 +7,18 @@ import 'package:flutter/material.dart';
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:intl/intl.dart';
 
 class CertificatesAndDiplomasScreen extends StatefulWidget {
   const CertificatesAndDiplomasScreen({super.key});
 
   @override
-  State<CertificatesAndDiplomasScreen> createState() => _CertificatesAndDiplomasScreenState();
+  State<CertificatesAndDiplomasScreen> createState() =>
+      _CertificatesAndDiplomasScreenState();
 }
 
-class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasScreen> {
+class _CertificatesAndDiplomasScreenState
+    extends State<CertificatesAndDiplomasScreen> {
   final scrollController = ScrollController();
 
   List<DiplomaEntity> diplomasList = [
@@ -29,9 +32,15 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
   @override
   void initState() {
     super.initState();
-    if (context.read<RegisterConsultantCubit>().state.consultant.certificates != null) {
+    if (context.read<RegisterConsultantCubit>().state.consultant.certificates !=
+        null) {
       diplomasList = [
-        ...context.read<RegisterConsultantCubit>().state.consultant.certificates!.map(
+        ...context
+            .read<RegisterConsultantCubit>()
+            .state
+            .consultant
+            .certificates!
+            .map(
               (e) => DiplomaEntity(
                 date: DateTime.tryParse(e.date),
                 textEditingController: TextEditingController(text: e.title),
@@ -70,7 +79,8 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
           ListView.separated(
             shrinkWrap: true,
             physics: const NeverScrollableScrollPhysics(),
-            itemBuilder: (context, index) => _diplomaInfo(diploma: diplomasList[index]),
+            itemBuilder: (context, index) =>
+                _diplomaInfo(diploma: diplomasList[index]),
             separatorBuilder: (context, index) => Padding(
               padding: const EdgeInsets.symmetric(vertical: 16),
               child: _divider(context),
@@ -93,9 +103,7 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
     );
   }
 
-  Column _diplomaInfo({
-    required DiplomaEntity diploma,
-  }) {
+  Column _diplomaInfo({required DiplomaEntity diploma}) {
     return Column(
       children: [
         CustomTextFormField(
@@ -111,7 +119,9 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
           mainAxisSize: MainAxisSize.min,
           children: [
             SizedBox(
-              width: MediaQuery.of(context).size.width - (diploma.enableDeleteButton ? 92 : 32),
+              width:
+                  MediaQuery.of(context).size.width -
+                  (diploma.enableDeleteButton ? 92 : 32),
               child: ListTile(
                 onTap: onTapCalendar(context, diploma),
                 trailing: Icon(
@@ -122,7 +132,9 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
                 title: Text(
                   diploma.date?.format('dd MMMM yyyy', 'ru') ?? 'Дата выдачи',
                   style: TextStyle(
-                    color: diploma.date == null ? Colors.grey.shade400 : Colors.black,
+                    color: diploma.date == null
+                        ? Colors.grey.shade400
+                        : Colors.black,
                   ),
                 ),
                 tileColor: const Color(0xFFF6F6F6),
@@ -148,9 +160,7 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
                     color: const Color(0xFFF6F6F6),
                     borderRadius: BorderRadius.circular(20),
                   ),
-                  child: const Icon(
-                    Icons.delete_outline_rounded,
-                  ),
+                  child: const Icon(Icons.delete_outline_rounded),
                 ),
               ),
           ],
@@ -190,16 +200,14 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
           bottom: MediaQuery.of(context).viewInsets.bottom,
         ),
         color: CupertinoColors.systemBackground.resolveFrom(context),
-        child: SafeArea(
-          top: false,
-          child: child,
-        ),
+        child: SafeArea(top: false, child: child),
       ),
     );
   }
 
   void checkLast() {
-    if (diplomasList.last.textEditingController.text.isNotEmpty || diplomasList.last.date != null) {
+    if (diplomasList.last.textEditingController.text.isNotEmpty ||
+        diplomasList.last.date != null) {
       setState(() {
         diplomasList.add(
           DiplomaEntity(
@@ -230,12 +238,19 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
 
   void _saveState() {
     context.read<RegisterConsultantCubit>().updateConsultantProfileModel(
-          context.read<RegisterConsultantCubit>().state.consultant.copyWith(
-                certificates: diplomasList.map((e) => CertificatesModel(title: e.textEditingController.text, date: e.date.toString())).toList().sublist(
-                      0,
-                      diplomasList.length - 1,
-                    ),
+      context.read<RegisterConsultantCubit>().state.consultant.copyWith(
+        certificates: diplomasList
+            .map(
+              (e) => CertificatesModel(
+                title: e.textEditingController.text,
+                date: e.date == null
+                    ? ''
+                    : DateFormat('yyyy-MM-dd').format(e.date!),
               ),
-        );
+            )
+            .toList()
+            .sublist(0, diplomasList.length - 1),
+      ),
+    );
   }
 }
diff --git a/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart
index 734387f1..5e87ba50 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart
@@ -1,8 +1,11 @@
 import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/locator_service.dart';
-import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/enums/alfa_scoring_status.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/widgets/scoring_status_widget.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -15,10 +18,29 @@ class LastStepScreen extends StatefulWidget {
 }
 
 class _LastStepScreenState extends State<LastStepScreen> {
-  bool checkboxState = false;
+  static const _frdoUrl =
+      'https://obrnadzor.gov.ru/gosudarstvennye-uslugi-i-funkczii/7701537808-gosfunction/formirovanie-i-vedenie-federalnogo-reestra-svedenij-o-dokumentah-ob-obrazovanii-i-ili-o-kvalifikaczii-dokumentah-ob-obuchenii/';
+
+  late final TapGestureRecognizer _frdoTapRecognizer;
+
+  @override
+  void initState() {
+    super.initState();
+    _frdoTapRecognizer = TapGestureRecognizer()
+      ..onTap = () async => await launchUrl(Uri.parse(_frdoUrl));
+  }
+
+  @override
+  void dispose() {
+    _frdoTapRecognizer.dispose();
+    super.dispose();
+  }
 
   @override
   Widget build(BuildContext context) {
+    final cubit = context.watch<RegisterConsultantCubit>();
+    final state = cubit.state;
+
     return SingleChildScrollView(
       padding: const EdgeInsets.only(bottom: 80, top: 16),
       child: Column(
@@ -27,34 +49,138 @@ class _LastStepScreenState extends State<LastStepScreen> {
         children: [
           const Padding(
             padding: EdgeInsets.symmetric(horizontal: 16),
-            child: Text('Последний шаг', style: TextStyle(fontSize: 24, fontWeight: FontWeight.w700, height: 1.1)),
+            child: Text(
+              'Последний шаг',
+              style: TextStyle(
+                fontSize: 24,
+                fontWeight: FontWeight.w700,
+                height: 1.1,
+              ),
+            ),
           ),
+          if (state.awaitingScoringOutcome ||
+              state.isScoringPolling ||
+              state.alfaScoringStatus !=
+                  AlfaScoringStatus.none) ...[
+            const SizedBox(height: 16),
+            const ScoringStatusWidget(),
+          ],
+          if (state.requestModel?.canceledModeration != null) ...[
+            const SizedBox(height: 16),
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 16),
+              child: Container(
+                width: double.infinity,
+                padding: const EdgeInsets.all(12),
+                decoration: BoxDecoration(
+                  color: const Color(0x33FFCC00),
+                  borderRadius: BorderRadius.circular(16),
+                ),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      state.requestModel!.canceledModeration!.title,
+                      style: const TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w600,
+                        height: 1.2,
+                      ),
+                    ),
+                    if (state.requestModel!.canceledModeration!.additional !=
+                        null) ...[
+                      const SizedBox(height: 8),
+                      for (final item
+                          in state
+                              .requestModel!
+                              .canceledModeration!
+                              .additional!) ...[
+                        Text(
+                          '• $item',
+                          style: const TextStyle(fontSize: 14, height: 1.3),
+                        ),
+                      ],
+                    ],
+                  ],
+                ),
+              ),
+            ),
+          ],
           const SizedBox(height: 16),
           CheckboxListTile(
-            value: checkboxState,
+            value: state.acceptOffer,
             title: Text(
               hidePlans
                   ? 'Я ознакомлен и принимаю политику конфиденциальности и защиту персональных данных'
-                  : 'Я ознакомлен и принимаю договор публичной офёрты',
-              style: const TextStyle(fontSize: 18, height: 1),
+                  : 'Я ознакомлен и принимаю публичную оферту и политику конфиденциальности',
+              style: const TextStyle(fontSize: 18, height: 1.2),
             ),
-            onChanged: (_) {
-              setState(() {
-                checkboxState = !checkboxState;
-              });
-              context.read<RegisterConsultantCubit>().updateConsultantProfileModel(context.read<RegisterConsultantCubit>().state.consultant, checkboxState);
+            onChanged: (value) {
+              cubit.updateAgreements(acceptOffer: value ?? false);
             },
             activeColor: appTheme.blueA400,
             contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+            controlAffinity: ListTileControlAffinity.leading,
+          ),
+          if (!state.isUpdating) ...[
+            CheckboxListTile(
+              value: state.acceptFrdoAgreement,
+              title: Text.rich(
+                TextSpan(
+                  style: const TextStyle(
+                    fontSize: 18,
+                    height: 1.2,
+                    color: Color(0xFF323F4B),
+                  ),
+                  children: [
+                    const TextSpan(
+                      text:
+                          'Обязательное требование: Один из моих документов об образовании есть в реестре ',
+                    ),
+                    TextSpan(
+                      text: 'ФРДО',
+                      style: TextStyle(
+                        color: appTheme.blueA400,
+                        decoration: TextDecoration.underline,
+                      ),
+                      recognizer: _frdoTapRecognizer,
+                    ),
+                  ],
+                ),
+              ),
+              onChanged: (value) {
+                cubit.updateAgreements(acceptFrdoAgreement: value ?? false);
+              },
+              activeColor: appTheme.blueA400,
+              contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+              controlAffinity: ListTileControlAffinity.leading,
+            ),
+          ],
+          const SizedBox(height: 16),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16),
+            child: _divider(context),
           ),
-          Padding(padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16), child: _divider(context)),
           Padding(
             padding: const EdgeInsets.symmetric(horizontal: 4),
             child: TextButton(
-              onPressed: () async => await launchUrl(Uri.parse(hidePlans ? '${sl<AppConfig>().baseUrl}/docs/privacy.pdf' : '${sl<AppConfig>().baseUrl}/oferta_bs.pdf')),
+              onPressed: () async => await launchUrl(
+                Uri.parse(
+                  hidePlans
+                      ? '${sl<AppConfig>().baseUrl}/docs/privacy.pdf'
+                      : '${sl<AppConfig>().baseUrl}/oferta_bs.pdf',
+                ),
+              ),
               child: Text(
-                hidePlans ? 'Политика конфиденциальности и пользовательское соглашение' : 'Договор офёрты',
-                style: const TextStyle(height: 1, fontSize: 16, color: Color(0xFF323F4B), decoration: TextDecoration.underline),
+                hidePlans
+                    ? 'Политика конфиденциальности и пользовательское соглашение'
+                    : 'Договор оферты',
+                style: const TextStyle(
+                  height: 1,
+                  fontSize: 16,
+                  color: Color(0xFF323F4B),
+                  decoration: TextDecoration.underline,
+                ),
               ),
             ),
           ),
@@ -67,7 +193,10 @@ class _LastStepScreenState extends State<LastStepScreen> {
     return Container(
       height: 0.4,
       width: MediaQuery.of(context).size.width - 32,
-      decoration: BoxDecoration(color: Colors.black26, borderRadius: BorderRadius.circular(16)),
+      decoration: BoxDecoration(
+        color: Colors.black26,
+        borderRadius: BorderRadius.circular(16),
+      ),
     );
   }
 }
diff --git a/lib/features/consultant/become_consultant/presentation/pages/passport_data_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/passport_data_screen.dart
new file mode 100644
index 00000000..4cde5a95
--- /dev/null
+++ b/lib/features/consultant/become_consultant/presentation/pages/passport_data_screen.dart
@@ -0,0 +1,608 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/models/sbp_bank_model.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/widgets/passport_field_with_error.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/widgets/passport_section_title.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_typeahead/flutter_typeahead.dart';
+import 'package:mask_text_input_formatter/mask_text_input_formatter.dart';
+
+class PassportDataScreen extends StatefulWidget {
+  const PassportDataScreen({super.key});
+
+  @override
+  State<PassportDataScreen> createState() => _PassportDataScreenState();
+}
+
+class _PassportDataScreenState extends State<PassportDataScreen> {
+  late final TextEditingController lastNameController;
+  late final TextEditingController firstNameController;
+  late final TextEditingController middleNameController;
+  late final TextEditingController innController;
+  late final TextEditingController snilsController;
+  late final TextEditingController seriesController;
+  late final TextEditingController numberController;
+  late final TextEditingController issueDateController;
+  late final TextEditingController issuerController;
+  late final TextEditingController issuerCodeController;
+  late final TextEditingController birthDateController;
+  late final TextEditingController birthPlaceController;
+  late final TextEditingController citizenshipController;
+  late final TextEditingController registrationAddressController;
+  late final TextEditingController residenceAddressController;
+  late final TextEditingController sbpPhoneController;
+  late final TextEditingController sbpBankController;
+  final sbpBankSuggestionsController = SuggestionsController<SbpBankModel>();
+
+  bool taxResidentUs = false;
+  bool foreignTaxResident = false;
+  String? selectedSbpBankMemberId;
+  String? selectedSbpBankName;
+
+  final snilsMask = MaskTextInputFormatter(
+    mask: '###-###-### ##',
+    filter: {'#': RegExp(r'[0-9]')},
+    type: MaskAutoCompletionType.lazy,
+  );
+  final dateMaskIssue = MaskTextInputFormatter(
+    mask: '##.##.####',
+    filter: {'#': RegExp(r'[0-9]')},
+    type: MaskAutoCompletionType.lazy,
+  );
+  final dateMaskBirth = MaskTextInputFormatter(
+    mask: '##.##.####',
+    filter: {'#': RegExp(r'[0-9]')},
+    type: MaskAutoCompletionType.lazy,
+  );
+  final issuerCodeMask = MaskTextInputFormatter(
+    mask: '###-###',
+    filter: {'#': RegExp(r'[0-9]')},
+    type: MaskAutoCompletionType.lazy,
+  );
+  final phoneMask = MaskTextInputFormatter(
+    mask: '+7 (###) ### ## ##',
+    filter: {'#': RegExp(r'[0-9]')},
+    type: MaskAutoCompletionType.lazy,
+  );
+  final _alfaPersonNameFormatter = FilteringTextInputFormatter.allow(
+    RegExp(r'[a-zA-Zа-яА-ЯёЁ ,.-]'),
+  );
+
+  @override
+  void initState() {
+    super.initState();
+    final consultant = context.read<RegisterConsultantCubit>().state.consultant;
+    lastNameController = TextEditingController(text: consultant.lastName ?? '');
+    firstNameController = TextEditingController(
+      text: consultant.firstName ?? '',
+    );
+    middleNameController = TextEditingController(
+      text: consultant.middleName ?? '',
+    );
+    innController = TextEditingController(text: consultant.inn ?? '');
+    snilsController = TextEditingController(text: consultant.snils ?? '');
+    seriesController = TextEditingController(
+      text: consultant.passportSeries ?? '',
+    );
+    numberController = TextEditingController(
+      text: consultant.passportNumber ?? '',
+    );
+    issueDateController = TextEditingController(
+      text: _apiDateToUi(consultant.passportIssueDate),
+    );
+    issuerController = TextEditingController(
+      text: consultant.passportIssuer ?? '',
+    );
+    issuerCodeController = TextEditingController(
+      text: consultant.passportIssuerCode ?? '',
+    );
+    birthDateController = TextEditingController(
+      text: _apiDateToUi(consultant.birthDate),
+    );
+    birthPlaceController = TextEditingController(
+      text: consultant.birthPlace ?? '',
+    );
+    citizenshipController = TextEditingController(text: consultant.citizenship);
+    registrationAddressController = TextEditingController(
+      text: consultant.registrationAddress ?? '',
+    );
+    residenceAddressController = TextEditingController(
+      text: consultant.residenceAddress ?? '',
+    );
+    sbpPhoneController = TextEditingController(text: consultant.sbpPhone ?? '');
+    selectedSbpBankMemberId = consultant.sbpBankMemberId;
+    final selectedBank = context
+        .read<RegisterConsultantCubit>()
+        .findSbpBankById(consultant.sbpBankMemberId);
+    selectedSbpBankName = selectedBank?.bankName;
+    sbpBankController = TextEditingController(text: selectedSbpBankName ?? '');
+    taxResidentUs = consultant.taxResidentUs ?? false;
+    foreignTaxResident = consultant.foreignTaxResident ?? false;
+  }
+
+  void _hydrateSbpBankNameIfNeeded() {
+    if (selectedSbpBankMemberId == null || selectedSbpBankMemberId!.isEmpty) {
+      return;
+    }
+    if (sbpBankController.text.trim().isNotEmpty) {
+      return;
+    }
+    final selectedBank = context
+        .read<RegisterConsultantCubit>()
+        .findSbpBankById(selectedSbpBankMemberId);
+    if (selectedBank == null) {
+      return;
+    }
+    selectedSbpBankName = selectedBank.bankName;
+    sbpBankController.text = selectedBank.bankName;
+  }
+
+  @override
+  void dispose() {
+    lastNameController.dispose();
+    firstNameController.dispose();
+    middleNameController.dispose();
+    innController.dispose();
+    snilsController.dispose();
+    seriesController.dispose();
+    numberController.dispose();
+    issueDateController.dispose();
+    issuerController.dispose();
+    issuerCodeController.dispose();
+    birthDateController.dispose();
+    birthPlaceController.dispose();
+    citizenshipController.dispose();
+    registrationAddressController.dispose();
+    residenceAddressController.dispose();
+    sbpPhoneController.dispose();
+    sbpBankController.dispose();
+    sbpBankSuggestionsController.dispose();
+    super.dispose();
+  }
+
+  String _apiDateToUi(String? apiDate) {
+    if (apiDate == null || apiDate.isEmpty) {
+      return '';
+    }
+    final parts = apiDate.split('-');
+    if (parts.length != 3) {
+      return apiDate;
+    }
+    return '${parts[2]}.${parts[1]}.${parts[0]}';
+  }
+
+  String? _uiDateToApi(String uiDate) {
+    final digits = uiDate.replaceAll(RegExp(r'\D'), '');
+    if (digits.length != 8) {
+      return null;
+    }
+    return '${digits.substring(4, 8)}-${digits.substring(2, 4)}-${digits.substring(0, 2)}';
+  }
+
+  String? _uiPhoneToApi(String uiPhone) {
+    final digits = uiPhone.replaceAll(RegExp(r'\D'), '');
+    if (digits.isEmpty) {
+      return null;
+    }
+    if (digits.length == 11 && digits.startsWith('7')) {
+      return '+$digits';
+    }
+    if (digits.length == 10) {
+      return '+7$digits';
+    }
+    return uiPhone.trim().isEmpty ? null : uiPhone.trim();
+  }
+
+  void _syncToCubit() {
+    final cubit = context.read<RegisterConsultantCubit>();
+    final current = cubit.state.consultant;
+    cubit.updateConsultantProfileModel(
+      current.copyWith(
+        legalType: RegisterConsultantCubit.individualPersonLegalType,
+        lastName: lastNameController.text.trim().isEmpty
+            ? null
+            : lastNameController.text.trim(),
+        firstName: firstNameController.text.trim().isEmpty
+            ? null
+            : firstNameController.text.trim(),
+        middleName: middleNameController.text.trim().isEmpty
+            ? null
+            : middleNameController.text.trim(),
+        inn: innController.text.trim().isEmpty
+            ? null
+            : innController.text.trim(),
+        snils: snilsController.text.trim().isEmpty
+            ? null
+            : snilsController.text.trim(),
+        passportSeries: seriesController.text.trim().isEmpty
+            ? null
+            : seriesController.text.trim(),
+        passportNumber: numberController.text.trim().isEmpty
+            ? null
+            : numberController.text.trim(),
+        passportIssueDate: _uiDateToApi(issueDateController.text),
+        passportIssuer: issuerController.text.trim().isEmpty
+            ? null
+            : issuerController.text.trim(),
+        passportIssuerCode: issuerCodeController.text.trim().isEmpty
+            ? null
+            : issuerCodeController.text.trim(),
+        birthDate: _uiDateToApi(birthDateController.text),
+        birthPlace: birthPlaceController.text.trim().isEmpty
+            ? null
+            : birthPlaceController.text.trim(),
+        citizenship: citizenshipController.text.trim().isEmpty
+            ? 'RU'
+            : citizenshipController.text.trim().toUpperCase(),
+        registrationAddress: registrationAddressController.text.trim().isEmpty
+            ? null
+            : registrationAddressController.text.trim(),
+        residenceAddress: residenceAddressController.text.trim().isEmpty
+            ? null
+            : residenceAddressController.text.trim(),
+        taxResidentUs: taxResidentUs,
+        foreignTaxResident: foreignTaxResident,
+        sbpPhone: _uiPhoneToApi(sbpPhoneController.text),
+        sbpBankMemberId: selectedSbpBankMemberId,
+      ),
+      cubit.state.acceptOffer,
+      cubit.state.acceptFrdoAgreement,
+    );
+  }
+
+  void _selectSbpBank(SbpBankModel bank) {
+    setState(() {
+      selectedSbpBankMemberId = bank.bankMemberId;
+      selectedSbpBankName = bank.bankName;
+      sbpBankController.text = bank.bankName;
+    });
+    _syncToCubit();
+  }
+
+  void _clearSbpBankIfNeeded(String value) {
+    if (selectedSbpBankMemberId != null && value != selectedSbpBankName) {
+      setState(() {
+        selectedSbpBankMemberId = null;
+        selectedSbpBankName = null;
+      });
+      _syncToCubit();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocListener<RegisterConsultantCubit, RegisterConsultantState>(
+      listenWhen: (previous, current) => previous.sbpBanks != current.sbpBanks,
+      listener: (context, state) => _hydrateSbpBankNameIfNeeded(),
+      child: BlocBuilder<RegisterConsultantCubit, RegisterConsultantState>(
+        buildWhen: (previous, current) =>
+            previous.fieldErrors != current.fieldErrors,
+        builder: (context, state) {
+          final errors = state.fieldErrors;
+          return SingleChildScrollView(
+            padding: const EdgeInsets.only(
+              bottom: 80,
+              right: 16,
+              left: 16,
+              top: 16,
+            ),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const PassportScreenTitle(title: 'Паспортные данные'),
+                const PassportSectionTitle(
+                  title: 'Персональные данные (как в паспорте)',
+                ),
+                PassportFieldWithError(
+                  error: errors['last_name'],
+                  child: CustomTextFormField(
+                    hintText: 'Фамилия',
+                    controller: lastNameController,
+                    maxLength: 50,
+                    inputFormatters: [_alfaPersonNameFormatter],
+                    hasError: errors.containsKey('last_name'),
+                    onChanged: (_) => _syncToCubit(),
+                  ),
+                ),
+                const SizedBox(height: 12),
+                PassportFieldWithError(
+                  error: errors['first_name'],
+                  child: CustomTextFormField(
+                    hintText: 'Имя',
+                    controller: firstNameController,
+                    maxLength: 50,
+                    inputFormatters: [_alfaPersonNameFormatter],
+                    hasError: errors.containsKey('first_name'),
+                    onChanged: (_) => _syncToCubit(),
+                  ),
+                ),
+                const SizedBox(height: 12),
+                PassportFieldWithError(
+                  error: errors['middle_name'],
+                  child: CustomTextFormField(
+                    hintText: 'Отчество',
+                    controller: middleNameController,
+                    maxLength: 50,
+                    inputFormatters: [_alfaPersonNameFormatter],
+                    hasError: errors.containsKey('middle_name'),
+                    onChanged: (_) => _syncToCubit(),
+                  ),
+                ),
+                const PassportSectionTitle(title: 'Идентификация'),
+                PassportFieldWithError(
+                  error: errors['inn'],
+                  child: CustomTextFormField(
+                    hintText: 'ИНН (12 цифр)',
+                    controller: innController,
+                    keyboardType: TextInputType.number,
+                    maxLength: 12,
+                    inputFormatters: [FilteringTextInputFormatter.digitsOnly],
+                    hasError: errors.containsKey('inn'),
+                    onChanged: (_) => _syncToCubit(),
+                  ),
+                ),
+                const SizedBox(height: 12),
+                PassportFieldWithError(
+                  error: errors['snils'],
+                  child: CustomTextFormField(
+                    hintText: 'СНИЛС',
+                    controller: snilsController,
+                    keyboardType: TextInputType.number,
+                    inputFormatters: [snilsMask],
+                    hasError: errors.containsKey('snils'),
+                    onChanged: (_) => _syncToCubit(),
+                  ),
+                ),
+                const SizedBox(height: 12),
+                PassportFieldWithError(
+                  error: errors['birth_date'],
+                  child: CustomTextFormField(
+                    hintText: 'Дата рождения (ДД.ММ.ГГГГ)',
+                    controller: birthDateController,
+                    keyboardType: TextInputType.number,
+                    inputFormatters: [dateMaskBirth],
+                    hasError: errors.containsKey('birth_date'),
+                    onChanged: (_) => _syncToCubit(),
+                  ),
+                ),
+                const SizedBox(height: 12),
+                PassportFieldWithError(
+                  error: errors['birth_place'],
+                  child: CustomTextFormField(
+                    hintText: 'Место рождения',
+                    controller: birthPlaceController,
+                    hasError: errors.containsKey('birth_place'),
+                    onChanged: (_) => _syncToCubit(),
+                  ),
+                ),
+                const SizedBox(height: 12),
+                PassportFieldWithError(
+                  error: errors['citizenship'],
+                  child: CustomTextFormField(
+                    hintText: 'Гражданство (ISO, например RU)',
+                    controller: citizenshipController,
+                    maxLength: 2,
+                    hasError: errors.containsKey('citizenship'),
+                    onChanged: (_) => _syncToCubit(),
+                  ),
+                ),
+                const SizedBox(height: 12),
+                PassportFieldWithError(
+                  error: errors['registration_address'],
+                  child: CustomTextFormField(
+                    hintText: 'Адрес регистрации',
+                    controller: registrationAddressController,
+                    hasError: errors.containsKey('registration_address'),
+                    onChanged: (_) => _syncToCubit(),
+                  ),
+                ),
+                const SizedBox(height: 12),
+                PassportFieldWithError(
+                  error: errors['residence_address'],
+                  child: CustomTextFormField(
+                    hintText: 'Адрес проживания',
+                    controller: residenceAddressController,
+                    hasError: errors.containsKey('residence_address'),
+                    onChanged: (_) => _syncToCubit(),
+                  ),
+                ),
+                const SizedBox(height: 8),
+                CheckboxListTile(
+                  value: taxResidentUs,
+                  contentPadding: EdgeInsets.zero,
+                  controlAffinity: ListTileControlAffinity.leading,
+                  activeColor: appTheme.blueA400,
+                  title: Text(
+                    'Я являюсь налоговым резидентом США',
+                    style: TextStyles.textMMediumAuto.copyWith(
+                      color: appTheme.black,
+                    ),
+                  ),
+                  onChanged: (value) {
+                    setState(() => taxResidentUs = value ?? false);
+                    _syncToCubit();
+                  },
+                ),
+                CheckboxListTile(
+                  value: foreignTaxResident,
+                  contentPadding: EdgeInsets.zero,
+                  controlAffinity: ListTileControlAffinity.leading,
+                  activeColor: appTheme.blueA400,
+                  title: Text(
+                    'Я являюсь иностранным налоговым резидентом',
+                    style: TextStyles.textMMediumAuto.copyWith(
+                      color: appTheme.black,
+                    ),
+                  ),
+                  onChanged: (value) {
+                    setState(() => foreignTaxResident = value ?? false);
+                    _syncToCubit();
+                  },
+                ),
+                const PassportSectionTitle(title: 'Паспорт'),
+                Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Expanded(
+                      child: PassportFieldWithError(
+                        error: errors['passport_series'],
+                        child: CustomTextFormField(
+                          hintText: 'Серия',
+                          controller: seriesController,
+                          keyboardType: TextInputType.number,
+                          maxLength: 4,
+                          inputFormatters: [
+                            FilteringTextInputFormatter.digitsOnly,
+                          ],
+                          hasError: errors.containsKey('passport_series'),
+                          onChanged: (_) => _syncToCubit(),
+                        ),
+                      ),
+                    ),
+                    const SizedBox(width: 8),
+                    Expanded(
+                      child: PassportFieldWithError(
+                        error: errors['passport_number'],
+                        child: CustomTextFormField(
+                          hintText: 'Номер',
+                          controller: numberController,
+                          keyboardType: TextInputType.number,
+                          maxLength: 6,
+                          inputFormatters: [
+                            FilteringTextInputFormatter.digitsOnly,
+                          ],
+                          hasError: errors.containsKey('passport_number'),
+                          onChanged: (_) => _syncToCubit(),
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+                const SizedBox(height: 12),
+                PassportFieldWithError(
+                  error: errors['passport_issue_date'],
+                  child: CustomTextFormField(
+                    hintText: 'Дата выдачи (ДД.ММ.ГГГГ)',
+                    controller: issueDateController,
+                    keyboardType: TextInputType.number,
+                    inputFormatters: [dateMaskIssue],
+                    hasError: errors.containsKey('passport_issue_date'),
+                    onChanged: (_) => _syncToCubit(),
+                  ),
+                ),
+                const SizedBox(height: 12),
+                PassportFieldWithError(
+                  error: errors['passport_issuer_code'],
+                  child: CustomTextFormField(
+                    hintText: 'Код подразделения',
+                    controller: issuerCodeController,
+                    keyboardType: TextInputType.number,
+                    inputFormatters: [issuerCodeMask],
+                    hasError: errors.containsKey('passport_issuer_code'),
+                    onChanged: (_) => _syncToCubit(),
+                  ),
+                ),
+                const SizedBox(height: 12),
+                PassportFieldWithError(
+                  error: errors['passport_issuer'],
+                  child: CustomTextFormField(
+                    hintText: 'Кем выдан',
+                    controller: issuerController,
+                    hasError: errors.containsKey('passport_issuer'),
+                    onChanged: (_) => _syncToCubit(),
+                  ),
+                ),
+                const PassportSectionTitle(title: 'Реквизиты СБП'),
+                PassportFieldWithError(
+                  error: errors['sbp_phone'],
+                  child: CustomTextFormField(
+                    hintText: 'Телефон для выплат через СБП',
+                    controller: sbpPhoneController,
+                    keyboardType: TextInputType.phone,
+                    inputFormatters: [phoneMask],
+                    hasError: errors.containsKey('sbp_phone'),
+                    onChanged: (_) => _syncToCubit(),
+                  ),
+                ),
+                const SizedBox(height: 12),
+                PassportFieldWithError(
+                  error: errors['sbp_bank_member_id'],
+                  child: TypeAheadField<SbpBankModel>(
+                    debounceDuration: const Duration(milliseconds: 250),
+                    controller: sbpBankController,
+                    suggestionsController: sbpBankSuggestionsController,
+                    builder: (context, controller, focusNode) =>
+                        CustomTextFormField(
+                          controller: controller,
+                          focusNode: focusNode,
+                          hintText: 'Банк получатель (поиск)',
+                          hasError: errors.containsKey('sbp_bank_member_id'),
+                          onChanged: _clearSbpBankIfNeeded,
+                        ),
+                    suggestionsCallback: (query) async {
+                      return context
+                          .read<RegisterConsultantCubit>()
+                          .searchSbpBanks(query);
+                    },
+                    itemBuilder: (context, bank) {
+                      return ListTile(
+                        dense: true,
+                        title: Text(
+                          bank.bankName,
+                          style: TextStyles.textMMedium.copyWith(
+                            color: appTheme.black900,
+                          ),
+                        ),
+                        subtitle:
+                            bank.shortName == null || bank.shortName!.isEmpty
+                            ? null
+                            : Text(
+                                bank.shortName!,
+                                style: TextStyles.textSMedium.copyWith(
+                                  color: appTheme.grey7B,
+                                ),
+                              ),
+                      );
+                    },
+                    decorationBuilder: (context, child) => Material(
+                      type: MaterialType.card,
+                      elevation: 4,
+                      borderRadius: BorderRadius.circular(8),
+                      color: appTheme.whiteA700,
+                      child: child,
+                    ),
+                    emptyBuilder: (context) => Padding(
+                      padding: const EdgeInsets.all(12),
+                      child: Text(
+                        'Ничего не найдено',
+                        style: TextStyles.textSMedium.copyWith(
+                          color: appTheme.grey7B,
+                        ),
+                      ),
+                    ),
+                    onSelected: _selectSbpBank,
+                  ),
+                ),
+                const SizedBox(height: 16),
+                Divider(height: 0.4, thickness: 0.4, color: appTheme.greyD9),
+                const SizedBox(height: 16),
+                Text(
+                  'Данные используются для проверки и скоринга. Заполните поля в соответствии с паспортом РФ.',
+                  style: TextStyles.textSMedium.copyWith(
+                    color: appTheme.blueA400,
+                  ),
+                ),
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart
index cf21b646..87269eb5 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart
@@ -29,32 +29,48 @@ class _PhotoOrScansScreenState extends State<PhotoOrScansScreen> {
         mainAxisSize: MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          const Text('Загрузите фото или сканы дипломов и сертификатов', style: TextStyle(fontSize: 24, fontWeight: FontWeight.w700, height: 1.1)),
+          const Text(
+            'Загрузите фото или сканы дипломов и сертификатов',
+            style: TextStyle(
+              fontSize: 24,
+              fontWeight: FontWeight.w700,
+              height: 1.1,
+            ),
+          ),
           const SizedBox(height: 16),
           BlocBuilder<RegisterConsultantCubit, RegisterConsultantState>(
             builder: (context, state) {
-              final photos = state.certPhotos.where((photo) => !state.deletedPhotoIds.contains(photo.id)).toList();
+              final photos = state.certPhotos
+                  .where((photo) => !state.deletedPhotoIds.contains(photo.id))
+                  .toList();
               final addedPhotos = state.newAddedPhotos;
               final totalPhotosCount = photos.length + addedPhotos.length;
               return Column(
                 children: [
-                  if (isUploading) ...[const LinearProgressIndicator(), const SizedBox(height: 16)],
+                  if (isUploading) ...[
+                    const LinearProgressIndicator(),
+                    const SizedBox(height: 16),
+                  ],
                   GridView.builder(
                     shrinkWrap: true,
                     physics: const NeverScrollableScrollPhysics(),
-                    gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                      crossAxisCount: 3,
-                      childAspectRatio: 3 / 4,
-                      crossAxisSpacing: 8,
-                      mainAxisSpacing: 8,
-                    ),
+                    gridDelegate:
+                        const SliverGridDelegateWithFixedCrossAxisCount(
+                          crossAxisCount: 3,
+                          childAspectRatio: 3 / 4,
+                          crossAxisSpacing: 8,
+                          mainAxisSpacing: 8,
+                        ),
                     itemBuilder: (BuildContext context, int index) {
                       if (index == totalPhotosCount) {
                         return InkWell(
                           borderRadius: BorderRadius.circular(20),
                           onTap: () => _pickAndUploadPhotos(),
                           child: Ink(
-                            decoration: BoxDecoration(color: const Color(0xFFF6F6F6), borderRadius: BorderRadius.circular(20)),
+                            decoration: BoxDecoration(
+                              color: const Color(0xFFF6F6F6),
+                              borderRadius: BorderRadius.circular(20),
+                            ),
                             child: Icon(Icons.add, color: appTheme.blueA400),
                           ),
                         );
@@ -72,7 +88,8 @@ class _PhotoOrScansScreenState extends State<PhotoOrScansScreen> {
                           return _LocalCertPhotoCard(
                             photo: localPhoto,
                             allPhotos: addedPhotos,
-                            onRemove: () => _removePhoto(path: localPhoto.uri.path),
+                            onRemove: () =>
+                                _removePhoto(path: localPhoto.uri.path),
                           );
                         }
                       }
@@ -99,7 +116,9 @@ class _PhotoOrScansScreenState extends State<PhotoOrScansScreen> {
     });
     try {
       // ignore: use_build_context_synchronously
-      await context.read<RegisterConsultantCubit>().addCertPhotos(newImages.map((file) => File(file.path)).toList());
+      await context.read<RegisterConsultantCubit>().addCertPhotos(
+        newImages.map((file) => File(file.path)).toList(),
+      );
     } finally {
       if (mounted) {
         setState(() {
@@ -119,7 +138,11 @@ class _CertPhotoCard extends StatelessWidget {
   final List<ConsultantCertPhotoModel> allPhotos;
   final VoidCallback onRemove;
 
-  const _CertPhotoCard({required this.photo, required this.allPhotos, required this.onRemove});
+  const _CertPhotoCard({
+    required this.photo,
+    required this.allPhotos,
+    required this.onRemove,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -131,7 +154,11 @@ class _CertPhotoCard extends StatelessWidget {
           onTap: () {
             context.pushTransparentRoute(
               rootNavigator: true,
-              PhotoViewScreen(imageUrls: allPhotos.map((e) => e.url).toList(), isLocal: false, index: allPhotos.indexOf(photo)),
+              PhotoViewScreen(
+                imageUrls: allPhotos.map((e) => e.url).toList(),
+                isLocal: false,
+                index: allPhotos.indexOf(photo),
+              ),
             );
           },
           borderRadius: BorderRadius.circular(20),
@@ -141,7 +168,10 @@ class _CertPhotoCard extends StatelessWidget {
               Ink(
                 decoration: BoxDecoration(
                   borderRadius: const BorderRadius.all(Radius.circular(20)),
-                  image: DecorationImage(fit: BoxFit.cover, image: NetworkImage(photo.url)),
+                  image: DecorationImage(
+                    fit: BoxFit.cover,
+                    image: NetworkImage(photo.url),
+                  ),
                 ),
               ),
               Positioned(
@@ -152,8 +182,15 @@ class _CertPhotoCard extends StatelessWidget {
                   customBorder: const CircleBorder(),
                   child: Ink(
                     padding: const EdgeInsets.all(4),
-                    decoration: const BoxDecoration(color: Color(0xFFF1F2F6), shape: BoxShape.circle),
-                    child: const Icon(size: 20, Icons.close, color: Colors.black),
+                    decoration: const BoxDecoration(
+                      color: Color(0xFFF1F2F6),
+                      shape: BoxShape.circle,
+                    ),
+                    child: const Icon(
+                      size: 20,
+                      Icons.close,
+                      color: Colors.black,
+                    ),
                   ),
                 ),
               ),
@@ -170,7 +207,11 @@ class _LocalCertPhotoCard extends StatelessWidget {
   final List<File> allPhotos;
   final VoidCallback onRemove;
 
-  const _LocalCertPhotoCard({required this.photo, required this.allPhotos, required this.onRemove});
+  const _LocalCertPhotoCard({
+    required this.photo,
+    required this.allPhotos,
+    required this.onRemove,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -210,8 +251,15 @@ class _LocalCertPhotoCard extends StatelessWidget {
                   customBorder: const CircleBorder(),
                   child: Ink(
                     padding: const EdgeInsets.all(4),
-                    decoration: const BoxDecoration(color: Color(0xFFF1F2F6), shape: BoxShape.circle),
-                    child: const Icon(size: 20, Icons.close, color: Colors.black),
+                    decoration: const BoxDecoration(
+                      color: Color(0xFFF1F2F6),
+                      shape: BoxShape.circle,
+                    ),
+                    child: const Icon(
+                      size: 20,
+                      Icons.close,
+                      color: Colors.black,
+                    ),
                   ),
                 ),
               ),
diff --git a/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart
index b8fed20b..e10fc74a 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart
@@ -1,5 +1,7 @@
 import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 
 class RegistrationAsScreen extends StatefulWidget {
   const RegistrationAsScreen({super.key});
@@ -11,7 +13,26 @@ class RegistrationAsScreen extends StatefulWidget {
 enum RegistrationAsType { physical, selfBusy, iP, ooo }
 
 class _RegistrationAsScreenState extends State<RegistrationAsScreen> {
-  RegistrationAsType registrationAsType = RegistrationAsType.physical;
+  static const RegistrationAsType registrationAsType =
+      RegistrationAsType.physical;
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) {
+        return;
+      }
+      final cubit = context.read<RegisterConsultantCubit>();
+      cubit.updateConsultantProfileModel(
+        cubit.state.consultant.copyWith(
+          legalType: RegisterConsultantCubit.individualPersonLegalType,
+        ),
+        cubit.state.acceptOffer,
+        cubit.state.acceptFrdoAgreement,
+      );
+    });
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -23,7 +44,14 @@ class _RegistrationAsScreenState extends State<RegistrationAsScreen> {
         children: [
           const Padding(
             padding: EdgeInsets.symmetric(horizontal: 16),
-            child: Text('Регистрация в качестве', style: TextStyle(fontSize: 24, fontWeight: FontWeight.w700, height: 1.1)),
+            child: Text(
+              'Регистрация в качестве',
+              style: TextStyle(
+                fontSize: 24,
+                fontWeight: FontWeight.w700,
+                height: 1.1,
+              ),
+            ),
           ),
           const SizedBox(height: 16),
           Column(
@@ -36,16 +64,15 @@ class _RegistrationAsScreenState extends State<RegistrationAsScreen> {
                     groupValue: registrationAsType,
                     activeColor: appTheme.blueA400,
                     // ignore: deprecated_member_use
-                    onChanged: (value) {
-                      setState(() {
-                        registrationAsType = value!;
-                      });
-                    },
+                    onChanged: (_) {},
                   ),
                   const Expanded(
                     child: Padding(
                       padding: EdgeInsets.symmetric(horizontal: 8),
-                      child: Text('Физического лица', style: TextStyle(fontSize: 18, height: 1)),
+                      child: Text(
+                        'Физического лица',
+                        style: TextStyle(fontSize: 18, height: 1),
+                      ),
                     ),
                   ),
                 ],
@@ -58,16 +85,19 @@ class _RegistrationAsScreenState extends State<RegistrationAsScreen> {
                     groupValue: registrationAsType,
                     activeColor: appTheme.blueA400,
                     // ignore: deprecated_member_use
-                    onChanged: (value) {
-                      setState(() {
-                        registrationAsType = value!;
-                      });
-                    },
+                    onChanged: null,
                   ),
                   const Expanded(
                     child: Padding(
                       padding: EdgeInsets.symmetric(horizontal: 8),
-                      child: Text('Самозанятого', style: TextStyle(fontSize: 18, height: 1)),
+                      child: Text(
+                        'Самозанятого',
+                        style: TextStyle(
+                          fontSize: 18,
+                          height: 1,
+                          color: Colors.black38,
+                        ),
+                      ),
                     ),
                   ),
                 ],
@@ -80,16 +110,19 @@ class _RegistrationAsScreenState extends State<RegistrationAsScreen> {
                     groupValue: registrationAsType,
                     activeColor: appTheme.blueA400,
                     // ignore: deprecated_member_use
-                    onChanged: (value) {
-                      setState(() {
-                        registrationAsType = value!;
-                      });
-                    },
+                    onChanged: null,
                   ),
                   const Expanded(
                     child: Padding(
                       padding: EdgeInsets.symmetric(horizontal: 8),
-                      child: Text('Индивидуального предпринимателя', style: TextStyle(fontSize: 18, height: 1)),
+                      child: Text(
+                        'Индивидуального предпринимателя',
+                        style: TextStyle(
+                          fontSize: 18,
+                          height: 1,
+                          color: Colors.black38,
+                        ),
+                      ),
                     ),
                   ),
                 ],
@@ -102,26 +135,34 @@ class _RegistrationAsScreenState extends State<RegistrationAsScreen> {
                     groupValue: registrationAsType,
                     activeColor: appTheme.blueA400,
                     // ignore: deprecated_member_use
-                    onChanged: (value) {
-                      setState(() {
-                        registrationAsType = value!;
-                      });
-                    },
+                    onChanged: null,
                   ),
                   const Expanded(
                     child: Padding(
                       padding: EdgeInsets.symmetric(horizontal: 8),
-                      child: Text('Общества с ограниченной ответственностью', style: TextStyle(fontSize: 18, height: 1)),
+                      child: Text(
+                        'Общества с ограниченной ответственностью',
+                        style: TextStyle(
+                          fontSize: 18,
+                          height: 1,
+                          color: Colors.black38,
+                        ),
+                      ),
                     ),
                   ),
                 ],
               ),
             ],
           ),
-          Padding(padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16), child: _divider(context)),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16),
+            child: _divider(context),
+          ),
           const Padding(
             padding: EdgeInsets.symmetric(horizontal: 16),
-            child: Text('* На данный момент регистрация доступна только в качестве физического лица. Остальные варианты скоро появятся'),
+            child: Text(
+              '* На данный момент регистрация доступна только в качестве физического лица. Остальные варианты скоро появятся',
+            ),
           ),
         ],
       ),
@@ -132,7 +173,10 @@ class _RegistrationAsScreenState extends State<RegistrationAsScreen> {
     return Container(
       height: 0.4,
       width: MediaQuery.of(context).size.width - 32,
-      decoration: BoxDecoration(color: Colors.black26, borderRadius: BorderRadius.circular(16)),
+      decoration: BoxDecoration(
+        color: Colors.black26,
+        borderRadius: BorderRadius.circular(16),
+      ),
     );
   }
 }
diff --git a/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart
index 609e94a5..1847ec60 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart
@@ -19,32 +19,47 @@ class _SocialNetworksScreenState extends State<SocialNetworksScreen> {
 
   var maskFormatter = MaskTextInputFormatter(
     mask: 'https://########################################',
-    filter: {
-      '#': RegExp(r"[a-zA-Z. ]+"),
-    },
+    filter: {'#': RegExp(r"[a-zA-Z. ]+")},
     type: MaskAutoCompletionType.lazy,
   );
   var maskTgFormatter = MaskTextInputFormatter(
     mask: 'https://tg.me/########################################',
-    filter: {
-      '#': RegExp(r"[a-zA-Z. ]+"),
-    },
+    filter: {'#': RegExp(r"[a-zA-Z. ]+")},
     type: MaskAutoCompletionType.lazy,
   );
   var maskVkFormatter = MaskTextInputFormatter(
     mask: 'https://vk.com/########################################',
-    filter: {
-      '#': RegExp(r"[a-zA-Z. ]+"),
-    },
+    filter: {'#': RegExp(r"[a-zA-Z. ]+")},
     type: MaskAutoCompletionType.lazy,
   );
 
   @override
   void initState() {
     super.initState();
-    vkController.text = context.read<RegisterConsultantCubit>().state.consultant.socialLinks!.vkLink ?? '';
-    telegramController.text = context.read<RegisterConsultantCubit>().state.consultant.socialLinks!.tgLink ?? '';
-    webSiteController.text = context.read<RegisterConsultantCubit>().state.consultant.socialLinks!.personalSiteLink ?? '';
+    vkController.text =
+        context
+            .read<RegisterConsultantCubit>()
+            .state
+            .consultant
+            .socialLinks!
+            .vkLink ??
+        '';
+    telegramController.text =
+        context
+            .read<RegisterConsultantCubit>()
+            .state
+            .consultant
+            .socialLinks!
+            .tgLink ??
+        '';
+    webSiteController.text =
+        context
+            .read<RegisterConsultantCubit>()
+            .state
+            .consultant
+            .socialLinks!
+            .personalSiteLink ??
+        '';
   }
 
   @override
@@ -75,9 +90,7 @@ class _SocialNetworksScreenState extends State<SocialNetworksScreen> {
                   color: const Color(0xFFF6F6F6),
                   borderRadius: BorderRadius.circular(20),
                 ),
-                child: SvgPicture.asset(
-                  'assets/icons/vk.svg',
-                ),
+                child: SvgPicture.asset('assets/icons/vk.svg'),
               ),
               const SizedBox(width: 8),
               SizedBox(
@@ -105,9 +118,7 @@ class _SocialNetworksScreenState extends State<SocialNetworksScreen> {
                   color: const Color(0xFFF6F6F6),
                   borderRadius: BorderRadius.circular(20),
                 ),
-                child: SvgPicture.asset(
-                  'assets/icons/telegram.svg',
-                ),
+                child: SvgPicture.asset('assets/icons/telegram.svg'),
               ),
               const SizedBox(width: 8),
               SizedBox(
@@ -135,9 +146,7 @@ class _SocialNetworksScreenState extends State<SocialNetworksScreen> {
                   color: const Color(0xFFF6F6F6),
                   borderRadius: BorderRadius.circular(20),
                 ),
-                child: SvgPicture.asset(
-                  'assets/icons/web.svg',
-                ),
+                child: SvgPicture.asset('assets/icons/web.svg'),
               ),
               const SizedBox(width: 8),
               SizedBox(
@@ -164,25 +173,45 @@ class _SocialNetworksScreenState extends State<SocialNetworksScreen> {
     String? personalSiteLink,
   }) {
     context.read<RegisterConsultantCubit>().updateConsultantProfileModel(
-          context.read<RegisterConsultantCubit>().state.consultant.copyWith(
-                socialLinks: context.read<RegisterConsultantCubit>().state.consultant.socialLinks?.copyWith(
-                      tgLink: tgLink == null
-                          ? context.read<RegisterConsultantCubit>().state.consultant.socialLinks?.tgLink
-                          : tgLink.isEmpty
-                              ? null
-                              : tgLink,
-                      vkLink: vkLink == null
-                          ? context.read<RegisterConsultantCubit>().state.consultant.socialLinks?.vkLink
-                          : vkLink.isEmpty
-                              ? null
-                              : vkLink,
-                      personalSiteLink: personalSiteLink == null
-                          ? context.read<RegisterConsultantCubit>().state.consultant.socialLinks?.personalSiteLink
-                          : personalSiteLink.isEmpty
-                              ? null
-                              : personalSiteLink,
-                    ),
-              ),
-        );
+      context.read<RegisterConsultantCubit>().state.consultant.copyWith(
+        socialLinks: context
+            .read<RegisterConsultantCubit>()
+            .state
+            .consultant
+            .socialLinks
+            ?.copyWith(
+              tgLink: tgLink == null
+                  ? context
+                        .read<RegisterConsultantCubit>()
+                        .state
+                        .consultant
+                        .socialLinks
+                        ?.tgLink
+                  : tgLink.isEmpty
+                  ? null
+                  : tgLink,
+              vkLink: vkLink == null
+                  ? context
+                        .read<RegisterConsultantCubit>()
+                        .state
+                        .consultant
+                        .socialLinks
+                        ?.vkLink
+                  : vkLink.isEmpty
+                  ? null
+                  : vkLink,
+              personalSiteLink: personalSiteLink == null
+                  ? context
+                        .read<RegisterConsultantCubit>()
+                        .state
+                        .consultant
+                        .socialLinks
+                        ?.personalSiteLink
+                  : personalSiteLink.isEmpty
+                  ? null
+                  : personalSiteLink,
+            ),
+      ),
+    );
   }
 }
diff --git a/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart
index a27e5c67..49e30959 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart
@@ -1,11 +1,13 @@
 import 'package:eatvio_app/core/utils/image_constant.dart';
 import 'package:eatvio_app/core/widgets/data_error_widget.dart';
 import 'package:eatvio_app/core/widgets/loader.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/enums/alfa_scoring_status.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/last_step_screen.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/passport_data_screen.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart';
@@ -21,67 +23,196 @@ import 'package:lottie/lottie.dart';
 class StepperBecomeConsultantScreen extends StatefulWidget {
   final String? slug;
   final bool? isCanceled;
-  const StepperBecomeConsultantScreen({super.key, this.slug, this.isCanceled});
+  final bool isNewRegistration;
+  const StepperBecomeConsultantScreen({
+    super.key,
+    this.slug,
+    this.isCanceled,
+    this.isNewRegistration = false,
+  });
 
   @override
-  State<StepperBecomeConsultantScreen> createState() => _StepperBecomeConsultantScreenState();
+  State<StepperBecomeConsultantScreen> createState() =>
+      _StepperBecomeConsultantScreenState();
 }
 
-class _StepperBecomeConsultantScreenState extends State<StepperBecomeConsultantScreen> {
-  double progressValue = 1 / 6;
+class _StepperBecomeConsultantScreenState
+    extends State<StepperBecomeConsultantScreen> {
+  double progressValue = 0;
   int step = 1;
   final pageController = PageController();
   late final RegisterConsultantCubit registrationConsultantCubit;
   bool isLoading = false;
+  bool _successSheetShown = false;
 
   @override
   void initState() {
     super.initState();
-    if (widget.slug == null) {
-      registrationConsultantCubit = sl<RegisterConsultantCubit>()..disableLoading();
+    if (widget.isNewRegistration || widget.slug == null) {
+      registrationConsultantCubit = sl<RegisterConsultantCubit>()
+        ..disableLoading(slug: widget.slug);
     } else {
-      registrationConsultantCubit = sl<RegisterConsultantCubit>()..getMyRequestStatus(widget.slug!);
+      registrationConsultantCubit = sl<RegisterConsultantCubit>()
+        ..getMyRequestStatus(widget.slug!);
     }
   }
 
+  static const int totalSteps = 7;
+
+  List<Widget> _pages() {
+    return const [
+      CertificatesAndDiplomasScreen(),
+      PhotoOrScansScreen(),
+      AdditionalSettingsScreen(),
+      SocialNetworksScreen(),
+      RegistrationAsScreen(),
+      PassportDataScreen(),
+      LastStepScreen(),
+    ];
+  }
+
+  Future<void> _showSuccessSheet(BuildContext context) async {
+    if (_successSheetShown) {
+      return;
+    }
+    _successSheetShown = true;
+    await showModalBottomSheet(
+      useRootNavigator: true,
+      showDragHandle: true,
+      context: context,
+      builder: (context) => Container(
+        padding: const EdgeInsets.all(16),
+        width: MediaQuery.of(context).size.width,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            const Text(
+              'Спасибо!\nВаши данные отправлены на модерацию',
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                fontSize: 20,
+                height: 1,
+                fontWeight: FontWeight.w600,
+              ),
+            ),
+            const SizedBox(height: 16),
+            Lottie.asset(
+              'assets/lottie_animations/success.json',
+              width: 160,
+              height: 160,
+            ),
+            const SizedBox(height: 16),
+            const Text(
+              'В течении трех рабочих дней Вам придет уведомление о смене статуса',
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                fontSize: 16,
+                height: 1,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+            const SizedBox(height: 16),
+            InkWell(
+              onTap: () {
+                Navigator.of(context).pop();
+                GoRouter.of(context).pop();
+              },
+              child: Ink(
+                width: MediaQuery.of(context).size.width - 32,
+                height: 52,
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(20),
+                  color: appTheme.blueA400,
+                ),
+                child: const Center(
+                  child: Text(
+                    'Закрыть',
+                    style: TextStyle(
+                      color: Colors.white,
+                      fontSize: 18,
+                      fontWeight: FontWeight.w600,
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return BlocProvider<RegisterConsultantCubit>(
       create: (context) => registrationConsultantCubit,
-      child: BlocBuilder<RegisterConsultantCubit, RegisterConsultantState>(
-        builder: (context, state) {
-          if (state.loading) {
-            return const Scaffold(body: Loader());
-          }
-          if (state.error != null) {
+      child: BlocListener<RegisterConsultantCubit, RegisterConsultantState>(
+        listenWhen: (previous, current) =>
+            previous.fieldErrors.isEmpty &&
+            current.fieldErrors.isNotEmpty &&
+            current.error == null,
+        listener: (context, state) {
+          pageController.jumpToPage(5);
+        },
+        child: BlocConsumer<RegisterConsultantCubit, RegisterConsultantState>(
+          listenWhen: (previous, current) =>
+              previous.awaitingScoringOutcome &&
+              !current.awaitingScoringOutcome &&
+              current.alfaScoringStatus.isComplete,
+          listener: (context, state) {
+            _showSuccessSheet(context);
+          },
+          builder: (context, state) {
+            if (state.loading) {
+              return const Scaffold(body: Loader());
+            }
+            if (state.error != null &&
+                state.requestModel == null &&
+                widget.slug != null &&
+                state.alfaScoringStatus == AlfaScoringStatus.none) {
+              return Scaffold(
+                appBar: AppBar(
+                  centerTitle: true,
+                  leading: BackButton(
+                    onPressed: () {
+                      if (context.canPop()) {
+                        GoRouter.of(context).pop();
+                        return;
+                      }
+                      GoRouter.of(context).go('/feed-screen');
+                    },
+                  ),
+                  title: Text(
+                    '',
+                    maxLines: 2,
+                    textAlign: TextAlign.center,
+                    overflow: TextOverflow.ellipsis,
+                    softWrap: true,
+                    style: TextStyles.headingXLSemibold.copyWith(
+                      color: appTheme.black,
+                    ),
+                  ),
+                ),
+                body: DataErrorWidget(
+                  onReload: () => context
+                      .read<RegisterConsultantCubit>()
+                      .reloadData(widget.slug),
+                ),
+              );
+            }
+
+            if (progressValue == 0) {
+              progressValue = 1 / totalSteps;
+            }
+
+            final submitDisabled =
+                isLoading ||
+                state.isScoringPolling ||
+                state.scoringRetryInProgress;
+
             return Scaffold(
-              appBar: AppBar(
-                centerTitle: true,
-                leading: BackButton(
-                  onPressed: () {
-                    if (context.canPop()) {
-                      GoRouter.of(context).pop();
-                      return;
-                    }
-                    GoRouter.of(context).go('/feed-screen');
-                  },
-                ),
-                title: Text(
-                  '',
-                  maxLines: 2,
-                  textAlign: TextAlign.center,
-                  overflow: TextOverflow.ellipsis,
-                  softWrap: true,
-                  style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
-                ),
-              ),
-              body: DataErrorWidget(
-                onReload: () => context.read<RegisterConsultantCubit>().reloadData(widget.slug),
-              ),
-            );
-          }
-          return Scaffold(
-              floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
+              floatingActionButtonLocation:
+                  FloatingActionButtonLocation.centerFloat,
               floatingActionButton: Row(
                 children: [
                   Container(
@@ -93,33 +224,51 @@ class _StepperBecomeConsultantScreenState extends State<StepperBecomeConsultantS
                       highlightElevation: 0,
                       focusElevation: 0,
                       elevation: 0,
-                      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(20),
+                      ),
                       backgroundColor: const Color(0xFFEAF2FD),
                       onPressed: () async {
                         setState(() {
-                          pageController.previousPage(duration: const Duration(milliseconds: 350), curve: Curves.easeInOut);
+                          pageController.previousPage(
+                            duration: const Duration(milliseconds: 350),
+                            curve: Curves.easeInOut,
+                          );
                         });
                       },
-                      label: Icon(Icons.arrow_back_ios_new_rounded, color: appTheme.blueA400),
+                      label: Icon(
+                        Icons.arrow_back_ios_new_rounded,
+                        color: appTheme.blueA400,
+                      ),
                     ),
                   ),
-                  if (widget.isCanceled == true)
+                  if (widget.isCanceled == true && step != totalSteps)
                     InkWell(
                       onTap: () {
+                        final canceledModeration =
+                            state.requestModel?.canceledModeration;
+                        if (canceledModeration == null) return;
                         showDialog(
                           context: context,
                           builder: (context) => AlertDialog(
-                            title: Text(state.requestModel!.canceledModeration!.title),
+                            title: Text(canceledModeration.title),
                             content: Column(
                               crossAxisAlignment: CrossAxisAlignment.start,
                               mainAxisSize: MainAxisSize.min,
                               children: [
-                                for (int i = 0; i < state.requestModel!.canceledModeration!.additional!.length; i++) ...[
-                                  Text('• ${state.requestModel!.canceledModeration!.additional![i]}'),
-                                ],
+                                if (canceledModeration.additional != null)
+                                  for (final item
+                                      in canceledModeration.additional!) ...[
+                                    Text('• $item'),
+                                  ],
                               ],
                             ),
-                            actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
+                            actions: [
+                              TextButton(
+                                onPressed: () => Navigator.pop(context),
+                                child: const Text('OK'),
+                              ),
+                            ],
                           ),
                         );
                       },
@@ -127,18 +276,26 @@ class _StepperBecomeConsultantScreenState extends State<StepperBecomeConsultantS
                       child: Ink(
                         height: 48,
                         width: MediaQuery.of(context).size.width * 0.6,
-                        decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: const Color(0x33FFCC00)),
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.circular(20),
+                          color: const Color(0x33FFCC00),
+                        ),
                         child: const Center(
                           child: Text(
                             'Комментарий',
-                            style: TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: Color(0xFF323F4B), height: 1),
+                            style: TextStyle(
+                              fontSize: 18,
+                              fontWeight: FontWeight.w600,
+                              color: Color(0xFF323F4B),
+                              height: 1,
+                            ),
                           ),
                         ),
                       ),
                     ),
                   Container(
                     height: 48,
-                    width: widget.isCanceled == true
+                    width: widget.isCanceled == true && step != totalSteps
                         ? MediaQuery.of(context).size.width * 0.2
                         : MediaQuery.of(context).size.width * 0.8,
                     padding: const EdgeInsets.only(left: 4, right: 16),
@@ -147,85 +304,77 @@ class _StepperBecomeConsultantScreenState extends State<StepperBecomeConsultantS
                       highlightElevation: 0,
                       elevation: 0,
                       focusElevation: 0,
-                      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
-                      backgroundColor: isLoading
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(20),
+                      ),
+                      backgroundColor: submitDisabled
                           ? Colors.grey
-                          : widget.isCanceled == true
+                          : widget.isCanceled == true && step != totalSteps
                           ? const Color(0xFFEAF2FD)
                           : appTheme.blueA400,
-                      onPressed: isLoading
+                      onPressed: submitDisabled
                           ? null
                           : () async {
-                              if (step == 6) {
-                                if (widget.isCanceled == true) {
+                              if (step == totalSteps) {
+                                final passportErrors =
+                                    registrationConsultantCubit
+                                        .validatePassportFields();
+                                if (passportErrors.isNotEmpty) {
+                                  pageController.jumpToPage(5);
                                   return;
                                 }
-                                if (registrationConsultantCubit.state.acceptOffer) {
+                                if (registrationConsultantCubit
+                                    .hasAcceptedRequiredAgreements) {
                                   setState(() {
                                     isLoading = true;
                                   });
                                   try {
-                                    await registrationConsultantCubit.registerConsultant();
+                                    await registrationConsultantCubit
+                                        .registerConsultant();
                                     if (!context.mounted) return;
-                                    if (registrationConsultantCubit.state.error != null) {
-                                      return;
-                                    }
-                                    await showModalBottomSheet(
-                                      useRootNavigator: true,
-                                      showDragHandle: true,
-                                      context: context,
-                                      builder: (context) => Container(
-                                        padding: const EdgeInsets.all(16),
-                                        width: MediaQuery.of(context).size.width,
-                                        child: Column(
-                                          mainAxisSize: MainAxisSize.min,
-                                          children: [
-                                            const Text(
-                                              'Спасибо!\nВаши данные отправлены на модерацию',
-                                              textAlign: TextAlign.center,
-                                              style: TextStyle(fontSize: 20, height: 1, fontWeight: FontWeight.w600),
-                                            ),
-                                            const SizedBox(height: 16),
-                                            Lottie.asset('assets/lottie_animations/success.json', width: 160, height: 160),
-                                            const SizedBox(height: 16),
-                                            const Text(
-                                              'В течении трех рабочих дней Вам придет уведомление о смене статуса',
-                                              textAlign: TextAlign.center,
-                                              style: TextStyle(fontSize: 16, height: 1, fontWeight: FontWeight.w500),
-                                            ),
-                                            const SizedBox(height: 16),
-                                            InkWell(
-                                              onTap: () {
-                                                Navigator.of(context).pop();
-                                                GoRouter.of(context).pop();
-                                              },
-                                              child: Ink(
-                                                width: MediaQuery.of(context).size.width - 32,
-                                                height: 52,
-                                                decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: appTheme.blueA400),
-                                                child: const Center(
-                                                  child: Text(
-                                                    'Закрыть',
-                                                    style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.w600),
-                                                  ),
-                                                ),
+                                    if (registrationConsultantCubit
+                                            .state
+                                            .error !=
+                                        null) {
+                                      showDialog(
+                                        context: context,
+                                        builder: (context) => AlertDialog(
+                                          actionsPadding:
+                                              const EdgeInsets.symmetric(
+                                                horizontal: 4,
                                               ),
+                                          content: Text(
+                                            registrationConsultantCubit
+                                                .state
+                                                .error!,
+                                          ),
+                                          actions: [
+                                            TextButton(
+                                              child: const Text('Ок'),
+                                              onPressed: () =>
+                                                  Navigator.of(context).pop(),
                                             ),
                                           ],
                                         ),
-                                      ),
-                                    );
+                                      );
+                                      return;
+                                    }
+                                    // Success sheet is shown by BlocListener when scoring completes.
                                   } catch (e) {
                                     if (!context.mounted) return;
                                     showDialog<void>(
                                       context: context,
                                       builder: (context) => AlertDialog(
-                                        actionsPadding: const EdgeInsets.symmetric(horizontal: 4),
+                                        actionsPadding:
+                                            const EdgeInsets.symmetric(
+                                              horizontal: 4,
+                                            ),
                                         content: Text(e.toString()),
                                         actions: [
                                           TextButton(
                                             child: const Text('Ок'),
-                                            onPressed: () => Navigator.of(context).pop(),
+                                            onPressed: () =>
+                                                Navigator.of(context).pop(),
                                           ),
                                         ],
                                       ),
@@ -239,8 +388,15 @@ class _StepperBecomeConsultantScreenState extends State<StepperBecomeConsultantS
                                   showDialog(
                                     context: context,
                                     builder: (context) => AlertDialog(
-                                      actionsPadding: const EdgeInsets.symmetric(horizontal: 4),
-                                      content: const Text('Примите договор публичной офёрты'),
+                                      actionsPadding:
+                                          const EdgeInsets.symmetric(
+                                            horizontal: 4,
+                                          ),
+                                      content: Text(
+                                        state.isUpdating
+                                            ? 'Примите договор публичной оферты'
+                                            : 'Примите оферту и согласие ФРДО',
+                                      ),
                                       actions: [
                                         TextButton(
                                           child: const Text('Ок'),
@@ -255,15 +411,26 @@ class _StepperBecomeConsultantScreenState extends State<StepperBecomeConsultantS
                               } else {
                                 FocusManager.instance.primaryFocus?.unfocus();
                                 setState(() {
-                                  pageController.nextPage(duration: const Duration(milliseconds: 350), curve: Curves.easeInOut);
+                                  pageController.nextPage(
+                                    duration: const Duration(milliseconds: 350),
+                                    curve: Curves.easeInOut,
+                                  );
                                 });
                               }
                             },
-                      label: isLoading
+                      label: submitDisabled && step == totalSteps
                           ? const CircularProgressIndicator()
-                          : widget.isCanceled == true
-                          ? Icon(Icons.arrow_forward_ios_outlined, color: appTheme.blueA400)
-                          : Text('Продолжить', style: theme.textTheme.titleSmall!.copyWith(color: Colors.white)),
+                          : widget.isCanceled == true && step != totalSteps
+                          ? Icon(
+                              Icons.arrow_forward_ios_outlined,
+                              color: appTheme.blueA400,
+                            )
+                          : Text(
+                              step == totalSteps ? 'Отправить' : 'Продолжить',
+                              style: theme.textTheme.titleSmall!.copyWith(
+                                color: Colors.white,
+                              ),
+                            ),
                     ),
                   ),
                 ],
@@ -271,11 +438,23 @@ class _StepperBecomeConsultantScreenState extends State<StepperBecomeConsultantS
               appBar: AppBar(
                 automaticallyImplyLeading: false,
                 leading: Builder(
-                  builder: (context) => IconButton(icon: const Icon(Icons.close_rounded), onPressed: () => GoRouter.of(context).pop()),
+                  builder: (context) => IconButton(
+                    icon: const Icon(Icons.close_rounded),
+                    onPressed: () => GoRouter.of(context).pop(),
+                  ),
                 ),
                 centerTitle: true,
-                title: SvgPicture.asset(ImageConstant.imgLogoEatvio, height: 48, fit: BoxFit.contain),
-                actions: [Padding(padding: const EdgeInsets.only(right: 16), child: Text('шаг $step из 6'))],
+                title: SvgPicture.asset(
+                  ImageConstant.imgLogoEatvio,
+                  height: 48,
+                  fit: BoxFit.contain,
+                ),
+                actions: [
+                  Padding(
+                    padding: const EdgeInsets.only(right: 16),
+                    child: Text('шаг $step из $totalSteps'),
+                  ),
+                ],
                 bottom: PreferredSize(
                   preferredSize: Size(MediaQuery.of(context).size.width, 32),
                   child: Padding(
@@ -283,13 +462,18 @@ class _StepperBecomeConsultantScreenState extends State<StepperBecomeConsultantS
                     child: TweenAnimationBuilder<double>(
                       duration: const Duration(milliseconds: 350),
                       curve: Curves.easeInOut,
-                      tween: Tween<double>(begin: 1 / 6, end: progressValue),
+                      tween: Tween<double>(
+                        begin: 1 / totalSteps,
+                        end: progressValue,
+                      ),
                       builder: (context, value, _) => LinearProgressIndicator(
                         value: value,
                         borderRadius: BorderRadius.circular(16),
                         minHeight: 8,
                         backgroundColor: Colors.grey.shade100,
-                        valueColor: AlwaysStoppedAnimation<Color>(appTheme.blueA400),
+                        valueColor: AlwaysStoppedAnimation<Color>(
+                          appTheme.blueA400,
+                        ),
                       ),
                     ),
                   ),
@@ -301,20 +485,14 @@ class _StepperBecomeConsultantScreenState extends State<StepperBecomeConsultantS
                 onPageChanged: (index) {
                   setState(() {
                     step = index + 1;
-                    progressValue = step / 6;
+                    progressValue = step / totalSteps;
                   });
                 },
-                children: const [
-                  CertificatesAndDiplomasScreen(),
-                  PhotoOrScansScreen(),
-                  AdditionalSettingsScreen(),
-                  SocialNetworksScreen(),
-                  RegistrationAsScreen(),
-                  LastStepScreen(),
-                ],
+                children: _pages(),
               ),
             );
-        },
+          },
+        ),
       ),
     );
   }
diff --git a/lib/features/consultant/become_consultant/presentation/widgets/passport_field_with_error.dart b/lib/features/consultant/become_consultant/presentation/widgets/passport_field_with_error.dart
new file mode 100644
index 00000000..5e34fa79
--- /dev/null
+++ b/lib/features/consultant/become_consultant/presentation/widgets/passport_field_with_error.dart
@@ -0,0 +1,28 @@
+import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
+import 'package:flutter/material.dart';
+
+/// Wraps a form field with [ValidationErrorWidget] when [error] is present.
+/// Pass [hasError] into [CustomTextFormField] from the parent.
+class PassportFieldWithError extends StatelessWidget {
+  const PassportFieldWithError({required this.child, this.error, super.key});
+
+  final Widget child;
+  final String? error;
+
+  @override
+  Widget build(BuildContext context) {
+    final message = error?.trim();
+    final showError = message != null && message.isNotEmpty;
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        child,
+        if (showError) ...[
+          const SizedBox(height: 4),
+          ValidationErrorWidget(error: message),
+        ],
+      ],
+    );
+  }
+}
diff --git a/lib/features/consultant/become_consultant/presentation/widgets/passport_section_title.dart b/lib/features/consultant/become_consultant/presentation/widgets/passport_section_title.dart
new file mode 100644
index 00000000..29abf8af
--- /dev/null
+++ b/lib/features/consultant/become_consultant/presentation/widgets/passport_section_title.dart
@@ -0,0 +1,34 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:flutter/material.dart';
+
+class PassportSectionTitle extends StatelessWidget {
+  const PassportSectionTitle({required this.title, super.key});
+
+  final String title;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(top: 8, bottom: 12),
+      child: Text(
+        title,
+        style: TextStyles.textLSemibold.copyWith(color: appTheme.black),
+      ),
+    );
+  }
+}
+
+class PassportScreenTitle extends StatelessWidget {
+  const PassportScreenTitle({required this.title, super.key});
+
+  final String title;
+
+  @override
+  Widget build(BuildContext context) {
+    return Text(
+      title,
+      style: TextStyles.textFS24FW700.copyWith(color: appTheme.black),
+    );
+  }
+}
diff --git a/lib/features/consultant/become_consultant/presentation/widgets/scoring_status_widget.dart b/lib/features/consultant/become_consultant/presentation/widgets/scoring_status_widget.dart
new file mode 100644
index 00000000..764c803d
--- /dev/null
+++ b/lib/features/consultant/become_consultant/presentation/widgets/scoring_status_widget.dart
@@ -0,0 +1,218 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/enums/alfa_scoring_status.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart';
+import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class ScoringStatusWidget extends StatelessWidget {
+  const ScoringStatusWidget({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<RegisterConsultantCubit, RegisterConsultantState>(
+      buildWhen: (previous, current) =>
+          previous.alfaScoringStatus != current.alfaScoringStatus ||
+          previous.isScoringPolling != current.isScoringPolling ||
+          previous.scoringRetryInProgress != current.scoringRetryInProgress ||
+          previous.awaitingScoringOutcome != current.awaitingScoringOutcome,
+      builder: (context, state) {
+        final isWaiting =
+            state.awaitingScoringOutcome || state.isScoringPolling;
+        final status = state.alfaScoringStatus;
+        final showProcessing = status.isProcessing ||
+            (isWaiting && !status.isTerminal);
+
+        if (status == AlfaScoringStatus.none && !isWaiting) {
+          return const SizedBox.shrink();
+        }
+
+        final displayStatus = showProcessing && !status.isProcessing
+            ? AlfaScoringStatus.beneficiaryCreating
+            : status;
+
+        return Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          child: DecoratedBox(
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(16),
+              border: Border.all(color: appTheme.greyD9),
+              color: appTheme.whiteA700,
+            ),
+            child: Padding(
+              padding: const EdgeInsets.all(16),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  ScoringStatusHeader(status: displayStatus),
+                  const SizedBox(height: 12),
+                  if (showProcessing) const ScoringProcessingBody(),
+                  if (status.isComplete) const ScoringCompleteBody(),
+                  if (status.isFailed)
+                    ScoringFailedBody(
+                      retryInProgress: state.scoringRetryInProgress,
+                      onRetry: () => context
+                          .read<RegisterConsultantCubit>()
+                          .retryScoring(),
+                    ),
+                ],
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
+
+class ScoringStatusHeader extends StatelessWidget {
+  const ScoringStatusHeader({required this.status, super.key});
+
+  final AlfaScoringStatus status;
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        Expanded(
+          child: Text(
+            'Проверка данных',
+            style: TextStyles.textMSemibold.copyWith(color: appTheme.black),
+          ),
+        ),
+        Text(
+          ScoringStatusLabels.hintFor(status),
+          style: TextStyles.textSMedium.copyWith(
+            color: ScoringStatusLabels.colorFor(status),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class ScoringProcessingBody extends StatelessWidget {
+  const ScoringProcessingBody({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        SizedBox(
+          width: 20,
+          height: 20,
+          child: CircularProgressIndicator(
+            strokeWidth: 2,
+            color: appTheme.blueA400,
+          ),
+        ),
+        const SizedBox(width: 10),
+        Expanded(
+          child: Text(
+            'Идёт проверка…',
+            style: TextStyles.textMMediumAuto.copyWith(color: appTheme.black),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class ScoringCompleteBody extends StatelessWidget {
+  const ScoringCompleteBody({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        Icon(Icons.check_circle, color: appTheme.green, size: 22),
+        const SizedBox(width: 8),
+        Expanded(
+          child: Text(
+            'Проверка успешно завершена',
+            style: TextStyles.textMMediumAuto.copyWith(color: appTheme.black),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class ScoringFailedBody extends StatelessWidget {
+  const ScoringFailedBody({
+    required this.retryInProgress,
+    required this.onRetry,
+    super.key,
+  });
+
+  final bool retryInProgress;
+  final VoidCallback onRetry;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        const ValidationErrorWidget(error: 'Не удалось пройти проверку'),
+        const SizedBox(height: 12),
+        SizedBox(
+          width: double.infinity,
+          height: 44,
+          child: ElevatedButton(
+            onPressed: retryInProgress ? null : onRetry,
+            style: ElevatedButton.styleFrom(
+              backgroundColor: appTheme.blueA400,
+              disabledBackgroundColor: appTheme.greyD9,
+              foregroundColor: appTheme.whiteA700,
+              shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(16),
+              ),
+              elevation: 0,
+            ),
+            child: retryInProgress
+                ? SizedBox(
+                    width: 20,
+                    height: 20,
+                    child: CircularProgressIndicator(
+                      strokeWidth: 2,
+                      color: appTheme.whiteA700,
+                    ),
+                  )
+                : Text(
+                    'Повторить',
+                    style: TextStyles.textMSemibold.copyWith(
+                      color: appTheme.whiteA700,
+                    ),
+                  ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+abstract final class ScoringStatusLabels {
+  static String hintFor(AlfaScoringStatus status) {
+    return switch (status) {
+      AlfaScoringStatus.beneficiaryCreating => 'Создание профиля',
+      AlfaScoringStatus.scoringPending => 'Ожидание результата',
+      AlfaScoringStatus.scoringComplete => 'Успешно',
+      AlfaScoringStatus.beneficiaryFailed => 'Ошибка',
+      AlfaScoringStatus.scoringFailed => 'Ошибка',
+      AlfaScoringStatus.none => '',
+    };
+  }
+
+  static Color colorFor(AlfaScoringStatus status) {
+    return switch (status) {
+      AlfaScoringStatus.scoringComplete => appTheme.green,
+      AlfaScoringStatus.beneficiaryFailed ||
+      AlfaScoringStatus.scoringFailed => appTheme.red,
+      AlfaScoringStatus.beneficiaryCreating ||
+      AlfaScoringStatus.scoringPending => appTheme.blueA400,
+      AlfaScoringStatus.none => appTheme.grey7B,
+    };
+  }
+}
diff --git a/lib/features/consultant/become_consultant/repositories/consultant_repository.dart b/lib/features/consultant/become_consultant/repositories/consultant_repository.dart
index c0e1c57a..4bc97dce 100644
--- a/lib/features/consultant/become_consultant/repositories/consultant_repository.dart
+++ b/lib/features/consultant/become_consultant/repositories/consultant_repository.dart
@@ -3,6 +3,7 @@ import 'package:dio/dio.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_cert_photo_model.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_profile_model.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultation_request_model.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/models/sbp_bank_model.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/services/consultant_service.dart';
 import 'package:http_parser/http_parser.dart';
 
@@ -11,36 +12,53 @@ class ConsultantRepository {
 
   const ConsultantRepository({required this.consultantService});
 
-  Future<void> registerConsultant({required ConsultantProfileModel consultant, bool update = false}) async {
+  Future<void> registerConsultant({
+    required ConsultantProfileModel consultant,
+    bool update = false,
+  }) async {
     if (update) {
-      return await consultantService.consultantUpdate(consultantModel: consultant);
+      return await consultantService.consultantUpdate(
+        consultantModel: consultant,
+      );
     } else {
-      return await consultantService.consultantRegistration(consultantModel: consultant);
+      return await consultantService.consultantRegistration(
+        consultantModel: consultant,
+      );
     }
-
   }
 
-  Future<ConsultationRequestModel> getConsultantRequestStatus(String slug) async {
+  /// Профиль консультанта (свой или чужой) — публичные данные без паспорта.
+  Future<ConsultationRequestModel> getConsultantRequestStatus(
+    String slug,
+  ) async {
     return await consultantService.getConsultantRequestStatus(slug: slug);
-
   }
 
+  /// Своя заявка — education + legal/passport для регистрации и update.
   Future<ConsultationRequestModel> getMyRequestStatus(String slug) async {
     return await consultantService.getMyRequestStatus(slug: slug);
+  }
 
+  Future<List<SbpBankModel>> getSbpBanks() async {
+    return await consultantService.getSbpBanks();
   }
 
   Future<List<ConsultantCertPhotoModel>> getConsultantCertPhotos() async {
     return await consultantService.getConsultantCertPhotos();
-
   }
 
-  Future<List<ConsultantCertPhotoModel>> storeConsultantCertPhotos({required List<File> files}) async {
+  Future<List<ConsultantCertPhotoModel>> storeConsultantCertPhotos({
+    required List<File> files,
+  }) async {
     final multipartFiles = <MultipartFile>[];
 
     for (final file in files) {
       final fileBytes = await file.readAsBytes();
-      final multipartFile = MultipartFile.fromBytes(fileBytes, filename: file.path.split('/').last, contentType: MediaType('application', 'octet-stream'));
+      final multipartFile = MultipartFile.fromBytes(
+        fileBytes,
+        filename: file.path.split('/').last,
+        contentType: MediaType('application', 'octet-stream'),
+      );
       multipartFiles.add(multipartFile);
     }
 
@@ -48,22 +66,24 @@ class ConsultantRepository {
       return [];
     }
 
-    return await consultantService.storeConsultantCertPhotos(photos: multipartFiles);
-
+    return await consultantService.storeConsultantCertPhotos(
+      photos: multipartFiles,
+    );
   }
 
   Future<void> hideConsultantCertPhoto(int id) async {
-    await consultantService.hideConsultantCertPhoto(payload: {'cert_photo_id': id});
-
+    await consultantService.hideConsultantCertPhoto(
+      payload: {'cert_photo_id': id},
+    );
   }
 
   Future<void> unHideConsultantCertPhoto(int id) async {
-    await consultantService.unHideConsultantCertPhoto(payload: {'cert_photo_id': id});
-
+    await consultantService.unHideConsultantCertPhoto(
+      payload: {'cert_photo_id': id},
+    );
   }
 
   Future<void> deletePhoto(int id) async {
     await consultantService.deletePhoto(id: id);
-
   }
 }
diff --git a/lib/features/consultant/become_consultant/services/consultant_service.dart b/lib/features/consultant/become_consultant/services/consultant_service.dart
index 9a0757ad..8458824d 100644
--- a/lib/features/consultant/become_consultant/services/consultant_service.dart
+++ b/lib/features/consultant/become_consultant/services/consultant_service.dart
@@ -2,6 +2,7 @@ import 'package:dio/dio.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_cert_photo_model.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_profile_model.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultation_request_model.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/models/sbp_bank_model.dart';
 import 'package:retrofit/retrofit.dart';
 
 part 'consultant_service.g.dart';
@@ -10,21 +11,39 @@ part 'consultant_service.g.dart';
 abstract class ConsultantService {
   factory ConsultantService(Dio dio, {String baseUrl}) = _ConsultantService;
 
-  @POST('/api/consultant_request/registration')
-  Future<void> consultantRegistration({@Body() required ConsultantProfileModel consultantModel});
+  @POST('/api/v2/consultant_request/registration')
+  Future<void> consultantRegistration({
+    @Body() required ConsultantProfileModel consultantModel,
+  });
 
   @POST('/api/consultant_request/photos/upload')
   @MultiPart()
-  Future<List<String>> uploadPhotos({@Part(name: 'photos[]', contentType: 'multipart/form-data') List<MultipartFile>? photos});
+  Future<List<String>> uploadPhotos({
+    @Part(name: 'photos[]', contentType: 'multipart/form-data')
+    List<MultipartFile>? photos,
+  });
 
+  /// Публичный статус консультанта для просмотра профиля.
+  /// Без паспортных данных: `/api/profile/consultant/{slug}/status`.
   @GET('/api/profile/consultant/{slug}/status')
-  Future<ConsultationRequestModel> getConsultantRequestStatus({@Path() required String slug});
+  Future<ConsultationRequestModel> getConsultantRequestStatus({
+    @Path() required String slug,
+  });
 
-  @GET('/api/consultant_request/{slug}/status')
-  Future<ConsultationRequestModel> getMyRequestStatus({@Path() required String slug});
+  /// Свой статус заявки для редактирования/модерации.
+  /// С паспортными полями в `legal_entity_resource`: `/api/v2/consultant_request/{slug}/status`.
+  @GET('/api/v2/consultant_request/{slug}/status')
+  Future<ConsultationRequestModel> getMyRequestStatus({
+    @Path() required String slug,
+  });
 
-  @PUT('/api/consultant_request/update')
-  Future<void> consultantUpdate({@Body() required ConsultantProfileModel consultantModel});
+  @PUT('/api/v2/consultant_request/update')
+  Future<void> consultantUpdate({
+    @Body() required ConsultantProfileModel consultantModel,
+  });
+
+  @GET('/api/finances/sbp_banks')
+  Future<List<SbpBankModel>> getSbpBanks();
 
   @GET('/api/v2/consultant_request/cert_photos')
   Future<List<ConsultantCertPhotoModel>> getConsultantCertPhotos();
@@ -32,14 +51,19 @@ abstract class ConsultantService {
   @POST('/api/v2/consultant_request/cert_photos/store')
   @MultiPart()
   Future<List<ConsultantCertPhotoModel>> storeConsultantCertPhotos({
-    @Part(name: 'photos[]', contentType: 'multipart/form-data') required List<MultipartFile> photos,
+    @Part(name: 'photos[]', contentType: 'multipart/form-data')
+    required List<MultipartFile> photos,
   });
 
   @POST('/api/v2/consultant_request/cert_photos/hide')
-  Future<void> hideConsultantCertPhoto({@Body() required Map<String, dynamic> payload});
+  Future<void> hideConsultantCertPhoto({
+    @Body() required Map<String, dynamic> payload,
+  });
 
   @POST('/api/v2/consultant_request/cert_photos/un_hide')
-  Future<void> unHideConsultantCertPhoto({@Body() required Map<String, dynamic> payload});
+  Future<void> unHideConsultantCertPhoto({
+    @Body() required Map<String, dynamic> payload,
+  });
 
   @POST('/api/v2/consultant_request/cert_photos/{id}/queue-for-deletion')
   Future<void> deletePhoto({@Path() required int id});
diff --git a/lib/features/consultant/become_consultant/utils/laravel_validation_errors.dart b/lib/features/consultant/become_consultant/utils/laravel_validation_errors.dart
new file mode 100644
index 00000000..97be0dc1
--- /dev/null
+++ b/lib/features/consultant/become_consultant/utils/laravel_validation_errors.dart
@@ -0,0 +1,170 @@
+import 'package:dio/dio.dart';
+
+/// Parsed Laravel 422 validation payload for consultant registration UI.
+class LaravelValidationErrors {
+  const LaravelValidationErrors({
+    required this.summary,
+    this.fieldErrors = const <String, String>{},
+  });
+
+  final String summary;
+  final Map<String, String> fieldErrors;
+
+  static const LaravelValidationErrors empty = LaravelValidationErrors(
+    summary: '',
+  );
+
+  bool get hasFieldErrors => fieldErrors.isNotEmpty;
+}
+
+const _genericValidationSummary = 'Проверьте введённые данные';
+const _genericNetworkSummary =
+    'Не удалось отправить данные. Попробуйте ещё раз';
+
+/// Parses Laravel `errors` map and maps them to user-facing Russian texts.
+/// Raw backend messages are never shown in the UI.
+LaravelValidationErrors parseLaravelValidationErrors(Object error) {
+  if (error is! DioException) {
+    return const LaravelValidationErrors(summary: _genericNetworkSummary);
+  }
+
+  final data = error.response?.data;
+  if (error.response?.statusCode == 422 && data is Map) {
+    final fieldErrors = <String, String>{};
+    final errors = data['errors'];
+
+    if (errors is Map) {
+      errors.forEach((key, value) {
+        final fieldKey = key.toString();
+        final raw = _rawErrorText(value);
+        fieldErrors[fieldKey] = mapConsultantValidationMessage(
+          fieldKey: fieldKey,
+          rawMessage: raw,
+        );
+      });
+    }
+
+    if (fieldErrors.isNotEmpty) {
+      final uniqueMessages = fieldErrors.values.toSet().toList();
+      return LaravelValidationErrors(
+        summary: uniqueMessages.join('\n'),
+        fieldErrors: fieldErrors,
+      );
+    }
+
+    return const LaravelValidationErrors(summary: _genericValidationSummary);
+  }
+
+  return const LaravelValidationErrors(summary: _genericNetworkSummary);
+}
+
+String _rawErrorText(Object? value) {
+  if (value is List && value.isNotEmpty) {
+    return value.map((e) => e.toString()).join(' ');
+  }
+  if (value is String) {
+    return value;
+  }
+  return '';
+}
+
+/// Maps a backend validation message for [fieldKey] to a short Russian UI string.
+String mapConsultantValidationMessage({
+  required String fieldKey,
+  required String rawMessage,
+}) {
+  final field = fieldKey.split('.').last.toLowerCase();
+  final raw = rawMessage.toLowerCase();
+
+  final isUnique =
+      raw.contains('taken') ||
+      raw.contains('unique') ||
+      raw.contains('already') ||
+      raw.contains('уже существ') ||
+      raw.contains('уже занят');
+  final isRequired =
+      raw.contains('required') ||
+      raw.contains('обязательн') ||
+      raw.contains('required_if');
+  final isAccepted = raw.contains('accepted') || field.contains('agreement');
+  final isUrl = raw.contains('url') || field.contains('link');
+  final isFormat =
+      raw.contains('format') ||
+      raw.contains('invalid') ||
+      raw.contains('regex') ||
+      raw.contains('digits') ||
+      raw.contains('size') ||
+      raw.contains('date') ||
+      raw.contains('before');
+
+  if (isAccepted) {
+    if (field.contains('frdo')) {
+      return 'Подтвердите согласие ФРДО';
+    }
+    return 'Примите условия оферты';
+  }
+
+  if (isUnique) {
+    return switch (field) {
+      'inn' => 'Такой ИНН существует',
+      'snils' => 'Такой СНИЛС существует',
+      'passport_number' || 'passport_series' => 'Такой паспорт существует',
+      'sbp_phone' => 'Такой телефон СБП существует',
+      _ => 'Такие данные уже существуют',
+    };
+  }
+
+  if (isRequired) {
+    return switch (field) {
+      'inn' => 'Укажите ИНН',
+      'snils' => 'Укажите СНИЛС',
+      'last_name' => 'Укажите фамилию',
+      'first_name' => 'Укажите имя',
+      'middle_name' => 'Укажите отчество',
+      'passport_series' => 'Укажите серию паспорта',
+      'passport_number' => 'Укажите номер паспорта',
+      'passport_issue_date' => 'Укажите дату выдачи паспорта',
+      'passport_issuer' => 'Укажите, кем выдан паспорт',
+      'passport_issuer_code' => 'Укажите код подразделения',
+      'birth_date' => 'Укажите дату рождения',
+      'birth_place' => 'Укажите место рождения',
+      'registration_address' => 'Укажите адрес регистрации',
+      'residence_address' => 'Укажите адрес проживания',
+      'citizenship' => 'Укажите гражданство',
+      'sbp_phone' => 'Укажите телефон СБП',
+      'sbp_bank_member_id' => 'Выберите банк СБП',
+      'completed_courses' => 'Добавьте хотя бы один курс',
+      'title' => 'Укажите название курса',
+      'date' => 'Укажите дату курса',
+      'agreement_accepted' => 'Примите условия оферты',
+      'frdo_agreement_accepted' => 'Подтвердите согласие ФРДО',
+      _ => 'Заполните поле',
+    };
+  }
+
+  if (isUrl) {
+    return 'Некорректная ссылка';
+  }
+
+  if (isFormat || raw.isNotEmpty) {
+    return switch (field) {
+      'inn' => 'Некорректный ИНН',
+      'snils' => 'Некорректный СНИЛС',
+      'passport_series' => 'Некорректная серия паспорта',
+      'passport_number' => 'Некорректный номер паспорта',
+      'passport_issue_date' => 'Некорректная дата выдачи',
+      'passport_issuer_code' => 'Некорректный код подразделения',
+      'last_name' => 'Некорректная фамилия',
+      'first_name' => 'Некорректное имя',
+      'middle_name' => 'Некорректное отчество',
+      'birth_date' => 'Некорректная дата рождения',
+      'citizenship' => 'Некорректный код гражданства',
+      'sbp_phone' => 'Некорректный телефон СБП',
+      'title' => 'Слишком короткое название курса',
+      'date' => 'Некорректная дата курса',
+      _ => 'Некорректное значение',
+    };
+  }
+
+  return 'Проверьте поле';
+}
diff --git a/lib/features/consultant/become_consultant/utils/passport_data_validator.dart b/lib/features/consultant/become_consultant/utils/passport_data_validator.dart
new file mode 100644
index 00000000..6b71299f
--- /dev/null
+++ b/lib/features/consultant/become_consultant/utils/passport_data_validator.dart
@@ -0,0 +1,215 @@
+import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_profile_model.dart';
+
+/// Client-side validation for individual-person passport fields.
+///
+/// Messages match [mapConsultantValidationMessage] so 422 and local errors
+/// look the same in the UI. Dates also reject non-calendar values and
+/// dates after today.
+abstract final class PassportDataValidator {
+  static const futureDateMessage = 'Дата не может быть в будущем';
+
+  /// Alfa Bank `personalInformation.{last,first,middle}Name` pattern.
+  static final alfaPersonNamePattern = RegExp(r'^[a-zA-Zа-яА-ЯёЁ ,.-]{1,50}$');
+
+  static Map<String, String> validate(
+    ConsultantProfileModel consultant, {
+    DateTime? now,
+  }) {
+    final today = now ?? DateTime.now();
+    final errors = <String, String>{};
+
+    _requirePattern(
+      errors,
+      key: 'last_name',
+      value: consultant.lastName,
+      pattern: alfaPersonNamePattern,
+      emptyMessage: 'Укажите фамилию',
+      invalidMessage: 'Некорректная фамилия',
+    );
+    _requirePattern(
+      errors,
+      key: 'first_name',
+      value: consultant.firstName,
+      pattern: alfaPersonNamePattern,
+      emptyMessage: 'Укажите имя',
+      invalidMessage: 'Некорректное имя',
+    );
+    _optionalPattern(
+      errors,
+      key: 'middle_name',
+      value: consultant.middleName,
+      pattern: alfaPersonNamePattern,
+      invalidMessage: 'Некорректное отчество',
+    );
+    _requirePattern(
+      errors,
+      key: 'inn',
+      value: consultant.inn,
+      pattern: RegExp(r'^\d{12}$'),
+      emptyMessage: 'Укажите ИНН',
+      invalidMessage: 'Некорректный ИНН',
+    );
+    _requirePattern(
+      errors,
+      key: 'snils',
+      value: consultant.snils,
+      pattern: RegExp(r'^\d{3}-\d{3}-\d{3} \d{2}$'),
+      emptyMessage: 'Укажите СНИЛС',
+      invalidMessage: 'Некорректный СНИЛС',
+    );
+    _requirePattern(
+      errors,
+      key: 'passport_series',
+      value: consultant.passportSeries,
+      pattern: RegExp(r'^\d{4}$'),
+      emptyMessage: 'Укажите серию паспорта',
+      invalidMessage: 'Некорректная серия паспорта',
+    );
+    _requirePattern(
+      errors,
+      key: 'passport_number',
+      value: consultant.passportNumber,
+      pattern: RegExp(r'^\d{6}$'),
+      emptyMessage: 'Укажите номер паспорта',
+      invalidMessage: 'Некорректный номер паспорта',
+    );
+    _requireText(
+      errors,
+      key: 'passport_issuer',
+      value: consultant.passportIssuer,
+      emptyMessage: 'Укажите, кем выдан паспорт',
+    );
+    _requirePattern(
+      errors,
+      key: 'passport_issuer_code',
+      value: consultant.passportIssuerCode,
+      pattern: RegExp(r'^\d{3}-\d{3}$'),
+      emptyMessage: 'Укажите код подразделения',
+      invalidMessage: 'Некорректный код подразделения',
+    );
+    _requireDate(
+      errors,
+      key: 'passport_issue_date',
+      value: consultant.passportIssueDate,
+      emptyMessage: 'Укажите дату выдачи паспорта',
+      invalidMessage: 'Некорректная дата выдачи',
+      today: today,
+    );
+    _requireDate(
+      errors,
+      key: 'birth_date',
+      value: consultant.birthDate,
+      emptyMessage: 'Укажите дату рождения',
+      invalidMessage: 'Некорректная дата рождения',
+      today: today,
+    );
+    _requireText(
+      errors,
+      key: 'birth_place',
+      value: consultant.birthPlace,
+      emptyMessage: 'Укажите место рождения',
+    );
+    _requireText(
+      errors,
+      key: 'registration_address',
+      value: consultant.registrationAddress,
+      emptyMessage: 'Укажите адрес регистрации',
+    );
+    _requireText(
+      errors,
+      key: 'residence_address',
+      value: consultant.residenceAddress,
+      emptyMessage: 'Укажите адрес проживания',
+    );
+    _requirePattern(
+      errors,
+      key: 'citizenship',
+      value: consultant.citizenship,
+      pattern: RegExp(r'^[A-Za-z]{2}$'),
+      emptyMessage: 'Укажите гражданство',
+      invalidMessage: 'Некорректный код гражданства',
+    );
+
+    return errors;
+  }
+
+  static void _requireText(
+    Map<String, String> errors, {
+    required String key,
+    required String? value,
+    required String emptyMessage,
+  }) {
+    if (value == null || value.trim().isEmpty) {
+      errors[key] = emptyMessage;
+    }
+  }
+
+  static void _requirePattern(
+    Map<String, String> errors, {
+    required String key,
+    required String? value,
+    required RegExp pattern,
+    required String emptyMessage,
+    required String invalidMessage,
+  }) {
+    final raw = value?.trim() ?? '';
+    if (raw.isEmpty) {
+      errors[key] = emptyMessage;
+      return;
+    }
+    if (!pattern.hasMatch(raw)) {
+      errors[key] = invalidMessage;
+    }
+  }
+
+  static void _optionalPattern(
+    Map<String, String> errors, {
+    required String key,
+    required String? value,
+    required RegExp pattern,
+    required String invalidMessage,
+  }) {
+    final raw = value?.trim() ?? '';
+    if (raw.isEmpty) {
+      return;
+    }
+    if (!pattern.hasMatch(raw)) {
+      errors[key] = invalidMessage;
+    }
+  }
+
+  static void _requireDate(
+    Map<String, String> errors, {
+    required String key,
+    required String? value,
+    required String emptyMessage,
+    required String invalidMessage,
+    required DateTime today,
+  }) {
+    final raw = value?.trim() ?? '';
+    if (raw.isEmpty) {
+      errors[key] = emptyMessage;
+      return;
+    }
+
+    final match = RegExp(r'^(\d{4})-(\d{2})-(\d{2})$').firstMatch(raw);
+    if (match == null) {
+      errors[key] = invalidMessage;
+      return;
+    }
+
+    final year = int.parse(match.group(1)!);
+    final month = int.parse(match.group(2)!);
+    final day = int.parse(match.group(3)!);
+    final parsed = DateTime(year, month, day);
+    if (parsed.year != year || parsed.month != month || parsed.day != day) {
+      errors[key] = invalidMessage;
+      return;
+    }
+
+    final todayDate = DateTime(today.year, today.month, today.day);
+    if (parsed.isAfter(todayDate)) {
+      errors[key] = futureDateMessage;
+    }
+  }
+}
diff --git a/lib/features/create_diet/presentation/widgets/add_meal_widget.dart b/lib/features/create_diet/presentation/widgets/add_meal_widget.dart
index a8eb36d5..bfe5d823 100644
--- a/lib/features/create_diet/presentation/widgets/add_meal_widget.dart
+++ b/lib/features/create_diet/presentation/widgets/add_meal_widget.dart
@@ -59,43 +59,47 @@ class _AddMealWidgetState extends State<AddMealWidget> {
           Row(
             mainAxisSize: MainAxisSize.min,
             children: [
-              SizedBox(
-                width: MediaQuery.of(context).size.width * 0.8 - 32,
-                child: CustomTextFormField(
-                  controller: productNameController,
-                  autofocus: true,
-                  hintText: 'Введите название продукта/блюда',
-                  onChanged: (query) {
-                    EasyDebounce.debounce('glossary-search', const Duration(milliseconds: 250), () async {
-                      selectedGlossary = null;
-                      if (query.isEmpty) {
-                        glossariesList = [];
+              Expanded(
+                flex: 2,
+                child: SizedBox(
+                  child: CustomTextFormField(
+                    controller: productNameController,
+                    autofocus: true,
+                    hintText: 'Введите название продукта/блюда',
+                    onChanged: (query) {
+                      EasyDebounce.debounce('glossary-search', const Duration(milliseconds: 250), () async {
                         selectedGlossary = null;
+                        if (query.isEmpty) {
+                          glossariesList = [];
+                          selectedGlossary = null;
+                          setState(() {});
+                          return;
+                        }
+                        glossariesList = await widget.createDietCubit.getGlossaryListByQuery(query);
                         setState(() {});
-                        return;
-                      }
-                      glossariesList = await widget.createDietCubit.getGlossaryListByQuery(query);
-                      setState(() {});
-                    });
-                  },
+                      });
+                    },
+                  ),
                 ),
               ),
               const SizedBox(width: 4),
-              SizedBox(
-                width: MediaQuery.of(context).size.width * 0.2 - 4,
-                child: CustomTextFormField(
-                  controller: quantityController,
-                  keyboardType: TextInputType.number,
-                  hintText: selectedGlossary == null
-                      ? '100'
-                      : selectedGlossary!.grInPortion == 0
-                      ? '100'
-                      : '1',
-                  suffixText: selectedGlossary == null
-                      ? 'гр'
-                      : selectedGlossary?.grInPortion == 0
-                      ? 'гр'
-                      : 'шт',
+              Expanded(
+                flex: 1,
+                child: SizedBox(
+                  child: CustomTextFormField(
+                    controller: quantityController,
+                    keyboardType: TextInputType.number,
+                    hintText: selectedGlossary == null
+                        ? '100'
+                        : selectedGlossary!.grInPortion == 0
+                        ? '100'
+                        : '1',
+                    suffixText: selectedGlossary == null
+                        ? 'гр'
+                        : selectedGlossary?.grInPortion == 0
+                        ? 'гр'
+                        : 'шт',
+                  ),
                 ),
               ),
             ],
@@ -149,17 +153,19 @@ class _AddMealWidgetState extends State<AddMealWidget> {
                   ),
                 ),
               if (widget.portionIndex != null) const SizedBox(width: 8),
-              InkWell(
-                onTap: addPortion,
-                borderRadius: BorderRadius.circular(20),
-                child: Ink(
-                  width: MediaQuery.of(context).size.width - (widget.portionIndex == null ? 32 : 92),
-                  height: 52,
-                  decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: appTheme.blueA400),
-                  child: Center(
-                    child: Text(
-                      widget.portionIndex == null ? 'Добавить' : 'Сохранить',
-                      style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: Colors.white),
+              Expanded(
+                child: InkWell(
+                  onTap: addPortion,
+                  borderRadius: BorderRadius.circular(20),
+                  child: Ink(
+                    width: MediaQuery.of(context).size.width - (widget.portionIndex == null ? 32 : 92),
+                    height: 52,
+                    decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: appTheme.blueA400),
+                    child: Center(
+                      child: Text(
+                        widget.portionIndex == null ? 'Добавить' : 'Сохранить',
+                        style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: Colors.white),
+                      ),
                     ),
                   ),
                 ),
diff --git a/lib/features/diary/presentation/widgets/add_product_modal.dart b/lib/features/diary/presentation/widgets/add_product_modal.dart
index a0895bf9..611652cf 100644
--- a/lib/features/diary/presentation/widgets/add_product_modal.dart
+++ b/lib/features/diary/presentation/widgets/add_product_modal.dart
@@ -70,42 +70,46 @@ class _AddProductModalState extends State<AddProductModal> {
               Row(
                 mainAxisSize: MainAxisSize.min,
                 children: [
-                  SizedBox(
-                    width: MediaQuery.of(context).size.width * 0.76 - 32,
-                    child: CustomTextFormField(
-                      controller: productNameController,
-                      autofocus: true,
-                      hintText: 'Введите название продукта/блюда',
-                      onChanged: (query) {
-                        EasyDebounce.debounce('glossary-search', const Duration(milliseconds: 250), () async {
-                          selectedGlossary = null;
-                          if (query.isEmpty) {
-                            glossariesList = [];
+                  Expanded(
+                    flex: 2,
+                    child: SizedBox(
+                      child: CustomTextFormField(
+                        controller: productNameController,
+                        autofocus: true,
+                        hintText: 'Введите название продукта/блюда',
+                        onChanged: (query) {
+                          EasyDebounce.debounce('glossary-search', const Duration(milliseconds: 250), () async {
+                            selectedGlossary = null;
+                            if (query.isEmpty) {
+                              glossariesList = [];
+                              setState(() {});
+                              return;
+                            }
+                            glossariesList = await widget.diaryCubit.getGlossaryListByQuery(query);
                             setState(() {});
-                            return;
-                          }
-                          glossariesList = await widget.diaryCubit.getGlossaryListByQuery(query);
-                          setState(() {});
-                        });
-                      },
+                          });
+                        },
+                      ),
                     ),
                   ),
                   const SizedBox(width: 4),
-                  SizedBox(
-                    width: MediaQuery.of(context).size.width * 0.24 - 4,
-                    child: CustomTextFormField(
-                      controller: quantityController,
-                      keyboardType: TextInputType.number,
-                      hintText: selectedGlossary == null
-                          ? '100'
-                          : selectedGlossary!.grInPortion == 0
-                          ? '100'
-                          : '1',
-                      suffixText: selectedGlossary == null
-                          ? 'гр'
-                          : selectedGlossary?.grInPortion == 0
-                          ? 'гр'
-                          : 'шт',
+                  Expanded(
+                    flex: 1,
+                    child: SizedBox(
+                      child: CustomTextFormField(
+                        controller: quantityController,
+                        keyboardType: TextInputType.number,
+                        hintText: selectedGlossary == null
+                            ? '100'
+                            : selectedGlossary!.grInPortion == 0
+                            ? '100'
+                            : '1',
+                        suffixText: selectedGlossary == null
+                            ? 'гр'
+                            : selectedGlossary?.grInPortion == 0
+                            ? 'гр'
+                            : 'шт',
+                      ),
                     ),
                   ),
                 ],
@@ -168,66 +172,68 @@ class _AddProductModalState extends State<AddProductModal> {
                       ),
                     ),
                   if (widget.portion != null) const SizedBox(width: 8),
-                  InkWell(
-                    onTap: () {
-                      // Автоматически выбираем первый элемент, если текст точно совпадает
-                      if (selectedGlossary == null &&
-                          glossariesList.isNotEmpty &&
-                          productNameController.text.trim().toLowerCase() == glossariesList[0].name.toLowerCase()) {
-                        selectedGlossary = glossariesList[0];
-                      }
+                  Expanded(
+                    child: InkWell(
+                      onTap: () {
+                        // Автоматически выбираем первый элемент, если текст точно совпадает
+                        if (selectedGlossary == null &&
+                            glossariesList.isNotEmpty &&
+                            productNameController.text.trim().toLowerCase() == glossariesList[0].name.toLowerCase()) {
+                          selectedGlossary = glossariesList[0];
+                        }
 
-                      if (widget.portion == null) {
-                        widget.diaryCubit.addProductToMeal(
-                          diaryId: widget.state.diary.id,
-                          mealId: widget.state.selectedMeal,
-                          productName: productNameController.text,
-                          portion: selectedGlossary == null
-                              ? 'gr'
-                              : selectedGlossary!.grInPortion == 0
-                              ? 'gr'
-                              : 'pcs',
-                          quantity: int.parse(quantityController.text),
-                          productNutritionalValueId: selectedGlossary?.id,
-                        );
-                      } else {
-                        widget.diaryCubit.updateProductInMeal(
-                          diaryId: widget.state.diary.id,
-                          mealId: widget.state.selectedMeal,
-                          portionId: widget.portion!.id,
-                          productName: productNameController.text,
-                          portion: selectedGlossary == null
-                              ? 'gr'
-                              : selectedGlossary!.grInPortion == 0
-                              ? 'gr'
-                              : 'pcs',
-                          quantity: int.parse(quantityController.text),
-                          productNutritionalValueId: selectedGlossary?.id,
-                          portionState: widget.portion!.portionState,
-                        );
-                      }
-                      Navigator.of(context).pop();
-                      if (selectedGlossary == null && _previousProductName != productNameController.text) {
-                        showModalBottomSheet(
-                          isScrollControlled: true,
-                          useRootNavigator: true,
-                          context: context,
-                          builder: (context) => Padding(
-                            padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
-                            child: GlossaryModerationRequestModalWidget(productName: productNameController.text, diaryCubit: widget.diaryCubit),
+                        if (widget.portion == null) {
+                          widget.diaryCubit.addProductToMeal(
+                            diaryId: widget.state.diary.id,
+                            mealId: widget.state.selectedMeal,
+                            productName: productNameController.text,
+                            portion: selectedGlossary == null
+                                ? 'gr'
+                                : selectedGlossary!.grInPortion == 0
+                                ? 'gr'
+                                : 'pcs',
+                            quantity: int.parse(quantityController.text),
+                            productNutritionalValueId: selectedGlossary?.id,
+                          );
+                        } else {
+                          widget.diaryCubit.updateProductInMeal(
+                            diaryId: widget.state.diary.id,
+                            mealId: widget.state.selectedMeal,
+                            portionId: widget.portion!.id,
+                            productName: productNameController.text,
+                            portion: selectedGlossary == null
+                                ? 'gr'
+                                : selectedGlossary!.grInPortion == 0
+                                ? 'gr'
+                                : 'pcs',
+                            quantity: int.parse(quantityController.text),
+                            productNutritionalValueId: selectedGlossary?.id,
+                            portionState: widget.portion!.portionState,
+                          );
+                        }
+                        Navigator.of(context).pop();
+                        if (selectedGlossary == null && _previousProductName != productNameController.text) {
+                          showModalBottomSheet(
+                            isScrollControlled: true,
+                            useRootNavigator: true,
+                            context: context,
+                            builder: (context) => Padding(
+                              padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
+                              child: GlossaryModerationRequestModalWidget(productName: productNameController.text, diaryCubit: widget.diaryCubit),
+                            ),
+                          );
+                        }
+                      },
+                      borderRadius: BorderRadius.circular(20),
+                      child: Ink(
+                        width: MediaQuery.of(context).size.width - (widget.portion == null ? 32 : 92),
+                        height: 52,
+                        decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: appTheme.blueA400),
+                        child: Center(
+                          child: Text(
+                            widget.portion == null ? 'Добавить' : 'Сохранить',
+                            style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: Colors.white),
                           ),
-                        );
-                      }
-                    },
-                    borderRadius: BorderRadius.circular(20),
-                    child: Ink(
-                      width: MediaQuery.of(context).size.width - (widget.portion == null ? 32 : 92),
-                      height: 52,
-                      decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: appTheme.blueA400),
-                      child: Center(
-                        child: Text(
-                          widget.portion == null ? 'Добавить' : 'Сохранить',
-                          style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: Colors.white),
                         ),
                       ),
                     ),
diff --git a/lib/features/feed/models/feed_blog_post_model.dart b/lib/features/feed/models/feed_blog_post_model.dart
index 89eb5838..9ce22b7f 100644
--- a/lib/features/feed/models/feed_blog_post_model.dart
+++ b/lib/features/feed/models/feed_blog_post_model.dart
@@ -1,4 +1,5 @@
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_pagination_model.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'feed_blog_post_model.freezed.dart';
@@ -20,6 +21,9 @@ abstract class FeedBlogPostModel with _$FeedBlogPostModel {
     @JsonKey(name: "total_views") required int totalViews,
     @JsonKey(name: "total_comments") required int totalComments,
     @JsonKey(name: "was_liked_by_me") required bool wasLikedByMe,
+    @Default([]) List<FeedGalleryImage> images,
+    @JsonKey(name: "video_url_embed") String? videoEmbedUrl,
+    @JsonKey(name: "video_url_thumb") String? videoUrlThumb,
   }) = _FeedBlogPostModel;
 
   factory FeedBlogPostModel.fromJson(Map<String, Object?> json) => _$FeedBlogPostModelFromJson(json);
diff --git a/lib/features/feed/models/post_feed_mapper.dart b/lib/features/feed/models/post_feed_mapper.dart
new file mode 100644
index 00000000..f88e01ed
--- /dev/null
+++ b/lib/features/feed/models/post_feed_mapper.dart
@@ -0,0 +1,41 @@
+import 'package:eatvio_app/core/app_config.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
+import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_pagination_model.dart';
+
+class PostFeedMapper {
+  static FeedBlogPostModel fromPostFeedItem(PostFeedItemModel item, {int? currentUserId}) {
+    return FeedBlogPostModel(
+      id: item.postId,
+      state: item.postState,
+      image: resolveMediaUrl(item.postImageUrl),
+      description: item.postTextMd ?? item.postShortDescription ?? '',
+      author: Author(
+        authorSlug: item.postAuthorDetails?.slug ?? '',
+        authorName: item.postAuthorName,
+        authorProfileIcon: resolveMediaUrl(item.postAuthorImageUrl),
+        authorIsMe: currentUserId != null && item.postAuthorId == currentUserId,
+        isEntitySubscribedByMe: item.isEntitySubscribedByMe,
+      ),
+      videoUrl: '',
+      createdAt: item.postCreatedAt,
+      updatedAt: item.updatedAt,
+      title: item.postTitle,
+      totalLikes: item.postLikesCount,
+      totalViews: item.postViewsCount,
+      totalComments: item.postCommentsCount,
+      wasLikedByMe: item.postIsLikedByUser,
+      images: item.images,
+      videoEmbedUrl: item.videoEmbedUrl,
+      videoUrlThumb: item.videoUrlThumb,
+    );
+  }
+
+  static String resolveMediaUrl(String? url) {
+    if (url == null || url.isEmpty) return '';
+    if (url.startsWith('http://') || url.startsWith('https://')) return url;
+    if (url.startsWith('/')) return '${sl<AppConfig>().baseUrl}$url';
+    return '${sl<AppConfig>().baseUrl}/storage/$url';
+  }
+}
diff --git a/lib/features/feed/models/post_feed_pagination_model.dart b/lib/features/feed/models/post_feed_pagination_model.dart
new file mode 100644
index 00000000..31ade2a8
--- /dev/null
+++ b/lib/features/feed/models/post_feed_pagination_model.dart
@@ -0,0 +1,95 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'post_feed_pagination_model.freezed.dart';
+part 'post_feed_pagination_model.g.dart';
+
+@freezed
+abstract class PostFeedPaginationModel with _$PostFeedPaginationModel {
+  const factory PostFeedPaginationModel({
+    @JsonKey(name: 'data') required List<PostFeedItemModel> data,
+    required CursorLinks links,
+    required CursorMeta meta,
+  }) = _PostFeedPaginationModel;
+
+  factory PostFeedPaginationModel.fromJson(Map<String, Object?> json) => _$PostFeedPaginationModelFromJson(json);
+}
+
+@freezed
+abstract class PostFeedItemModel with _$PostFeedItemModel {
+  const factory PostFeedItemModel({
+    required int id,
+    @JsonKey(name: 'post_id') required int postId,
+    @JsonKey(name: 'post_author_id') required int postAuthorId,
+    @JsonKey(name: 'post_author_name') required String postAuthorName,
+    @JsonKey(name: 'post_author_image_url') String? postAuthorImageUrl,
+    @JsonKey(name: 'post_author_profile_url') String? postAuthorProfileUrl,
+    @JsonKey(name: 'post_created_at', fromJson: parseDateTime) required DateTime postCreatedAt,
+    @JsonKey(name: 'post_title') required String postTitle,
+    @JsonKey(name: 'post_short_description') String? postShortDescription,
+    @JsonKey(name: 'post_text_md') String? postTextMd,
+    @JsonKey(name: 'post_image_url') String? postImageUrl,
+    @Default([]) List<FeedGalleryImage> images,
+    @JsonKey(name: 'video_embed_url') String? videoEmbedUrl,
+    @JsonKey(name: 'post_views_count') required int postViewsCount,
+    @JsonKey(name: 'post_likes_count') required int postLikesCount,
+    @JsonKey(name: 'post_comments_count') required int postCommentsCount,
+    @JsonKey(name: 'post_is_liked_by_user') required bool postIsLikedByUser,
+    @JsonKey(name: 'is_entity_subscribed_by_me') bool? isEntitySubscribedByMe,
+    @JsonKey(name: 'post_url') String? postUrl,
+    @JsonKey(name: 'post_state') required String postState,
+    @JsonKey(name: 'post_author_detailz') PostAuthorDetails? postAuthorDetails,
+    @JsonKey(name: "video_url_thumb") String? videoUrlThumb,
+    @JsonKey(name: 'created_at', fromJson: parseDateTime) required DateTime createdAt,
+    @JsonKey(name: 'updated_at', fromJson: parseDateTime) required DateTime updatedAt,
+  }) = _PostFeedItemModel;
+
+  factory PostFeedItemModel.fromJson(Map<String, Object?> json) => _$PostFeedItemModelFromJson(json);
+}
+
+@freezed
+abstract class FeedGalleryImage with _$FeedGalleryImage {
+  const factory FeedGalleryImage({
+    required String url,
+    @Default('horizontal') String orientation,
+    int? id,
+    int? position,
+  }) = _FeedGalleryImage;
+
+  factory FeedGalleryImage.fromJson(Map<String, Object?> json) => _$FeedGalleryImageFromJson(json);
+}
+
+@freezed
+abstract class PostAuthorDetails with _$PostAuthorDetails {
+  const factory PostAuthorDetails({
+    required String slug,
+    @JsonKey(name: 'is_consultant') required bool isConsultant,
+  }) = _PostAuthorDetails;
+
+  factory PostAuthorDetails.fromJson(Map<String, Object?> json) => _$PostAuthorDetailsFromJson(json);
+}
+
+@freezed
+abstract class CursorLinks with _$CursorLinks {
+  const factory CursorLinks({
+    required String? first,
+    required String? last,
+    required String? prev,
+    required String? next,
+  }) = _CursorLinks;
+
+  factory CursorLinks.fromJson(Map<String, Object?> json) => _$CursorLinksFromJson(json);
+}
+
+@freezed
+abstract class CursorMeta with _$CursorMeta {
+  const factory CursorMeta({
+    required String path,
+    @JsonKey(name: 'per_page') required int perPage,
+    @JsonKey(name: 'next_cursor') String? nextCursor,
+    @JsonKey(name: 'prev_cursor') String? prevCursor,
+  }) = _CursorMeta;
+
+  factory CursorMeta.fromJson(Map<String, Object?> json) => _$CursorMetaFromJson(json);
+}
+
+DateTime parseDateTime(String date) => DateTime.parse(date).toLocal();
diff --git a/lib/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart b/lib/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart
index 9254bf07..a88d4623 100644
--- a/lib/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart
+++ b/lib/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart
@@ -8,8 +8,8 @@ import 'package:eatvio_app/core/error_reporting/report_from.dart';
 
 class FeedCubit extends Cubit<FeedState> {
   final FeedRepository feedRepository;
-  int currentPage = 1;
-  late int lastPage;
+  String? _nextCursor;
+  bool _hasMore = true;
   bool isLoading = false;
   String? _query;
 
@@ -38,13 +38,16 @@ class FeedCubit extends Cubit<FeedState> {
     }
   }
 
-  Future<void> loadFeedBlogPostList({String? query}) async {
+  Future<void> loadFeedBlogPostList({String? query, int? currentUserId}) async {
     try {
       _query = query;
-      final feedBlogPosts = await feedRepository.getFeedBlogPosts(query: query);
-      lastPage = feedBlogPosts.meta.lastPage;
+      _nextCursor = null;
+      _hasMore = true;
+      final feed = await feedRepository.getFeed(search: query, currentUserId: currentUserId);
+      _nextCursor = feed.nextCursor;
+      _hasMore = _nextCursor != null;
       if (!isClosed) {
-        emit(FeedState.loaded(feedBlogPostList: feedBlogPosts.feedBlogPostList, isLoading: false));
+        emit(FeedState.loaded(feedBlogPostList: feed.posts, isLoading: false));
       }
     } catch (e, st) {
       await reportFrom(e, st, this);
@@ -54,29 +57,35 @@ class FeedCubit extends Cubit<FeedState> {
     }
   }
 
-  Future<void> loadNextPage() async {
-    if (currentPage < lastPage && !isLoading && !isClosed) {
-      isLoading = true;
+  Future<void> loadNextPage({int? currentUserId}) async {
+    if (!_hasMore || isLoading || isClosed || _nextCursor == null || state is! FeedStateLoaded) {
+      return;
+    }
 
-      if (!isClosed) {
-        emit((state as FeedStateLoaded).copyWith(isLoading: isLoading));
-      }
+    isLoading = true;
+    emit((state as FeedStateLoaded).copyWith(isLoading: true));
 
-      try {
-        if (currentPage < lastPage && !isClosed) {
-          currentPage++;
-          final feedBlogPosts = await feedRepository.getFeedBlogPosts(page: currentPage, query: _query);
-          isLoading = false;
-          if (!isClosed) {
-            emit(FeedState.loaded(feedBlogPostList: [...(state as FeedStateLoaded).feedBlogPostList, ...feedBlogPosts.feedBlogPostList], isLoading: isLoading));
-          }
-        }
-      } catch (e, st) {
-        await reportFrom(e, st, this);
-        if (!isClosed) {
-          emit(FeedState.error(errorMessage: e.toString()));
-        }
+    try {
+      final feed = await feedRepository.getFeed(search: _query, cursor: _nextCursor, currentUserId: currentUserId);
+      _nextCursor = feed.nextCursor;
+      _hasMore = _nextCursor != null;
+      if (!isClosed && state is FeedStateLoaded) {
+        emit(
+          FeedState.loaded(
+            feedBlogPostList: [...(state as FeedStateLoaded).feedBlogPostList, ...feed.posts],
+            isLoading: false,
+          ),
+        );
       }
+    } catch (e, st) {
+      await reportFrom(e, st, this);
+      if (!isClosed && state is FeedStateLoaded) {
+        emit((state as FeedStateLoaded).copyWith(isLoading: false));
+      } else if (!isClosed) {
+        emit(FeedState.error(errorMessage: e.toString()));
+      }
+    } finally {
+      isLoading = false;
     }
   }
 
diff --git a/lib/features/feed/presentation/pages/feed_screen.dart b/lib/features/feed/presentation/pages/feed_screen.dart
index 5eb4f454..58664992 100644
--- a/lib/features/feed/presentation/pages/feed_screen.dart
+++ b/lib/features/feed/presentation/pages/feed_screen.dart
@@ -83,7 +83,7 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
       final state = feedCubit.state;
       // Загружаем данные, если они еще не загружены
       if (state is! FeedStateLoaded) {
-        feedCubit.loadFeedBlogPostList();
+        feedCubit.loadFeedBlogPostList(currentUserId: context.read<FeedProfileCubit>().state.profile?.id);
       }
     });
     super.initState();
@@ -201,7 +201,10 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
                             EasyDebounce.debounce('searchFeed', const Duration(milliseconds: 500), () {
                               switch (_selectedChipIndex) {
                                 case 0:
-                                  context.read<FeedCubit>().loadFeedBlogPostList(query: query);
+                                  context.read<FeedCubit>().loadFeedBlogPostList(
+                                    query: query,
+                                    currentUserId: context.read<FeedProfileCubit>().state.profile?.id,
+                                  );
                                   break;
                                 case 1 when !hidePlans:
                                   context.read<PlansCubit>().loadPlans(query: query);
@@ -224,7 +227,9 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
                             EasyDebounce.debounce('searchFeed', const Duration(milliseconds: 500), () {
                               switch (_selectedChipIndex) {
                                 case 0:
-                                  context.read<FeedCubit>().loadFeedBlogPostList();
+                                  context.read<FeedCubit>().loadFeedBlogPostList(
+                                    currentUserId: context.read<FeedProfileCubit>().state.profile?.id,
+                                  );
                                   break;
                                 case 1 when !hidePlans:
                                   context.read<PlansCubit>().loadPlans();
diff --git a/lib/features/feed/presentation/widgets/blog_post_media_content.dart b/lib/features/feed/presentation/widgets/blog_post_media_content.dart
new file mode 100644
index 00000000..e0e87f31
--- /dev/null
+++ b/lib/features/feed/presentation/widgets/blog_post_media_content.dart
@@ -0,0 +1,287 @@
+import 'dart:async';
+
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:carousel_slider_plus/carousel_slider_plus.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_mapper.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_pagination_model.dart';
+import 'package:eatvio_app/features/feed/presentation/widgets/feed_video_player/feed_video_player_widget.dart';
+import 'package:flutter/material.dart';
+
+/// Gallery + optional embed video for feed card and blog post detail.
+class BlogPostMediaContent extends StatefulWidget {
+  const BlogPostMediaContent({
+    super.key,
+    required this.galleryImages,
+    required this.imageUrl,
+    required this.videoEmbedUrl,
+    required this.currentGalleryIndex,
+    required this.onOpenGallery,
+    required this.onGalleryChanged,
+    required this.videoUrlThumb,
+    this.heroTag,
+  });
+
+  final List<FeedGalleryImage> galleryImages;
+  final String imageUrl;
+  final String? videoEmbedUrl;
+  final String? videoUrlThumb;
+  final int currentGalleryIndex;
+  final void Function(List<String> urls, int index) onOpenGallery;
+  final ValueChanged<int> onGalleryChanged;
+
+  /// Unique per post. Required when several cards with the same [imageUrl] share a route.
+  final Object? heroTag;
+
+  @override
+  State<BlogPostMediaContent> createState() => _BlogPostMediaContentState();
+}
+
+class _BlogPostMediaContentState extends State<BlogPostMediaContent> {
+  static const _counterDisplayDuration = Duration(seconds: 1);
+
+  /// Landscape / video slide aspect (width / height).
+  static const _horizontalAspectRatio = 16 / 9;
+
+  /// Portrait slide aspect (width / height).
+  static const _verticalAspectRatio = 3 / 4;
+
+  bool _isCounterVisible = false;
+  Timer? _counterHideTimer;
+
+  bool get _hasVideo =>
+      widget.videoEmbedUrl != null && widget.videoEmbedUrl!.trim().isNotEmpty;
+
+  List<FeedGalleryImage> get _gallery {
+    return [
+      for (final image in widget.galleryImages)
+        if (PostFeedMapper.resolveMediaUrl(image.url) case final url
+            when url.isNotEmpty)
+          FeedGalleryImage(
+            url: url,
+            orientation: image.orientation,
+            id: image.id,
+            position: image.position,
+          ),
+    ];
+  }
+
+  List<String> get _galleryUrls => _gallery.map((e) => e.url).toList();
+
+  int get _slideCount {
+    if (_gallery.isNotEmpty) {
+      return _gallery.length + (_hasVideo ? 1 : 0);
+    }
+    if (_hasVideo) {
+      return 1;
+    }
+    return 0;
+  }
+
+  bool get _isCurrentSlideVideo =>
+      _hasVideo && widget.currentGalleryIndex == _gallery.length;
+
+  bool get _shouldShowCounter => !_isCurrentSlideVideo || _isCounterVisible;
+
+  /// Height is fixed for the whole post from the first gallery image (web-like).
+  String get _postOrientation {
+    if (_gallery.isNotEmpty) {
+      return _gallery.first.orientation;
+    }
+    return 'horizontal';
+  }
+
+  double _heightForOrientation(String orientation, double width) {
+    final aspectRatio = orientation == 'vertical'
+        ? _verticalAspectRatio
+        : _horizontalAspectRatio;
+    final maxHeight = MediaQuery.sizeOf(context).height * 0.7;
+    return (width / aspectRatio).clamp(180.0, maxHeight);
+  }
+
+  @override
+  void dispose() {
+    _counterHideTimer?.cancel();
+    super.dispose();
+  }
+
+  @override
+  void didUpdateWidget(covariant BlogPostMediaContent oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.currentGalleryIndex != widget.currentGalleryIndex) {
+      _scheduleCounterHideOnVideo();
+    }
+  }
+
+  void _scheduleCounterHideOnVideo() {
+    _counterHideTimer?.cancel();
+    if (!_isCurrentSlideVideo) return;
+
+    _counterHideTimer = Timer(_counterDisplayDuration, () {
+      if (mounted && _isCurrentSlideVideo) {
+        setState(() => _isCounterVisible = false);
+      }
+    });
+  }
+
+  bool _handleCarouselScroll(ScrollNotification notification) {
+    if (notification is ScrollStartNotification ||
+        notification is ScrollUpdateNotification) {
+      _counterHideTimer?.cancel();
+      if (!_isCounterVisible) {
+        setState(() => _isCounterVisible = true);
+      }
+    } else if (notification is ScrollEndNotification &&
+        _isCounterVisible &&
+        _isCurrentSlideVideo) {
+      _scheduleCounterHideOnVideo();
+    }
+    return false;
+  }
+
+  Widget _imageSlide(String itemUrl, int itemIndex, double height) {
+    return GestureDetector(
+      onTap: () => widget.onOpenGallery(_galleryUrls, itemIndex),
+      child: CachedNetworkImage(
+        fit: BoxFit.cover,
+        width: MediaQuery.sizeOf(context).width,
+        height: height,
+        imageUrl: itemUrl,
+        errorWidget: (context, str, object) => const SizedBox.shrink(),
+      ),
+    );
+  }
+
+  Widget _videoSlide() {
+    return FeedVideoPlayer(
+      embedUrl: widget.videoEmbedUrl!,
+      videoUrlThumb: widget.videoUrlThumb,
+    );
+  }
+
+  Widget _carousel({
+    required int itemCount,
+    required NullableIndexedWidgetBuilder itemBuilder,
+    required double height,
+  }) {
+    return Stack(
+      children: [
+        NotificationListener<ScrollNotification>(
+          onNotification: _handleCarouselScroll,
+          child: CarouselSlider.builder(
+            itemCount: itemCount,
+            itemBuilder: (context, itemIndex, _) =>
+                itemBuilder(context, itemIndex) ?? const SizedBox.shrink(),
+            options: CarouselOptions(
+              viewportFraction: 1,
+              height: height,
+              enableInfiniteScroll: false,
+              onPageChanged: (index, _) => widget.onGalleryChanged(index),
+            ),
+          ),
+        ),
+        if (itemCount > 1)
+          Positioned(
+            top: 12,
+            right: 12,
+            child: IgnorePointer(
+              child: AnimatedOpacity(
+                opacity: _shouldShowCounter ? 1 : 0,
+                duration: const Duration(milliseconds: 150),
+                child: _GalleryPhotoCounter(
+                  currentIndex: widget.currentGalleryIndex,
+                  total: itemCount,
+                ),
+              ),
+            ),
+          ),
+      ],
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final gallery = _gallery;
+    final width = MediaQuery.sizeOf(context).width;
+    final mediaHeight = _heightForOrientation(_postOrientation, width);
+
+    if (gallery.length > 1 || (gallery.length == 1 && _hasVideo)) {
+      final itemCount = _slideCount;
+      return _carousel(
+        itemCount: itemCount,
+        height: mediaHeight,
+        itemBuilder: (context, itemIndex) {
+          if (itemIndex < gallery.length) {
+            return _imageSlide(gallery[itemIndex].url, itemIndex, mediaHeight);
+          }
+          if (_hasVideo) {
+            return _videoSlide();
+          }
+          return const SizedBox.shrink();
+        },
+      );
+    }
+
+    if (gallery.length == 1) {
+      return _imageSlide(gallery.first.url, 0, mediaHeight);
+    }
+
+    if (_hasVideo) {
+      return SizedBox(height: mediaHeight, width: width, child: _videoSlide());
+    }
+
+    if (widget.imageUrl.isNotEmpty) {
+      final image = CachedNetworkImage(
+        fit: BoxFit.fitWidth,
+        width: width,
+        imageUrl: widget.imageUrl,
+        errorWidget: (context, str, object) => const SizedBox.shrink(),
+      );
+      return GestureDetector(
+        onTap: () => widget.onOpenGallery([widget.imageUrl], 0),
+        child: widget.heroTag == null
+            ? image
+            : Hero(tag: widget.heroTag!, child: image),
+      );
+    }
+
+    return const SizedBox.shrink();
+  }
+}
+
+class _GalleryPhotoCounter extends StatelessWidget {
+  const _GalleryPhotoCounter({required this.currentIndex, required this.total});
+
+  final int currentIndex;
+  final int total;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+      decoration: BoxDecoration(
+        color: Colors.black.withValues(alpha: 0.5),
+        borderRadius: BorderRadius.circular(999),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          const Icon(
+            Icons.photo_library_outlined,
+            size: 14,
+            color: Colors.white,
+          ),
+          const SizedBox(width: 8),
+          Text(
+            '${currentIndex + 1} / $total',
+            style: const TextStyle(
+              color: Colors.white,
+              fontSize: 14,
+              fontWeight: FontWeight.w500,
+              height: 1.2,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/features/feed/presentation/widgets/blog_post_widget.dart b/lib/features/feed/presentation/widgets/blog_post_widget.dart
index 4192aaff..ac467501 100644
--- a/lib/features/feed/presentation/widgets/blog_post_widget.dart
+++ b/lib/features/feed/presentation/widgets/blog_post_widget.dart
@@ -1,4 +1,3 @@
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:dismissible_page/dismissible_page.dart';
 import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/enums/complained_content.dart';
@@ -9,8 +8,10 @@ import 'package:eatvio_app/core/widgets/custom_popup.dart';
 import 'package:eatvio_app/core/widgets/feed_icon_button.dart';
 import 'package:eatvio_app/core/widgets/markdown_html_widget.dart';
 import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
+import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_mapper.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state.dart';
+import 'package:eatvio_app/features/feed/presentation/widgets/blog_post_media_content.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/subscribe_button_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -19,9 +20,9 @@ import 'package:go_router/go_router.dart';
 import 'package:share_plus/share_plus.dart';
 
 class BlogPostWidget extends StatefulWidget {
-  final int index;
+  final FeedBlogPostModel post;
 
-  const BlogPostWidget({super.key, required this.index});
+  const BlogPostWidget({super.key, required this.post});
 
   @override
   State<BlogPostWidget> createState() => _BlogPostWidgetState();
@@ -30,243 +31,343 @@ class BlogPostWidget extends StatefulWidget {
 class _BlogPostWidgetState extends State<BlogPostWidget> {
   late bool isLiked;
   late int totalLikes;
-  bool isMoreOptionsVisible = false;
+  int currentGalleryIndex = 0;
+
+  FeedBlogPostModel get post => widget.post;
+
+  @override
+  void initState() {
+    super.initState();
+    isLiked = post.wasLikedByMe;
+    totalLikes = post.totalLikes;
+  }
+
+  @override
+  void didUpdateWidget(covariant BlogPostWidget oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.post.id != post.id) {
+      currentGalleryIndex = 0;
+      isLiked = post.wasLikedByMe;
+      totalLikes = post.totalLikes;
+      return;
+    }
+    if (oldWidget.post.wasLikedByMe != post.wasLikedByMe ||
+        oldWidget.post.totalLikes != post.totalLikes) {
+      isLiked = post.wasLikedByMe;
+      totalLikes = post.totalLikes;
+    }
+  }
+
+  void _openGallery(List<String> imageUrls, int index, {Object? heroTag}) {
+    context.pushTransparentRoute(
+      rootNavigator: true,
+      PhotoViewScreen(imageUrls: imageUrls, index: index, heroTag: heroTag),
+    );
+  }
+
+  Future<void> _toggleLike() async {
+    final nextLiked = !isLiked;
+    setState(() {
+      isLiked = nextLiked;
+      nextLiked ? totalLikes++ : totalLikes--;
+    });
+    context.read<FeedCubit>().updateFeedBlogPostList(post, nextLiked);
+    if (nextLiked) {
+      await context.read<FeedCubit>().likePost(post.id);
+    } else {
+      await context.read<FeedCubit>().unlikedPost(post.id);
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<FeedCubit, FeedState>(
-      builder: (BuildContext context, FeedState state) {
-        if (state is FeedStateLoaded) {
-          isLiked = state.feedBlogPostList[widget.index].wasLikedByMe;
-          totalLikes = state.feedBlogPostList[widget.index].totalLikes;
-          return InkWell(
-            borderRadius: BorderRadius.circular(12),
-            onTap: () => GoRouter.of(context).pushNamed('blogPostScreen', extra: state.feedBlogPostList[widget.index].id),
-            child: Material(
-              borderRadius: BorderRadius.circular(12),
-              color: Colors.white,
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  const SizedBox(height: 12),
-                  Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 12),
-                    child: Row(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        GestureDetector(
-                          onTap: () {
-                            GoRouter.of(context).pushNamed('profileScreen', extra: state.feedBlogPostList[widget.index].author.authorSlug);
-                          },
-                          child: CircleAvatar(
-                            radius: 20,
-                            backgroundColor: Colors.black12,
-                            foregroundImage: NetworkImage(
-                              state.feedBlogPostList[widget.index].author.authorProfileIcon.contains('https')
-                                  ? state.feedBlogPostList[widget.index].author.authorProfileIcon
-                                  : sl<AppConfig>().baseUrl + state.feedBlogPostList[widget.index].author.authorProfileIcon,
-                            ),
-                            backgroundImage: const AssetImage('assets/images/no_avatar.png'),
-                          ),
-                        ),
-                        const SizedBox(width: 8),
-                        // Имя и дата внутри Expanded
-                        Expanded(
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Text(
-                                state.feedBlogPostList[widget.index].author.authorName,
-                                overflow: TextOverflow.ellipsis,
-                                style: const TextStyle(height: 1, color: Colors.black87, fontWeight: FontWeight.w500, fontSize: 16),
-                              ),
-                              const SizedBox(height: 4),
-                              Text(
-                                '${calculateDifference(state.feedBlogPostList[widget.index].createdAt)} в ${state.feedBlogPostList[widget.index].createdAt.hour.toString().padLeft(2, '0')}:${state.feedBlogPostList[widget.index].createdAt.minute.toString().padLeft(2, '0')}',
-                                style: const TextStyle(height: 1, color: Colors.black45, fontSize: 14),
-                              ),
-                            ],
-                          ),
-                        ),
-                        // Кнопка подписки (если нужно)
-                        if (!(state.feedBlogPostList[widget.index].author.isEntitySubscribedByMe ?? false) &&
-                            !state.feedBlogPostList[widget.index].author.authorIsMe)
-                          Padding(
-                            padding: const EdgeInsets.only(right: 8),
-                            child: SubscribeButtonWidget(slug: state.feedBlogPostList[widget.index].author.authorSlug),
-                          ),
-                        // Кнопка меню
-                        CustomPopup(
-                          isAuthor: state.feedBlogPostList[widget.index].author.authorIsMe,
-                          complainedContentType: ComplainedContent.posts,
-                          path: 'blog_post/${(state.feedBlogPostList[widget.index].id)}',
-                          id: state.feedBlogPostList[widget.index].id,
-                          feedBlogPostModel: state.feedBlogPostList[widget.index],
-                          userSlug: state.feedBlogPostList[widget.index].author.authorSlug,
-                        ),
-                      ],
-                    ),
-                  ),
-                  if (state.feedBlogPostList[widget.index].title.isNotEmpty) ...[
-                    const SizedBox(height: 12),
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 12),
-                      child: Text(
-                        state.feedBlogPostList[widget.index].title,
-                        style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: Colors.black87),
-                      ),
-                    ),
-                  ],
-                  if (state.feedBlogPostList[widget.index].title.isEmpty) const SizedBox(height: 8),
-                  if (state.feedBlogPostList[widget.index].title.isNotEmpty && state.feedBlogPostList[widget.index].description.isNotEmpty)
-                    const SizedBox(height: 8),
-                  if (state.feedBlogPostList[widget.index].description.isNotEmpty)
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 12),
-                      child: Builder(
-                        builder: (context) {
-                          String description = state.feedBlogPostList[widget.index].description;
-                          final isLong = description.length > 200;
-                          
-                          if (isLong) {
-                            // Умная обрезка: обрезаем markdown текст, не ломая синтаксис
-                            int cutPoint = 200;
-                            
-                            // Проверяем, есть ли незакрытые markdown теги
-                            String preview = description.substring(0, cutPoint);
-                            
-                            // Считаем открывающие и закрывающие теги
-                            int boldOpen = (preview.split('**').length - 1) ~/ 2;
-                            int boldClose = preview.split('**').length - 1 - boldOpen * 2;
-                            bool hasUnclosedBold = boldOpen > boldClose;
-                            
-                            // Если есть незакрытый bold, ищем закрытие
-                            if (hasUnclosedBold) {
-                              int searchEnd = (cutPoint + 100).clamp(0, description.length);
-                              int boldClosePos = description.indexOf('**', cutPoint);
-                              if (boldClosePos != -1 && boldClosePos < searchEnd) {
-                                cutPoint = boldClosePos + 2;
-                              } else {
-                                // Если не нашли, обрезаем до последнего пробела
-                                cutPoint = description.lastIndexOf(' ', 200);
-                                if (cutPoint == -1 || cutPoint < 150) cutPoint = 200;
-                              }
-                            } else {
-                              // Обрезаем до последнего пробела для красоты
-                              cutPoint = description.lastIndexOf(' ', cutPoint);
-                              if (cutPoint == -1 || cutPoint < 150) cutPoint = 200;
-                            }
-                            
-                            description = description.substring(0, cutPoint);
-                          }
+    final imageUrl = PostFeedMapper.resolveMediaUrl(post.image);
+    final embedUrl = post.videoEmbedUrl?.trim();
 
-                          return MarkdownHtmlWidget(
-                            markdownText: description,
-                          );
-                        },
-                      ),
-                    ),
-                  if (state.feedBlogPostList[widget.index].description.length > 200)
-                    const Padding(
-                      padding: EdgeInsets.symmetric(horizontal: 12),
-                      child: Text(
-                        'Показать ещё',
-                        style: TextStyle(height: 1, color: Color(0xFF8B8B8B), fontSize: 14, fontWeight: FontWeight.w600),
-                      ),
-                    ),
-                  if (state.feedBlogPostList[widget.index].title.isNotEmpty || state.feedBlogPostList[widget.index].description.isNotEmpty)
-                    const SizedBox(height: 8),
-                  GestureDetector(
-                    onTap: () {
-                      context.pushTransparentRoute(
-                        rootNavigator: true,
-                        PhotoViewScreen(imageUrls: ['${sl<AppConfig>().baseUrl}/storage/${state.feedBlogPostList[widget.index].image}'], index: 0),
-                      );
-                    },
-                    child: Hero(
-                      tag: '${sl<AppConfig>().baseUrl}/storage/${state.feedBlogPostList[widget.index].image}',
-                      child: CachedNetworkImage(
-                        fit: BoxFit.fitWidth,
-                        width: MediaQuery.of(context).size.width,
-                        imageUrl: '${sl<AppConfig>().baseUrl}/storage/${state.feedBlogPostList[widget.index].image}',
-                        errorWidget: (context, str, object) => const SizedBox.shrink(),
-                      ),
-                    ),
-                  ),
-                  const SizedBox(height: 12),
-                  Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 12),
-                    child: Row(
-                      children: [
-                        FeedIconButton(
-                          icon: isLiked ? Icons.favorite_rounded : Icons.favorite_border_rounded,
-                          text: totalLikes.toString(),
-                          iconColor: isLiked ? Colors.red.withValues(alpha: 0.8) : null,
-                          backgroundColor: isLiked ? Colors.red.withValues(alpha: 0.1) : null,
-                          textColor: isLiked ? Colors.red.withValues(alpha: 0.8) : null,
-                          onTap: () async {
-                            setState(() {
-                              isLiked = !isLiked;
-                              isLiked ? totalLikes++ : totalLikes--;
-                            });
-                            // Update feed list immediately by ID (no reload)
-                            context.read<FeedCubit>().updateFeedBlogPostList(state.feedBlogPostList[widget.index], isLiked);
-                            // Fire network call without introducing UI delay
-                            if (isLiked) {
-                              await context.read<FeedCubit>().likePost(state.feedBlogPostList[widget.index].id);
-                            } else {
-                              await context.read<FeedCubit>().unlikedPost(state.feedBlogPostList[widget.index].id);
-                            }
-                          },
-                        ),
-                        const SizedBox(width: 8),
-                        FeedIconButton(
-                          svgIcon: SvgPicture.asset(
-                            'assets/icons/comment.svg',
-                            height: 20,
-                            width: 20,
-                            colorFilter: ColorFilter.mode(appTheme.gray600, BlendMode.srcIn),
-                          ),
-                          text: state.feedBlogPostList[widget.index].totalComments.toString(),
-                          onTap: () => GoRouter.of(context).pushNamed('blogPostScreen', extra: state.feedBlogPostList[widget.index].id),
-                        ),
-                        const SizedBox(width: 8),
-                        FeedIconButton(
-                          svgIcon: SvgPicture.asset(
-                            height: 15,
-                            width: 12,
-                            'assets/icons/repost.svg',
-                            colorFilter: ColorFilter.mode(appTheme.gray600, BlendMode.srcIn),
-                          ),
-                          onTap: () {
-                            final box = context.findRenderObject() as RenderBox?;
-                            SharePlus.instance.share(
-                              ShareParams(
-                                uri: Uri.parse('${sl<AppConfig>().baseUrl}/ru/blog_post/${state.feedBlogPostList[widget.index].id}'),
-                                sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
-                              ),
-                            );
-                          },
-                        ),
-                        const Spacer(),
-                        Icon(Icons.visibility_rounded, size: 16, color: appTheme.gray500),
-                        const SizedBox(width: 4),
-                        Text(
-                          state.feedBlogPostList[widget.index].totalViews.toString(),
-                          style: TextStyle(fontSize: 12, color: appTheme.gray500, fontWeight: FontWeight.w400),
-                        ),
-                      ],
-                    ),
-                  ),
-                  const SizedBox(height: 8),
-                ],
+    return InkWell(
+      borderRadius: BorderRadius.circular(12),
+      onTap: () =>
+          GoRouter.of(context).pushNamed('blogPostScreen', extra: post.id),
+      child: Material(
+        borderRadius: BorderRadius.circular(12),
+        color: Colors.white,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            const SizedBox(height: 12),
+            _BlogPostHeader(post: post),
+            _BlogPostTextContent(post: post),
+            BlogPostMediaContent(
+              galleryImages: post.images,
+              imageUrl: imageUrl,
+              videoEmbedUrl: embedUrl != null && embedUrl.isNotEmpty
+                  ? embedUrl
+                  : null,
+              videoUrlThumb: post.videoUrlThumb,
+              currentGalleryIndex: currentGalleryIndex,
+              heroTag: 'feed-blog-post-${post.id}-cover',
+              onOpenGallery: (urls, index) => _openGallery(
+                urls,
+                index,
+                heroTag: urls.length == 1
+                    ? 'feed-blog-post-${post.id}-cover'
+                    : null,
               ),
+              onGalleryChanged: (index) {
+                setState(() {
+                  currentGalleryIndex = index;
+                });
+              },
             ),
-          );
-        }
-        return const SizedBox.shrink();
-      },
+            const SizedBox(height: 12),
+            _BlogPostActionsRow(
+              post: post,
+              isLiked: isLiked,
+              totalLikes: totalLikes,
+              onToggleLike: _toggleLike,
+            ),
+            const SizedBox(height: 8),
+          ],
+        ),
+      ),
     );
   }
 }
+
+class _BlogPostHeader extends StatelessWidget {
+  const _BlogPostHeader({required this.post});
+
+  final FeedBlogPostModel post;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 12),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          GestureDetector(
+            onTap: () => GoRouter.of(
+              context,
+            ).pushNamed('profileScreen', extra: post.author.authorSlug),
+            child: CircleAvatar(
+              radius: 20,
+              backgroundColor: Colors.black12,
+              foregroundImage: post.author.authorProfileIcon.isNotEmpty
+                  ? NetworkImage(
+                      PostFeedMapper.resolveMediaUrl(
+                        post.author.authorProfileIcon,
+                      ),
+                    )
+                  : null,
+              backgroundImage: const AssetImage('assets/images/no_avatar.png'),
+            ),
+          ),
+          const SizedBox(width: 8),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  post.author.authorName,
+                  overflow: TextOverflow.ellipsis,
+                  style: const TextStyle(
+                    height: 1,
+                    color: Colors.black87,
+                    fontWeight: FontWeight.w500,
+                    fontSize: 16,
+                  ),
+                ),
+                const SizedBox(height: 4),
+                Text(
+                  '${calculateDifference(post.createdAt)} в ${post.createdAt.hour.toString().padLeft(2, '0')}:${post.createdAt.minute.toString().padLeft(2, '0')}',
+                  style: const TextStyle(
+                    height: 1,
+                    color: Colors.black45,
+                    fontSize: 14,
+                  ),
+                ),
+              ],
+            ),
+          ),
+          if (!(post.author.isEntitySubscribedByMe ?? false) &&
+              !post.author.authorIsMe)
+            Padding(
+              padding: const EdgeInsets.only(right: 8),
+              child: SubscribeButtonWidget(slug: post.author.authorSlug),
+            ),
+          CustomPopup(
+            isAuthor: post.author.authorIsMe,
+            complainedContentType: ComplainedContent.posts,
+            path: 'blog_post/${post.id}',
+            id: post.id,
+            feedBlogPostModel: post,
+            userSlug: post.author.authorSlug,
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _BlogPostTextContent extends StatelessWidget {
+  const _BlogPostTextContent({required this.post});
+
+  final FeedBlogPostModel post;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        if (post.title.isNotEmpty) ...[
+          const SizedBox(height: 12),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 12),
+            child: Text(
+              post.title,
+              style: const TextStyle(
+                fontSize: 18,
+                fontWeight: FontWeight.w600,
+                color: Colors.black87,
+              ),
+            ),
+          ),
+        ],
+        if (post.title.isEmpty) const SizedBox(height: 8),
+        if (post.title.isNotEmpty && post.description.isNotEmpty)
+          const SizedBox(height: 8),
+        if (post.description.isNotEmpty)
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 12),
+            child: MarkdownHtmlWidget(
+              markdownText: _truncateDescription(post.description),
+            ),
+          ),
+        if (post.description.length > 200)
+          const Padding(
+            padding: EdgeInsets.symmetric(horizontal: 12),
+            child: Text(
+              'Показать ещё',
+              style: TextStyle(
+                height: 1,
+                color: Color(0xFF8B8B8B),
+                fontSize: 14,
+                fontWeight: FontWeight.w600,
+              ),
+            ),
+          ),
+        if (post.title.isNotEmpty || post.description.isNotEmpty)
+          const SizedBox(height: 8),
+      ],
+    );
+  }
+}
+
+class _BlogPostActionsRow extends StatelessWidget {
+  const _BlogPostActionsRow({
+    required this.post,
+    required this.isLiked,
+    required this.totalLikes,
+    required this.onToggleLike,
+  });
+
+  final FeedBlogPostModel post;
+  final bool isLiked;
+  final int totalLikes;
+  final Future<void> Function() onToggleLike;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 12),
+      child: Row(
+        children: [
+          FeedIconButton(
+            icon: isLiked
+                ? Icons.favorite_rounded
+                : Icons.favorite_border_rounded,
+            text: totalLikes.toString(),
+            iconColor: isLiked ? Colors.red.withValues(alpha: 0.8) : null,
+            backgroundColor: isLiked ? Colors.red.withValues(alpha: 0.1) : null,
+            textColor: isLiked ? Colors.red.withValues(alpha: 0.8) : null,
+            onTap: onToggleLike,
+          ),
+          const SizedBox(width: 8),
+          FeedIconButton(
+            svgIcon: SvgPicture.asset(
+              'assets/icons/comment.svg',
+              height: 20,
+              width: 20,
+              colorFilter: ColorFilter.mode(appTheme.gray600, BlendMode.srcIn),
+            ),
+            text: post.totalComments.toString(),
+            onTap: () => GoRouter.of(
+              context,
+            ).pushNamed('blogPostScreen', extra: post.id),
+          ),
+          const SizedBox(width: 8),
+          FeedIconButton(
+            svgIcon: SvgPicture.asset(
+              height: 15,
+              width: 12,
+              'assets/icons/repost.svg',
+              colorFilter: ColorFilter.mode(appTheme.gray600, BlendMode.srcIn),
+            ),
+            onTap: () {
+              final box = context.findRenderObject() as RenderBox?;
+              SharePlus.instance.share(
+                ShareParams(
+                  uri: Uri.parse(
+                    '${sl<AppConfig>().baseUrl}/ru/blog_post/${post.id}',
+                  ),
+                  sharePositionOrigin:
+                      box!.localToGlobal(Offset.zero) & box.size,
+                ),
+              );
+            },
+          ),
+          const Spacer(),
+          Icon(Icons.visibility_rounded, size: 16, color: appTheme.gray500),
+          const SizedBox(width: 4),
+          Text(
+            post.totalViews.toString(),
+            style: TextStyle(
+              fontSize: 12,
+              color: appTheme.gray500,
+              fontWeight: FontWeight.w400,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+String _truncateDescription(String description) {
+  final isLong = description.length > 200;
+  if (!isLong) return description;
+
+  var cutPoint = 200;
+  final preview = description.substring(0, cutPoint);
+  final boldOpen = (preview.split('**').length - 1) ~/ 2;
+  final boldClose = preview.split('**').length - 1 - boldOpen * 2;
+  final hasUnclosedBold = boldOpen > boldClose;
+
+  if (hasUnclosedBold) {
+    final searchEnd = (cutPoint + 100).clamp(0, description.length);
+    final boldClosePos = description.indexOf('**', cutPoint);
+    if (boldClosePos != -1 && boldClosePos < searchEnd) {
+      cutPoint = boldClosePos + 2;
+    } else {
+      cutPoint = description.lastIndexOf(' ', 200);
+      if (cutPoint == -1 || cutPoint < 150) cutPoint = 200;
+    }
+  } else {
+    cutPoint = description.lastIndexOf(' ', cutPoint);
+    if (cutPoint == -1 || cutPoint < 150) cutPoint = 200;
+  }
+
+  return description.substring(0, cutPoint);
+}
diff --git a/lib/features/feed/presentation/widgets/blog_posts.dart b/lib/features/feed/presentation/widgets/blog_posts.dart
index b9da2ecc..afae31c7 100644
--- a/lib/features/feed/presentation/widgets/blog_posts.dart
+++ b/lib/features/feed/presentation/widgets/blog_posts.dart
@@ -3,6 +3,7 @@ import 'package:eatvio_app/core/widgets/data_error_widget.dart';
 import 'package:eatvio_app/core/widgets/loader.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state.dart';
+import 'package:eatvio_app/features/feed/presentation/bloc/profile_cubit/profile_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/pages/feed_screen.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/blog_post_widget.dart';
 import 'package:flutter/material.dart';
@@ -11,18 +12,18 @@ import 'package:visibility_detector/visibility_detector.dart';
 
 class BlogPosts extends StatelessWidget {
   const BlogPosts({super.key, required this.handleVisibility});
-  final Function({required double visibleFraction,required int id, required ViewableContentType type}) handleVisibility;
-  
+  final Function({required double visibleFraction, required int id, required ViewableContentType type}) handleVisibility;
+
   @override
   Widget build(BuildContext context) {
     return RefreshIndicator(
-      onRefresh: () => context.read<FeedCubit>().loadFeedBlogPostList(),
+      onRefresh: () => context.read<FeedCubit>().loadFeedBlogPostList(currentUserId: context.read<FeedProfileCubit>().state.profile?.id),
       child: BlocBuilder<FeedCubit, FeedState>(
         builder: (BuildContext context, FeedState state) {
           if (state is FeedStateLoaded) {
             return NotificationListener<ScrollNotification>(
               onNotification: (notification) {
-                loadNewContent(notification, context.read<FeedCubit>().loadNextPage);
+                loadNewContent(notification, () => context.read<FeedCubit>().loadNextPage(currentUserId: context.read<FeedProfileCubit>().state.profile?.id));
                 return false;
               },
               child: ListView.separated(
@@ -32,13 +33,13 @@ class BlogPosts extends StatelessWidget {
                   if (index == state.feedBlogPostList.length) {
                     return const Loader();
                   }
+                  final post = state.feedBlogPostList[index];
                   return VisibilityDetector(
+                    key: ValueKey(post.id),
                     onVisibilityChanged: (info) {
-                      final id = state.feedBlogPostList[index].id;
-                      handleVisibility(visibleFraction: info.visibleFraction, id: id, type: ViewableContentType.posts);
+                      handleVisibility(visibleFraction: info.visibleFraction, id: post.id, type: ViewableContentType.posts);
                     },
-                    key: ValueKey(index),
-                    child: BlogPostWidget(index: index),
+                    child: BlogPostWidget(post: post),
                   );
                 },
                 separatorBuilder: (context, index) => const SizedBox(height: 8),
@@ -46,7 +47,9 @@ class BlogPosts extends StatelessWidget {
               ),
             );
           } else if (state is FeedStateError) {
-            return DataErrorWidget(onReload: () => context.read<FeedCubit>().loadFeedBlogPostList());
+            return DataErrorWidget(
+              onReload: () => context.read<FeedCubit>().loadFeedBlogPostList(currentUserId: context.read<FeedProfileCubit>().state.profile?.id),
+            );
           } else {
             return Scaffold(backgroundColor: Colors.grey.shade200, body: const Loader());
           }
diff --git a/lib/features/feed/presentation/widgets/feed_video_player/feed_video_embed.dart b/lib/features/feed/presentation/widgets/feed_video_player/feed_video_embed.dart
new file mode 100644
index 00000000..056d0e37
--- /dev/null
+++ b/lib/features/feed/presentation/widgets/feed_video_player/feed_video_embed.dart
@@ -0,0 +1,70 @@
+import 'dart:convert';
+
+import 'package:eatvio_app/features/feed/presentation/widgets/feed_video_player/feed_video_embed_scripts.dart';
+
+enum FeedVideoEmbedProvider { vk, other }
+
+/// Сборка URL и HTML для embed-плеера ленты.
+abstract final class FeedVideoEmbed {
+  static FeedVideoEmbedProvider detectProvider(Uri uri) {
+    final host = uri.host.toLowerCase();
+    final isVk = host == 'vk.com' ||
+        host.endsWith('.vk.com') ||
+        host == 'vk.ru' ||
+        host.endsWith('.vk.ru') ||
+        host == 'vkvideo.ru' ||
+        host.endsWith('.vkvideo.ru');
+    return isVk ? FeedVideoEmbedProvider.vk : FeedVideoEmbedProvider.other;
+  }
+
+  /// После жеста пользователя включаем autoplay, чтобы стартнуть сразу после загрузки.
+  static Uri uriForPlayback(String url) {
+    final uri = Uri.parse(url);
+    final params = Map<String, String>.from(uri.queryParameters);
+    params['autoplay'] = '1';
+    params['mute'] = '1';
+    params.putIfAbsent('playsinline', () => '1');
+
+    // VK Video JS API: без js_api=1 события/методы плеера недоступны.
+    if (detectProvider(uri) == FeedVideoEmbedProvider.vk) {
+      params['js_api'] = '1';
+    }
+
+    return uri.replace(queryParameters: params);
+  }
+
+  static String buildHtml(String embedUrl) {
+    final uri = Uri.parse(embedUrl);
+    final isVk = detectProvider(uri) == FeedVideoEmbedProvider.vk;
+    final src = const HtmlEscape(HtmlEscapeMode.attribute).convert(embedUrl);
+    final headScripts = isVk ? '<script src="${FeedVideoEmbedScripts.vkVideoPlayerApiSrc}"></script>' : '';
+    final bootstrap = FeedVideoEmbedScripts.bootstrap(includeVk: isVk);
+
+    return '''
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+  <style>
+    html, body { margin: 0; padding: 0; width: 100%; height: 100%; background: #000; overflow: hidden; }
+    iframe { position: absolute; inset: 0; width: 100%; height: 100%; border: 0; }
+  </style>
+  $headScripts
+</head>
+<body>
+  <iframe
+    id="player"
+    src="$src"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; fullscreen;"
+    allowfullscreen
+    referrerpolicy="strict-origin-when-cross-origin"
+  ></iframe>
+  <script>
+$bootstrap
+  </script>
+</body>
+</html>
+''';
+  }
+}
diff --git a/lib/features/feed/presentation/widgets/feed_video_player/feed_video_embed_scripts.dart b/lib/features/feed/presentation/widgets/feed_video_player/feed_video_embed_scripts.dart
new file mode 100644
index 00000000..5d661bde
--- /dev/null
+++ b/lib/features/feed/presentation/widgets/feed_video_player/feed_video_embed_scripts.dart
@@ -0,0 +1,70 @@
+/// JS-фрагменты для embed-плеера ленты.
+///
+/// Канал связи с Flutter: [readyChannel] через `flutter_inappwebview.callHandler`.
+abstract final class FeedVideoEmbedScripts {
+  static const readyChannel = 'EmbedReady';
+
+  /// Уведомляет Flutter, что embed готов к показу.
+  static String get notifyReady =>
+      '''
+    function notifyReady() {
+      try {
+        window.flutter_inappwebview.callHandler('$readyChannel', 'ready');
+      } catch (e) {}
+    }
+  ''';
+
+  /// Уведомляет Flutter об ошибке воспроизведения.
+  static String get notifyError =>
+      '''
+    function notifyError() {
+      try {
+        window.flutter_inappwebview.callHandler('$readyChannel', 'error');
+      } catch (e) {}
+    }
+  ''';
+
+  /// Rutube: готовность через postMessage `player:canPlay`.
+  static String get rutubeCanPlayListener => '''
+    window.addEventListener('message', function (event) {
+      try {
+        var type = JSON.parse(event.data).type;
+        if (type === 'player:canPlay') {
+          notifyReady();
+        }
+      } catch (e) {}
+    });
+  ''';
+
+  /// VK Video JS API: воспроизведение началось на событии `started`.
+  /// Требует `js_api=1` в URL iframe и скрипт `videoplayer.js`.
+  static String get vkPlayerReadyHandler => '''
+    try {
+      if (typeof VK !== 'undefined' && VK.VideoPlayer) {
+        var vkPlayer = VK.VideoPlayer(document.getElementById('player'));
+        vkPlayer.on('started', function () {
+          notifyReady();
+        });
+        vkPlayer.on('error', function () {
+          notifyError();
+        });
+      }
+    } catch (e) {}
+  ''';
+
+  /// Внешний скрипт VK VideoPlayer API.
+  static const vkVideoPlayerApiSrc = 'https://vk.ru/js/api/videoplayer.js';
+
+  /// Собирает inline `<script>` с общим bootstrap + опциональным VK-хендлером.
+  static String bootstrap({required bool includeVk}) {
+    final vkPart = includeVk ? vkPlayerReadyHandler : '';
+    return '''
+      (function () {
+      $notifyReady
+      $notifyError
+      $rutubeCanPlayListener
+      $vkPart
+      })();
+    ''';
+  }
+}
diff --git a/lib/features/feed/presentation/widgets/feed_video_player/feed_video_player_widget.dart b/lib/features/feed/presentation/widgets/feed_video_player/feed_video_player_widget.dart
new file mode 100644
index 00000000..2f850923
--- /dev/null
+++ b/lib/features/feed/presentation/widgets/feed_video_player/feed_video_player_widget.dart
@@ -0,0 +1,212 @@
+import 'dart:async';
+import 'dart:developer';
+
+import 'package:eatvio_app/features/feed/presentation/widgets/feed_video_player/feed_video_embed.dart';
+import 'package:eatvio_app/features/feed/presentation/widgets/feed_video_player/feed_video_embed_scripts.dart';
+import 'package:eatvio_app/features/feed/presentation/widgets/feed_video_player/feed_video_preview_placeholder.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+
+/// Embed-видео в ленте.
+///
+/// 1) Пока пользователь не нажал play — только превью (без WebView).
+/// 2) После play — превью + лоадер, WebView грузится скрыто.
+/// 3) Когда embed готов — показываем WebView и запускаем воспроизведение.
+///
+/// Реализовано на `flutter_inappwebview` — в отличие от `webview_flutter` v4
+/// нативно поддерживает fullscreen внутри embed-плеера (Rutube/VK/YouTube):
+/// Android `WebChromeClient.onShowCustomView/onHideCustomView`.
+class FeedVideoPlayer extends StatefulWidget {
+  const FeedVideoPlayer({super.key, required this.embedUrl, this.videoUrlThumb});
+
+  final String embedUrl;
+
+  /// Пока бэкенд не отдаёт превью — null, показывается серая заглушка.
+  final String? videoUrlThumb;
+
+  @override
+  State<FeedVideoPlayer> createState() => _FeedVideoPlayerState();
+}
+
+class _FeedVideoPlayerState extends State<FeedVideoPlayer> {
+  static const Duration _readyFallbackDelay = Duration(seconds: 4);
+
+  /// Пока null — WebView не рендерится. Заполняется по жесту play.
+  InAppWebViewInitialData? _initialData;
+  bool _isLoading = false;
+  bool _isReady = false;
+  bool _hasError = false;
+
+  /// Страховка готовности для провайдеров без сигнала ready (Rutube/VK).
+  Timer? _readyFallback;
+
+  @override
+  void didUpdateWidget(covariant FeedVideoPlayer oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.embedUrl != widget.embedUrl || oldWidget.videoUrlThumb != widget.videoUrlThumb) {
+      _reset();
+    }
+  }
+
+  @override
+  void dispose() {
+    _readyFallback?.cancel();
+    super.dispose();
+  }
+
+  void _reset() {
+    _readyFallback?.cancel();
+    _readyFallback = null;
+    _initialData = null;
+    _isLoading = false;
+    _isReady = false;
+    _hasError = false;
+  }
+
+  void _markReady() {
+    if (!mounted || _isReady || _hasError) return;
+    _readyFallback?.cancel();
+    _readyFallback = null;
+    setState(() {
+      _isReady = true;
+      _isLoading = false;
+    });
+  }
+
+  void _markError() {
+    if (!mounted || _isReady) return;
+    _readyFallback?.cancel();
+    _readyFallback = null;
+    setState(() {
+      _hasError = true;
+      _isLoading = false;
+      _initialData = null;
+    });
+  }
+
+  Future<void> _onPlayPressed() async {
+    if (_isLoading || _isReady || !mounted) return;
+
+    setState(() {
+      _isLoading = true;
+      _hasError = false;
+    });
+
+    try {
+      final embedUri = FeedVideoEmbed.uriForPlayback(widget.embedUrl);
+      final baseUrl = '${embedUri.scheme}://${embedUri.host}/';
+
+      if (!mounted) return;
+      setState(() {
+        _initialData = InAppWebViewInitialData(
+          data: FeedVideoEmbed.buildHtml(embedUri.toString()),
+          mimeType: 'text/html',
+          encoding: 'utf8',
+          baseUrl: WebUri(baseUrl),
+        );
+      });
+    } catch (e, st) {
+      if (kDebugMode) {
+        debugPrint('FeedVideoPlayer load failed: $e\n$st');
+      }
+      _markError();
+    }
+  }
+
+  InAppWebViewSettings get _settings => InAppWebViewSettings(
+        // Жест play уже был на кнопке — разрешаем старта без доп. тапа.
+        mediaPlaybackRequiresUserGesture: false,
+        allowsInlineMediaPlayback: true,
+        iframeAllow: 'accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; fullscreen',
+        iframeAllowFullscreen: true,
+        transparentBackground: false,
+      );
+
+  void _onWebViewCreated(InAppWebViewController controller) {
+    controller.addJavaScriptHandler(
+      handlerName: FeedVideoEmbedScripts.readyChannel,
+      callback: (args) {
+        final status = args.isNotEmpty ? args.first?.toString() : 'ready';
+        if (status == 'error') {
+          _markError();
+        } else {
+          _markReady();
+        }
+      },
+    );
+  }
+
+  void _onLoadStop(InAppWebViewController _, WebUri? _) {
+    // Если провайдер не шлёт сигнал готовности (Rutube `player:canPlay` / VK `started`),
+    // покажем WebView по таймауту после полной загрузки (напр. YouTube / OK).
+    if (_isReady || _hasError || !mounted) return;
+    _readyFallback?.cancel();
+    _readyFallback = Timer(_readyFallbackDelay, () {
+      if (mounted && !_isReady && !_hasError) _markReady();
+    });
+  }
+
+  void _onReceivedError(InAppWebViewController _, WebResourceRequest request, WebResourceError error) {
+    if (!mounted) return;
+    if (request.isForMainFrame != true) return;
+    // ERR_BLOCKED_BY_ORB — cross-origin блокировки subframe, не реальная ошибка плеера.
+    if (error.description.contains('ERR_BLOCKED_BY_ORB')) return;
+    if (_isReady) return;
+    if (kDebugMode) debugPrint('FeedVideoPlayer error: ${error.description}');
+    _markError();
+  }
+
+  void _onEnterFullscreen(InAppWebViewController _) {
+    SystemChrome.setPreferredOrientations([DeviceOrientation.landscapeLeft, DeviceOrientation.landscapeRight]);
+  }
+
+  void _onExitFullscreen(InAppWebViewController _) {
+    // Возвращаем системный набор ориентаций (не блокируем глобально в portrait).
+    SystemChrome.setPreferredOrientations([]);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final player = ColoredBox(
+      color: Colors.black,
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          // WebView создаётся только после play и до ready остаётся скрытым под превью.
+          if (_initialData != null)
+            Opacity(
+              opacity: _isReady ? 1 : 0,
+              child: IgnorePointer(
+                ignoring: !_isReady,
+                child: InAppWebView(
+                  key: ValueKey('feed-inappwebview-${widget.embedUrl}'),
+                  initialData: _initialData,
+                  initialSettings: _settings,
+                  onWebViewCreated: _onWebViewCreated,
+                  onConsoleMessage: (_, message) => log('FeedVideoPlayer console message: ${message.message}'),
+                  onLoadStop: _onLoadStop,
+                  onReceivedError: _onReceivedError,
+                  onEnterFullscreen: _onEnterFullscreen,
+                  onExitFullscreen: _onExitFullscreen,
+                ),
+              ),
+            ),
+          if (!_isReady)
+            FeedVideoPreviewPlaceholder(
+              previewUrl: widget.videoUrlThumb,
+              isLoading: _isLoading,
+              hasError: _hasError,
+              onPlay: _onPlayPressed,
+              onRetry: _onPlayPressed,
+            ),
+        ],
+      ),
+    );
+
+    // Пока превью/лоадер — не даём InkWell карточки перехватывать тап.
+    if (_isReady) return player;
+    return GestureDetector(onTap: () {}, behavior: HitTestBehavior.opaque, child: player);
+  }
+}
diff --git a/lib/features/feed/presentation/widgets/feed_video_player/feed_video_preview_placeholder.dart b/lib/features/feed/presentation/widgets/feed_video_player/feed_video_preview_placeholder.dart
new file mode 100644
index 00000000..1721e45b
--- /dev/null
+++ b/lib/features/feed/presentation/widgets/feed_video_player/feed_video_preview_placeholder.dart
@@ -0,0 +1,66 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/material.dart';
+
+class FeedVideoPreviewPlaceholder extends StatelessWidget {
+  const FeedVideoPreviewPlaceholder({
+    super.key,
+    required this.previewUrl,
+    required this.isLoading,
+    required this.hasError,
+    required this.onPlay,
+    required this.onRetry,
+  });
+
+  final String? previewUrl;
+  final bool isLoading;
+  final bool hasError;
+  final VoidCallback onPlay;
+  final VoidCallback onRetry;
+
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      fit: StackFit.expand,
+      children: [
+        const ColoredBox(color: Colors.black),
+        if (previewUrl != null && previewUrl!.isNotEmpty)
+          CachedNetworkImage(
+            imageUrl: previewUrl!,
+            fit: BoxFit.contain,
+            width: double.infinity,
+            height: double.infinity,
+            errorWidget: (_, _, _) => const ColoredBox(color: Color(0xFF2C2C2C)),
+          )
+        else
+          const ColoredBox(color: Color(0xFF2C2C2C)),
+        if (hasError)
+          Center(
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                const Icon(Icons.error_outline, size: 40, color: Colors.white54),
+                const SizedBox(height: 8),
+                TextButton(
+                  onPressed: onRetry,
+                  child: const Text('Повторить', style: TextStyle(color: Colors.white70)),
+                ),
+              ],
+            ),
+          )
+        else if (isLoading)
+          const Center(child: CircularProgressIndicator(color: Colors.white))
+        else
+          Center(
+            child: GestureDetector(
+              onTap: onPlay,
+              child: Container(
+                decoration: BoxDecoration(color: Colors.black.withValues(alpha: 0.45), shape: BoxShape.circle),
+                padding: const EdgeInsets.all(12),
+                child: const Icon(Icons.play_arrow_rounded, color: Colors.white, size: 40),
+              ),
+            ),
+          ),
+      ],
+    );
+  }
+}
diff --git a/lib/features/feed/presentation/widgets/feed_video_player_widget.dart b/lib/features/feed/presentation/widgets/feed_video_player_widget.dart
new file mode 100644
index 00000000..13635c30
--- /dev/null
+++ b/lib/features/feed/presentation/widgets/feed_video_player_widget.dart
@@ -0,0 +1 @@
+export 'package:eatvio_app/features/feed/presentation/widgets/feed_video_player/feed_video_player_widget.dart';
diff --git a/lib/features/feed/presentation/widgets/plan_widget.dart b/lib/features/feed/presentation/widgets/plan_widget.dart
index 9b0a3f3d..96e2acff 100644
--- a/lib/features/feed/presentation/widgets/plan_widget.dart
+++ b/lib/features/feed/presentation/widgets/plan_widget.dart
@@ -116,9 +116,7 @@ class _PlanWidgetState extends State<PlanWidget> {
                   Padding(
                     padding: const EdgeInsets.symmetric(horizontal: 16),
                     child: MarkdownHtmlWidget(
-                      markdownText: widget.plan.details.length > 200
-                          ? '${widget.plan.details.substring(0, 200)}...'
-                          : widget.plan.details,
+                      markdownText: widget.plan.details.length > 200 ? '${widget.plan.details.substring(0, 200)}...' : widget.plan.details,
                       textColor: appTheme.black,
                     ),
                   ),
diff --git a/lib/features/feed/repositories/feed_repository.dart b/lib/features/feed/repositories/feed_repository.dart
index b5128be8..781e0f3c 100644
--- a/lib/features/feed/repositories/feed_repository.dart
+++ b/lib/features/feed/repositories/feed_repository.dart
@@ -1,9 +1,9 @@
 import 'package:eatvio_app/features/feed/models/comment_model.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
-import 'package:eatvio_app/features/feed/models/feed_blog_post_settings_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_consultant_model.dart';
 import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_mapper.dart';
 import 'package:eatvio_app/features/feed/models/recipes_model.dart';
 import 'package:eatvio_app/features/feed/models/view_model.dart';
 import 'package:eatvio_app/features/feed/services/feed_service.dart';
@@ -13,9 +13,12 @@ class FeedRepository {
 
   FeedRepository({required this.feedService});
 
-  Future<FeedBlogPostSettingsModel> getFeedBlogPosts({String? query, int page = 1}) async {
-    return (await feedService.getBlogPostList(page: page, query: query));
-
+  Future<({List<FeedBlogPostModel> posts, String? nextCursor})> getFeed({String? search, String? cursor, int? currentUserId}) async {
+    final response = await feedService.getFeed(search: search, cursor: cursor);
+    return (
+      posts: response.data.map((item) => PostFeedMapper.fromPostFeedItem(item, currentUserId: currentUserId)).toList(),
+      nextCursor: response.meta.nextCursor,
+    );
   }
 
   Future<FeedBlogPostModel> getBlogPost({required int id}) async {
diff --git a/lib/features/feed/services/feed_service.dart b/lib/features/feed/services/feed_service.dart
index c756f8c7..22a453be 100644
--- a/lib/features/feed/services/feed_service.dart
+++ b/lib/features/feed/services/feed_service.dart
@@ -5,6 +5,7 @@ import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_settings_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_consultant_model.dart';
 import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/recipes_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/view_model.dart';
 import 'package:retrofit/retrofit.dart';
@@ -18,7 +19,13 @@ abstract class FeedService {
   @GET('/api/blogPosts/index')
   Future<FeedBlogPostSettingsModel> getBlogPostList({@Query('page') required int page, @Query('query_search') String? query});
 
-  @GET('/api/blogPosts/show/{postId}')
+  @GET('/api/feed')
+  Future<PostFeedPaginationModel> getFeed({
+    @Query('search') String? search,
+    @Query('cursor') String? cursor,
+  });
+
+  @GET('/api/v2/blogPosts/show/{postId}')
   Future<FeedBlogPostModel> getBlogPost({@Path('postId') required int postId});
 
   @GET('/api/recipes/index')
diff --git a/lib/features/menu/presentation/pages/menu_screen.dart b/lib/features/menu/presentation/pages/menu_screen.dart
index 05cabce2..67017dd0 100644
--- a/lib/features/menu/presentation/pages/menu_screen.dart
+++ b/lib/features/menu/presentation/pages/menu_screen.dart
@@ -2,6 +2,7 @@ import 'package:dio/dio.dart';
 import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/error_reporting/error_reporter.dart';
 import 'package:eatvio_app/core/const.dart';
+import 'package:eatvio_app/core/firebase_api.dart';
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/core/utils/image_constant.dart';
@@ -15,6 +16,7 @@ import 'package:eatvio_app/features/consultant_rating/presentation/consultant_ra
 import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart';
 import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/user_purchases_screen.dart';
 import 'package:eatvio_app/features/menu/presentation/bloc/menu_cubit/menu_cubit.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
 import 'package:eatvio_app/features/menu/presentation/bloc/menu_cubit/menu_state.dart';
 import 'package:eatvio_app/features/my_diets/presentation/my_diets_screen.dart';
 import 'package:eatvio_app/features/my_plans/presentation/my_plans_screen.dart';
@@ -165,6 +167,13 @@ class MenuScreen extends StatelessWidget {
                 } catch (e, s) {
                   await sl<ErrorReporter>().report(e, s, origin: 'MenuScreen');
                 } finally {
+                  try {
+                    // Needs Authorization header → must run before removing token.
+                    await sl<FirebaseApi>().unregisterPushTokens();
+                  } catch (e, s) {
+                    await sl<ErrorReporter>().report(e, s, origin: 'MenuScreen');
+                  }
+                  await sl<VideoCallSessionCubit>().endCall();
                   await sl<WsManager>().clear();
                   await TokenStorage.removeTokenInStorage();
                   if (context.mounted) {
diff --git a/lib/features/payment/models/promo_applied_list_response.dart b/lib/features/payment/models/promo_applied_list_response.dart
new file mode 100644
index 00000000..8d80c3e4
--- /dev/null
+++ b/lib/features/payment/models/promo_applied_list_response.dart
@@ -0,0 +1,15 @@
+import 'package:eatvio_app/features/payment/models/promo_code_model.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'promo_applied_list_response.freezed.dart';
+part 'promo_applied_list_response.g.dart';
+
+@freezed
+abstract class PromoAppliedListResponse with _$PromoAppliedListResponse {
+  const factory PromoAppliedListResponse({
+    @JsonKey(name: 'promo_codes') required List<PromoCodeModel> promoCodes,
+  }) = _PromoAppliedListResponse;
+
+  factory PromoAppliedListResponse.fromJson(Map<String, dynamic> json) =>
+      _$PromoAppliedListResponseFromJson(json);
+}
diff --git a/lib/features/payment/models/promo_apply_response.dart b/lib/features/payment/models/promo_apply_response.dart
new file mode 100644
index 00000000..0d3a5da5
--- /dev/null
+++ b/lib/features/payment/models/promo_apply_response.dart
@@ -0,0 +1,21 @@
+import 'package:eatvio_app/features/payment/models/promo_code_model.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'promo_apply_response.freezed.dart';
+part 'promo_apply_response.g.dart';
+
+@freezed
+abstract class PromoApplyResponse with _$PromoApplyResponse {
+  const factory PromoApplyResponse({
+    required bool success,
+    String? error,
+    @JsonKey(name: 'promo_code') PromoCodeModel? promoCode,
+    @JsonKey(name: 'discount_percent') int? discountPercent,
+    @JsonKey(name: 'discount_amount_rub') double? discountAmountRub,
+    @JsonKey(name: 'original_amount_rub') double? originalAmountRub,
+    @JsonKey(name: 'final_amount_rub') double? finalAmountRub,
+  }) = _PromoApplyResponse;
+
+  factory PromoApplyResponse.fromJson(Map<String, dynamic> json) =>
+      _$PromoApplyResponseFromJson(json);
+}
diff --git a/lib/features/payment/models/promo_code_model.dart b/lib/features/payment/models/promo_code_model.dart
new file mode 100644
index 00000000..4f3858ea
--- /dev/null
+++ b/lib/features/payment/models/promo_code_model.dart
@@ -0,0 +1,22 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'promo_code_model.freezed.dart';
+part 'promo_code_model.g.dart';
+
+@freezed
+abstract class PromoCodeModel with _$PromoCodeModel {
+  const factory PromoCodeModel({
+    required int id,
+    @JsonKey(name: 'chosen_plan_id') required int chosenPlanId,
+    @JsonKey(name: 'promo_code') required String promoCode,
+    @JsonKey(name: 'discount_percent') required int discountPercent,
+    @JsonKey(name: 'discount_amount_rub') required double discountAmountRub,
+    required String state,
+    @JsonKey(name: 'applied_at') String? appliedAt,
+    @JsonKey(name: 'confirmed_at') String? confirmedAt,
+    @JsonKey(name: 'cancelled_at') String? cancelledAt,
+  }) = _PromoCodeModel;
+
+  factory PromoCodeModel.fromJson(Map<String, dynamic> json) =>
+      _$PromoCodeModelFromJson(json);
+}
diff --git a/lib/features/payment/models/promo_remove_response.dart b/lib/features/payment/models/promo_remove_response.dart
new file mode 100644
index 00000000..2d675e0c
--- /dev/null
+++ b/lib/features/payment/models/promo_remove_response.dart
@@ -0,0 +1,15 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'promo_remove_response.freezed.dart';
+part 'promo_remove_response.g.dart';
+
+@freezed
+abstract class PromoRemoveResponse with _$PromoRemoveResponse {
+  const factory PromoRemoveResponse({
+    required bool success,
+    String? error,
+  }) = _PromoRemoveResponse;
+
+  factory PromoRemoveResponse.fromJson(Map<String, dynamic> json) =>
+      _$PromoRemoveResponseFromJson(json);
+}
diff --git a/lib/features/payment/models/promo_validate_response.dart b/lib/features/payment/models/promo_validate_response.dart
new file mode 100644
index 00000000..a07b3408
--- /dev/null
+++ b/lib/features/payment/models/promo_validate_response.dart
@@ -0,0 +1,20 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'promo_validate_response.freezed.dart';
+part 'promo_validate_response.g.dart';
+
+@freezed
+abstract class PromoValidateResponse with _$PromoValidateResponse {
+  const factory PromoValidateResponse({
+    required bool valid,
+    String? error,
+    @JsonKey(name: 'promo_code') String? promoCode,
+    @JsonKey(name: 'discount_percent') int? discountPercent,
+    @JsonKey(name: 'discount_amount_rub') double? discountAmountRub,
+    @JsonKey(name: 'original_amount_rub') double? originalAmountRub,
+    @JsonKey(name: 'final_amount_rub') double? finalAmountRub,
+  }) = _PromoValidateResponse;
+
+  factory PromoValidateResponse.fromJson(Map<String, dynamic> json) =>
+      _$PromoValidateResponseFromJson(json);
+}
diff --git a/lib/features/payment/presentation/payment_flow.dart b/lib/features/payment/presentation/payment_flow.dart
index 03cfe5b5..2764dc9e 100644
--- a/lib/features/payment/presentation/payment_flow.dart
+++ b/lib/features/payment/presentation/payment_flow.dart
@@ -1,22 +1,73 @@
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/utils/toasts.dart';
+import 'package:eatvio_app/features/payment/models/promo_apply_response.dart';
+import 'package:eatvio_app/features/payment/models/promo_code_model.dart';
+import 'package:eatvio_app/features/payment/models/promo_validate_response.dart';
 import 'package:eatvio_app/features/payment/presentation/widgets/promo_code_gate_bottom_sheet.dart';
 import 'package:eatvio_app/features/payment/presentation/widgets/promo_code_modal.dart';
 import 'package:eatvio_app/features/payment/presentation/widgets/sbp_banks_bottom_sheet.dart';
-import 'package:eatvio_app/generated/l10n.dart';
+import 'package:eatvio_app/features/payment/repositories/payment_repository.dart';
 import 'package:flutter/material.dart';
 
 /// Оркестрирует флоу оплаты консультации:
-/// гейт «У вас есть промокод?» → (Да → форма промокода) → SbpBanks.
+/// applied rehydrate → (или гейт → форма) → apply при необходимости → SbpBanks.
 Future<void> showConsultationPaymentFlow(
   BuildContext context, {
   required int planId,
   Future<bool?> Function(BuildContext)? showGate,
-  Future<PromoCodeResult?> Function(BuildContext, {Future<PromoValidation> Function(String)? onValidate})? showForm,
+  Future<PromoCodeResult?> Function(
+    BuildContext, {
+    Future<PromoValidation> Function(String)? onValidate,
+    Future<bool> Function()? onRemove,
+    PromoCodeModel? initialPromo,
+  })? showForm,
   Future<void> Function(BuildContext, {required int planId})? showSbp,
+  Future<PromoValidateResponse> Function({
+    required int planId,
+    required String promoCode,
+  })? validatePromo,
+  Future<PromoApplyResponse> Function({
+    required int planId,
+    required String promoCode,
+  })? applyPromo,
+  Future<PromoCodeModel?> Function(int planId)? listApplied,
+  Future<bool> Function(int planId)? removePromo,
 }) async {
   final gate = showGate ?? _showGate;
   final form = showForm ?? _showForm;
   final sbp = showSbp ?? _showSbp;
-  final s = S.of(context);
+  final validate = validatePromo ?? _defaultValidatePromo;
+  final apply = applyPromo ?? _defaultApplyPromo;
+  final findApplied = listApplied ?? _defaultFindApplied;
+  final remove = removePromo ?? _defaultRemovePromo;
+
+  final existing = await findApplied(planId);
+  if (!context.mounted) return;
+
+  if (existing != null) {
+    final formResult = await form(
+      context,
+      initialPromo: existing,
+      onRemove: () => remove(planId),
+      onValidate: (code) => _mapValidateResponse(
+        validate(planId: planId, promoCode: code),
+      ),
+    );
+    if (formResult == null || !context.mounted) return;
+
+    if (formResult.hasPromoCode && !formResult.alreadyApplied) {
+      final applied = await _tryApplyPromo(
+        apply: apply,
+        planId: planId,
+        promoCode: formResult.code!,
+      );
+      if (!applied || !context.mounted) return;
+    }
+
+    if (!context.mounted) return;
+    await sbp(context, planId: planId);
+    return;
+  }
 
   final gateChoice = await gate(context);
   if (gateChoice == null || !context.mounted) return;
@@ -24,9 +75,20 @@ Future<void> showConsultationPaymentFlow(
   if (gateChoice) {
     final formResult = await form(
       context,
-      onValidate: (_) async => PromoValidation.failure(s.promo_invalid),
+      onValidate: (code) => _mapValidateResponse(
+        validate(planId: planId, promoCode: code),
+      ),
     );
     if (formResult == null || !context.mounted) return;
+
+    if (formResult.hasPromoCode && !formResult.alreadyApplied) {
+      final applied = await _tryApplyPromo(
+        apply: apply,
+        planId: planId,
+        promoCode: formResult.code!,
+      );
+      if (!applied || !context.mounted) return;
+    }
   }
 
   if (!context.mounted) return;
@@ -40,10 +102,96 @@ Future<bool?> _showGate(BuildContext context) {
 Future<PromoCodeResult?> _showForm(
   BuildContext context, {
   Future<PromoValidation> Function(String)? onValidate,
+  Future<bool> Function()? onRemove,
+  PromoCodeModel? initialPromo,
 }) {
-  return ItvioPromoCodeModal.show(context, onValidate: onValidate);
+  return ItvioPromoCodeModal.show(
+    context,
+    onValidate: onValidate,
+    onRemove: onRemove,
+    initialPromo: initialPromo,
+  );
 }
 
 Future<void> _showSbp(BuildContext context, {required int planId}) {
   return showSbpBanksBottomSheet(context, planId: planId);
 }
+
+Future<PromoValidateResponse> _defaultValidatePromo({
+  required int planId,
+  required String promoCode,
+}) {
+  return sl<PaymentRepository>().validatePromoCode(
+    planId: planId,
+    promoCode: promoCode,
+  );
+}
+
+Future<PromoApplyResponse> _defaultApplyPromo({
+  required int planId,
+  required String promoCode,
+}) {
+  return sl<PaymentRepository>().applyPromoCode(
+    planId: planId,
+    promoCode: promoCode,
+  );
+}
+
+Future<PromoCodeModel?> _defaultFindApplied(int planId) {
+  return sl<PaymentRepository>().findAppliedPromoForPlan(planId);
+}
+
+Future<bool> _defaultRemovePromo(int planId) async {
+  try {
+    final response = await sl<PaymentRepository>().removePromoCode(planId: planId);
+    if (response.success) return true;
+    showErrorToast(response.error ?? 'Не удалось убрать промокод.');
+    return false;
+  } catch (_) {
+    showErrorToast('Не удалось убрать промокод. Попробуйте позже');
+    return false;
+  }
+}
+
+Future<PromoValidation> _mapValidateResponse(
+  Future<PromoValidateResponse> request,
+) async {
+  try {
+    final response = await request;
+    if (!response.valid) {
+      return PromoValidation.failure(
+        response.error ?? 'Промокод невалиден.',
+      );
+    }
+    return PromoValidation.success(
+      discountPercent: response.discountPercent,
+      discountAmountRub: response.discountAmountRub,
+      originalAmountRub: response.originalAmountRub,
+      finalAmountRub: response.finalAmountRub,
+    );
+  } catch (_) {
+    return const PromoValidation.failure(
+      'Не удалось проверить промокод. Попробуйте позже',
+    );
+  }
+}
+
+Future<bool> _tryApplyPromo({
+  required Future<PromoApplyResponse> Function({
+    required int planId,
+    required String promoCode,
+  }) apply,
+  required int planId,
+  required String promoCode,
+}) async {
+  try {
+    final response = await apply(planId: planId, promoCode: promoCode);
+    if (response.success) return true;
+
+    showErrorToast(response.error ?? 'Не удалось применить промокод.');
+    return false;
+  } catch (_) {
+    showErrorToast('Не удалось применить промокод. Попробуйте позже');
+    return false;
+  }
+}
diff --git a/lib/features/payment/presentation/widgets/promo_code_modal.dart b/lib/features/payment/presentation/widgets/promo_code_modal.dart
index 0d4a9942..7de3eecf 100644
--- a/lib/features/payment/presentation/widgets/promo_code_modal.dart
+++ b/lib/features/payment/presentation/widgets/promo_code_modal.dart
@@ -1,45 +1,87 @@
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
+import 'package:eatvio_app/features/payment/models/promo_code_model.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 
 /// Результат работы модалки промокода.
 class PromoCodeResult {
-  const PromoCodeResult({this.code});
+  const PromoCodeResult({
+    this.code,
+    this.discountPercent,
+    this.discountAmountRub,
+    this.originalAmountRub,
+    this.finalAmountRub,
+    this.alreadyApplied = false,
+  });
 
   /// Применённый промокод или null, если пользователь продолжил без него.
   final String? code;
+  final int? discountPercent;
+  final double? discountAmountRub;
+  final double? originalAmountRub;
+  final double? finalAmountRub;
+
+  /// true — промокод уже на сервере (rehydrate Continue), apply не нужен.
+  final bool alreadyApplied;
 
   bool get hasPromoCode => code != null;
 }
 
 /// Ответ проверки промокода.
 class PromoValidation {
-  const PromoValidation.success() : error = null;
-  const PromoValidation.failure(this.error);
+  const PromoValidation.success({
+    this.discountPercent,
+    this.discountAmountRub,
+    this.originalAmountRub,
+    this.finalAmountRub,
+  }) : error = null;
+
+  const PromoValidation.failure(this.error)
+      : discountPercent = null,
+        discountAmountRub = null,
+        originalAmountRub = null,
+        finalAmountRub = null;
 
   final String? error;
+  final int? discountPercent;
+  final double? discountAmountRub;
+  final double? originalAmountRub;
+  final double? finalAmountRub;
 
   bool get isValid => error == null;
 }
 
-/// Модальное окно ввода промокода.
+/// Модальное окно ввода / просмотра применённого промокода.
 class ItvioPromoCodeModal extends StatefulWidget {
-  const ItvioPromoCodeModal({super.key, this.onValidate});
+  const ItvioPromoCodeModal({
+    super.key,
+    this.onValidate,
+    this.onRemove,
+    this.initialPromo,
+  });
 
   final Future<PromoValidation> Function(String code)? onValidate;
+  final Future<bool> Function()? onRemove;
+  final PromoCodeModel? initialPromo;
 
   static Future<PromoCodeResult?> show(
     BuildContext context, {
     Future<PromoValidation> Function(String code)? onValidate,
+    Future<bool> Function()? onRemove,
+    PromoCodeModel? initialPromo,
   }) {
     return showModalBottomSheet<PromoCodeResult>(
       context: context,
       isScrollControlled: true,
       useSafeArea: true,
       backgroundColor: Colors.transparent,
-      builder: (_) => ItvioPromoCodeModal(onValidate: onValidate),
+      builder: (_) => ItvioPromoCodeModal(
+        onValidate: onValidate,
+        onRemove: onRemove,
+        initialPromo: initialPromo,
+      ),
     );
   }
 
@@ -47,14 +89,32 @@ class ItvioPromoCodeModal extends StatefulWidget {
   State<ItvioPromoCodeModal> createState() => _ItvioPromoCodeModalState();
 }
 
-enum _ModalState { input, loading }
+enum _ModalState { input, loading, applied }
 
 class _ItvioPromoCodeModalState extends State<ItvioPromoCodeModal> {
   final _controller = TextEditingController();
   final _focusNode = FocusNode();
 
-  _ModalState _state = _ModalState.input;
+  late _ModalState _state;
   String? _errorText;
+  int? _discountPercent;
+  double? _discountAmountRub;
+  String? _appliedCode;
+
+  @override
+  void initState() {
+    super.initState();
+    final initial = widget.initialPromo;
+    if (initial != null) {
+      _state = _ModalState.applied;
+      _appliedCode = initial.promoCode;
+      _discountPercent = initial.discountPercent;
+      _discountAmountRub = initial.discountAmountRub;
+      _controller.text = initial.promoCode;
+    } else {
+      _state = _ModalState.input;
+    }
+  }
 
   @override
   void dispose() {
@@ -98,7 +158,62 @@ class _ItvioPromoCodeModalState extends State<ItvioPromoCodeModal> {
       return;
     }
 
-    Navigator.of(context).pop(PromoCodeResult(code: code));
+    Navigator.of(context).pop(
+      PromoCodeResult(
+        code: code,
+        discountPercent: validation.discountPercent,
+        discountAmountRub: validation.discountAmountRub,
+        originalAmountRub: validation.originalAmountRub,
+        finalAmountRub: validation.finalAmountRub,
+      ),
+    );
+  }
+
+  void _onContinueApplied() {
+    Navigator.of(context).pop(
+      PromoCodeResult(
+        code: _appliedCode,
+        discountPercent: _discountPercent,
+        discountAmountRub: _discountAmountRub,
+        alreadyApplied: true,
+      ),
+    );
+  }
+
+  Future<void> _onRemove() async {
+    setState(() {
+      _state = _ModalState.loading;
+      _errorText = null;
+    });
+
+    var success = true;
+    try {
+      if (widget.onRemove != null) {
+        success = await widget.onRemove!();
+      }
+    } catch (_) {
+      success = false;
+    }
+
+    if (!mounted) return;
+
+    if (!success) {
+      setState(() {
+        _state = _ModalState.applied;
+        _errorText = S.of(context).promo_remove_failed;
+      });
+      return;
+    }
+
+    setState(() {
+      _state = _ModalState.input;
+      _appliedCode = null;
+      _discountPercent = null;
+      _discountAmountRub = null;
+      _errorText = null;
+      _controller.clear();
+    });
+    _focusNode.requestFocus();
   }
 
   void _onSkip() {
@@ -107,6 +222,10 @@ class _ItvioPromoCodeModalState extends State<ItvioPromoCodeModal> {
 
   bool get _isLoading => _state == _ModalState.loading;
 
+  /// Applied UI while loading remove (state=loading, but promo still shown).
+  bool get _isApplied =>
+      _appliedCode != null && _state != _ModalState.input;
+
   @override
   Widget build(BuildContext context) {
     final bottomInset = MediaQuery.of(context).viewInsets.bottom;
@@ -127,40 +246,51 @@ class _ItvioPromoCodeModalState extends State<ItvioPromoCodeModal> {
           children: [
             const Center(child: BottomSheetHandlerBar()),
             const SizedBox(height: 16),
-            _buildHeader(),
+            _buildHeader(s),
+            if (_isApplied) ...[
+              const SizedBox(height: 6),
+              Text(
+                s.promo_applied_subtitle,
+                style: const TextStyle(fontSize: 14, color: Color(0xFF6B7684)),
+              ),
+            ],
             const SizedBox(height: 16),
-            const Text(
-              'Промокод',
-              style: TextStyle(
+            Text(
+              s.promo_code,
+              style: const TextStyle(
                 fontSize: 13,
                 color: Color(0xFF6B7684),
               ),
             ),
             const SizedBox(height: 8),
-            _buildField(),
+            _buildField(s),
             const SizedBox(height: 8),
-            _buildHint(),
+            _buildHint(s),
             const SizedBox(height: 12),
-            _buildApplyButton(s),
-            const SizedBox(height: 6),
-            _buildSkipButton(s),
+            if (_isApplied) ...[
+              _buildContinueButton(s),
+              const SizedBox(height: 6),
+              _buildRemoveButton(s),
+            ] else ...[
+              _buildApplyButton(s),
+              const SizedBox(height: 6),
+              _buildSkipButton(s),
+            ],
           ],
         ),
       ),
     );
   }
 
-  Widget _buildHeader() {
-    final s = S.of(context);
+  Widget _buildHeader(S s) {
     return Text(
-      s.have_promo_code_form,
+      _isApplied ? s.promo_applied_title : s.have_promo_code_form,
       style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
     );
   }
 
-  Widget _buildField() {
-    final hasError = _errorText != null;
-    final s = S.of(context);
+  Widget _buildField(S s) {
+    final hasError = _errorText != null && !_isApplied;
 
     return AnimatedContainer(
       duration: const Duration(milliseconds: 150),
@@ -171,7 +301,7 @@ class _ItvioPromoCodeModalState extends State<ItvioPromoCodeModal> {
           width: 2,
           color: hasError
               ? appTheme.red
-              : (_focusNode.hasFocus
+              : (_focusNode.hasFocus && !_isApplied
                   ? appTheme.blueA400
                   : Colors.transparent),
         ),
@@ -182,14 +312,16 @@ class _ItvioPromoCodeModalState extends State<ItvioPromoCodeModal> {
             child: TextField(
               controller: _controller,
               focusNode: _focusNode,
-              enabled: !_isLoading,
+              enabled: !_isLoading && !_isApplied,
               textCapitalization: TextCapitalization.characters,
               onChanged: (_) {
                 if (_errorText != null) {
                   setState(() => _errorText = null);
                 }
               },
-              onSubmitted: (_) => _apply(),
+              onSubmitted: (_) {
+                if (!_isApplied) _apply();
+              },
               decoration: InputDecoration(
                 hintText: s.enter_promo_code,
                 hintStyle: const TextStyle(
@@ -202,9 +334,11 @@ class _ItvioPromoCodeModalState extends State<ItvioPromoCodeModal> {
                   vertical: 14,
                 ),
               ),
-              style: const TextStyle(
+              style: TextStyle(
                 fontSize: 15,
-                color: Color(0xFF24303F),
+                color: _isApplied
+                    ? const Color(0xFF6B7684)
+                    : const Color(0xFF24303F),
               ),
             ),
           ),
@@ -213,13 +347,17 @@ class _ItvioPromoCodeModalState extends State<ItvioPromoCodeModal> {
     );
   }
 
-  Widget _buildHint() {
+  Widget _buildHint(S s) {
     final String text;
     final Color color;
 
     if (_errorText != null) {
       text = _errorText!;
       color = appTheme.red;
+    } else if (_isApplied && _discountPercent != null) {
+      final amount = (_discountAmountRub ?? 0).toStringAsFixed(0);
+      text = s.promo_discount_hint(_discountPercent!, amount);
+      color = const Color(0xFF27A06B);
     } else {
       text = '';
       color = Colors.transparent;
@@ -264,6 +402,50 @@ class _ItvioPromoCodeModalState extends State<ItvioPromoCodeModal> {
     );
   }
 
+  Widget _buildContinueButton(S s) {
+    return SizedBox(
+      height: 50,
+      child: FilledButton(
+        onPressed: _isLoading ? null : _onContinueApplied,
+        style: FilledButton.styleFrom(
+          backgroundColor: appTheme.blueA400,
+          foregroundColor: appTheme.whiteA700,
+          disabledBackgroundColor: appTheme.blueA400.withValues(alpha: 0.55),
+          shape: const StadiumBorder(),
+          textStyle: const TextStyle(
+            fontSize: 15,
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+        child: Text(s.continue_),
+      ),
+    );
+  }
+
+  Widget _buildRemoveButton(S s) {
+    return SizedBox(
+      height: 46,
+      child: TextButton(
+        onPressed: _isLoading ? null : _onRemove,
+        style: TextButton.styleFrom(
+          foregroundColor: appTheme.blueA400,
+          shape: const StadiumBorder(),
+          textStyle: const TextStyle(fontSize: 14),
+        ),
+        child: _isLoading
+            ? SizedBox(
+                width: 20,
+                height: 20,
+                child: CircularProgressIndicator(
+                  strokeWidth: 2.5,
+                  color: appTheme.blueA400,
+                ),
+              )
+            : Text(s.promo_remove),
+      ),
+    );
+  }
+
   Widget _buildSkipButton(S s) {
     return SizedBox(
       height: 46,
diff --git a/lib/features/payment/repositories/payment_repository.dart b/lib/features/payment/repositories/payment_repository.dart
index 1d590e48..00d2ca75 100644
--- a/lib/features/payment/repositories/payment_repository.dart
+++ b/lib/features/payment/repositories/payment_repository.dart
@@ -1,5 +1,11 @@
+import 'package:dio/dio.dart';
 import 'package:eatvio_app/features/chat/models/payment_model.dart';
 import 'package:eatvio_app/features/chat/services/chat_service.dart';
+import 'package:eatvio_app/features/payment/models/promo_applied_list_response.dart';
+import 'package:eatvio_app/features/payment/models/promo_apply_response.dart';
+import 'package:eatvio_app/features/payment/models/promo_code_model.dart';
+import 'package:eatvio_app/features/payment/models/promo_remove_response.dart';
+import 'package:eatvio_app/features/payment/models/promo_validate_response.dart';
 
 /// Репозиторий оплаты консультаций (chosen_plan) через Alfa Bank / СБП.
 class PaymentRepository {
@@ -15,4 +21,67 @@ class PaymentRepository {
       body: const {'payment_provider': 'alfa-bank'},
     );
   }
+
+  /// Список applied-промокодов текущего пользователя.
+  Future<PromoAppliedListResponse> listAppliedPromoCodes() {
+    return chatService.listAppliedPromoCodes();
+  }
+
+  /// Applied-промокод для конкретного chosen_plan, либо null (нет / ошибка сети).
+  Future<PromoCodeModel?> findAppliedPromoForPlan(int planId) async {
+    try {
+      final response = await listAppliedPromoCodes();
+      for (final promo in response.promoCodes) {
+        if (promo.chosenPlanId == planId && promo.state == 'applied') {
+          return promo;
+        }
+      }
+      return null;
+    } catch (_) {
+      return null;
+    }
+  }
+
+  /// Preview-валидация промокода без применения.
+  Future<PromoValidateResponse> validatePromoCode({
+    required int planId,
+    required String promoCode,
+  }) {
+    return chatService.validatePromoCode(
+      id: planId,
+      body: {'promo_code': promoCode},
+    );
+  }
+
+  /// Применяет промокод к chosen_plan. При HTTP 422 возвращает тело ответа.
+  Future<PromoApplyResponse> applyPromoCode({
+    required int planId,
+    required String promoCode,
+  }) async {
+    try {
+      return await chatService.applyPromoCode(
+        id: planId,
+        body: {'promo_code': promoCode},
+      );
+    } on DioException catch (e) {
+      final data = e.response?.data;
+      if (data is Map<String, dynamic>) {
+        return PromoApplyResponse.fromJson(data);
+      }
+      rethrow;
+    }
+  }
+
+  /// Удаляет применённый промокод (idempotent).
+  Future<PromoRemoveResponse> removePromoCode({required int planId}) async {
+    try {
+      return await chatService.removePromoCode(id: planId);
+    } on DioException catch (e) {
+      final data = e.response?.data;
+      if (data is Map<String, dynamic>) {
+        return PromoRemoveResponse.fromJson(data);
+      }
+      rethrow;
+    }
+  }
 }
diff --git a/lib/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart b/lib/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart
index db3bf384..2801c2b4 100644
--- a/lib/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart
+++ b/lib/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart
@@ -19,6 +19,9 @@ class ProfileCubit extends Cubit<ProfileState> {
   final ConsultantRepository consultantRepository;
   String _currentPeriod = '1';
 
+  /// Bottom-nav / own profile instance, used to refresh posts after create/update/delete.
+  static ProfileCubit? myProfileCubit;
+
   ProfileCubit({required this.profileRepository, required this.chatRepository, required this.consultantRepository}) : super(const ProfileState.loading());
 
   Future<void> getProfileBySlug(String slug) async {
@@ -49,6 +52,7 @@ class ProfileCubit extends Cubit<ProfileState> {
   }
 
   Future<void> getMyProfile({String period = '1'}) async {
+    myProfileCubit = this;
     emit(const ProfileState.loading());
     _currentPeriod = period;
     try {
@@ -74,6 +78,22 @@ class ProfileCubit extends Cubit<ProfileState> {
     }
   }
 
+  /// Reloads only the blog posts list without resetting the whole profile screen.
+  Future<void> reloadBlogPosts() async {
+    final currentState = state;
+    if (currentState is! ProfileStateLoaded) {
+      return;
+    }
+
+    try {
+      final blogPosts = await profileRepository.getBlogPostsByAuthorSlug(slug: currentState.profile.slug);
+      emit(currentState.copyWith(blogPosts: blogPosts));
+    } catch (e, st) {
+      await reportFrom(e, st, this);
+      log(e.toString(), stackTrace: st);
+    }
+  }
+
   void updateFeedBlogPostList(FeedBlogPostModel feedBlogPostModel, bool wasLikedByMe) {
     List<FeedBlogPostModel> feedBlogPostList = [...(state as ProfileStateLoaded).blogPosts];
     final int index = feedBlogPostList.indexOf(feedBlogPostModel);
diff --git a/lib/features/profile/presentation/pages/profile_screen.dart b/lib/features/profile/presentation/pages/profile_screen.dart
index 7d4359f8..c7dae0f5 100644
--- a/lib/features/profile/presentation/pages/profile_screen.dart
+++ b/lib/features/profile/presentation/pages/profile_screen.dart
@@ -436,8 +436,11 @@ class _ProfileScreenState extends State<ProfileScreen> {
       child: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
         child: InkWell(
-          onTap: () {
-            GoRouter.of(context).pushNamed('blogPostCreateScreen');
+          onTap: () async {
+            await GoRouter.of(context).pushNamed('blogPostCreateScreen');
+            if (mounted) {
+              await profileCubit.reloadBlogPosts();
+            }
           },
           borderRadius: BorderRadius.circular(8),
           child: Ink(
diff --git a/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart b/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart
index e0e5cd01..af70c9df 100644
--- a/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart
+++ b/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart
@@ -1,19 +1,21 @@
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:dismissible_page/dismissible_page.dart';
 import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/enums/complained_content.dart';
 import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
 import 'package:eatvio_app/core/widgets/custom_popup.dart';
 import 'package:eatvio_app/core/widgets/feed_icon_button.dart';
+import 'package:eatvio_app/core/widgets/markdown_html_widget.dart';
 import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
+import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_mapper.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
-import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/feed/presentation/widgets/blog_post_media_content.dart';
 import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
 import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_state.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:eatvio_app/core/widgets/markdown_html_widget.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:share_plus/share_plus.dart';
@@ -22,7 +24,11 @@ class ProfileBlogPostWidget extends StatefulWidget {
   final int index;
   final ProfileCubit profileCubit;
 
-  const ProfileBlogPostWidget({super.key, required this.index, required this.profileCubit});
+  const ProfileBlogPostWidget({
+    super.key,
+    required this.index,
+    required this.profileCubit,
+  });
 
   @override
   State<ProfileBlogPostWidget> createState() => _ProfileBlogPostWidgetState();
@@ -31,221 +37,289 @@ class ProfileBlogPostWidget extends StatefulWidget {
 class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
   late bool isLiked;
   late int totalLikes;
+  int currentGalleryIndex = 0;
+
+  void _openGallery(List<String> imageUrls, int index, {Object? heroTag}) {
+    context.pushTransparentRoute(
+      rootNavigator: true,
+      PhotoViewScreen(imageUrls: imageUrls, index: index, heroTag: heroTag),
+    );
+  }
 
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<ProfileCubit, ProfileState>(
       bloc: widget.profileCubit,
       builder: (BuildContext context, ProfileState state) {
-        if (state is ProfileStateLoaded) {
-          isLiked = state.blogPosts[widget.index].wasLikedByMe;
-          totalLikes = state.blogPosts[widget.index].totalLikes;
-          return InkWell(
-            borderRadius: BorderRadius.circular(12),
-            onTap: () => GoRouter.of(context).pushNamed('blogPostScreen', extra: state.blogPosts[widget.index].id),
-            child: Ink(
-              decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
+        if (state is! ProfileStateLoaded) {
+          return const SizedBox.shrink();
+        }
+
+        final FeedBlogPostModel post = state.blogPosts[widget.index];
+        isLiked = post.wasLikedByMe;
+        totalLikes = post.totalLikes;
+        final imageUrl = PostFeedMapper.resolveMediaUrl(post.image);
+        final embedUrl = post.videoEmbedUrl?.trim();
+
+        return InkWell(
+          borderRadius: BorderRadius.circular(12),
+          onTap: () =>
+              GoRouter.of(context).pushNamed('blogPostScreen', extra: post.id),
+          child: Ink(
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(12),
+              color: Colors.white,
+            ),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(height: 12),
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 12),
+                  child: Row(
+                    children: [
+                      CircleAvatar(
+                        radius: 20,
+                        backgroundColor: Colors.black12,
+                        foregroundImage: NetworkImage(
+                          post.author.authorProfileIcon.contains('https')
+                              ? post.author.authorProfileIcon
+                              : sl<AppConfig>().baseUrl +
+                                    post.author.authorProfileIcon,
+                        ),
+                        backgroundImage: const AssetImage(
+                          'assets/images/no_avatar.png',
+                        ),
+                      ),
+                      const SizedBox(width: 8),
+                      Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            post.author.authorName,
+                            style: const TextStyle(
+                              height: 1,
+                              color: Colors.black87,
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                          const SizedBox(height: 4),
+                          Text(
+                            '${calculateDifference(post.createdAt)} в ${post.createdAt.hour.toString().padLeft(2, '0')}:${post.createdAt.minute.toString().padLeft(2, '0')}',
+                            style: const TextStyle(
+                              height: 1,
+                              color: Colors.black45,
+                            ),
+                          ),
+                        ],
+                      ),
+                      const Spacer(),
+                      CustomPopup(
+                        isAuthor: post.author.authorIsMe,
+                        complainedContentType: ComplainedContent.posts,
+                        path: 'blog_post/${post.id}',
+                        id: post.id,
+                        feedBlogPostModel: post,
+                        userSlug: post.author.authorSlug,
+                        onPostsChanged: widget.profileCubit.reloadBlogPosts,
+                      ),
+                    ],
+                  ),
+                ),
+                if (post.title.isNotEmpty) ...[
                   const SizedBox(height: 12),
                   Padding(
                     padding: const EdgeInsets.symmetric(horizontal: 12),
-                    child: Row(
-                      children: [
-                        CircleAvatar(
-                          radius: 20,
-                          backgroundColor: Colors.black12,
-                          foregroundImage: NetworkImage(
-                            state.blogPosts[widget.index].author.authorProfileIcon.contains('https')
-                                ? state.blogPosts[widget.index].author.authorProfileIcon
-                                : sl<AppConfig>().baseUrl + state.blogPosts[widget.index].author.authorProfileIcon,
-                          ),
-                          backgroundImage: const AssetImage('assets/images/no_avatar.png'),
-                        ),
-                        const SizedBox(width: 8),
-                        Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Text(
-                              state.blogPosts[widget.index].author.authorName,
-                              style: const TextStyle(height: 1, color: Colors.black87, fontWeight: FontWeight.w500),
-                            ),
-                            const SizedBox(height: 4),
-                            Text(
-                              '${calculateDifference(state.blogPosts[widget.index].createdAt)} в ${state.blogPosts[widget.index].createdAt.hour.toString().padLeft(2, '0')}:${state.blogPosts[widget.index].createdAt.minute.toString().padLeft(2, '0')}',
-                              style: const TextStyle(height: 1, color: Colors.black45),
-                            ),
-                          ],
-                        ),
-                        const Spacer(),
-                        CustomPopup(
-                          isAuthor: state.blogPosts[widget.index].author.authorIsMe,
-                          complainedContentType: ComplainedContent.posts,
-                          path: 'blog_post/${(state.blogPosts[widget.index].id)}',
-                          id: state.blogPosts[widget.index].id,
-                          feedBlogPostModel: state.blogPosts[widget.index],
-                          userSlug: state.blogPosts[widget.index].author.authorSlug,
-                        ),
-                      ],
-                    ),
-                  ),
-                  if (state.blogPosts[widget.index].title.isNotEmpty) ...[
-                    const SizedBox(height: 12),
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 12),
-                      child: Text(
-                        state.blogPosts[widget.index].title,
-                        style: const TextStyle(fontWeight: FontWeight.w600, fontSize: 18, color: Colors.black87),
+                    child: Text(
+                      post.title,
+                      style: const TextStyle(
+                        fontWeight: FontWeight.w600,
+                        fontSize: 18,
+                        color: Colors.black87,
                       ),
                     ),
-                  ],
-                  if (state.blogPosts[widget.index].title.isEmpty) const SizedBox(height: 8),
-                  if (state.blogPosts[widget.index].title.isNotEmpty && state.blogPosts[widget.index].description.isNotEmpty) const SizedBox(height: 8),
-                  if (state.blogPosts[widget.index].description.isNotEmpty)
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 12),
-                      child: Builder(
-                        builder: (context) {
-                          String description = state.blogPosts[widget.index].description;
-                          final isLong = description.length > 200;
-                          
-                          if (isLong) {
-                            // Умная обрезка: обрезаем markdown текст, не ломая синтаксис
-                            int cutPoint = 200;
-                            
-                            // Проверяем, есть ли незакрытые markdown теги
-                            String preview = description.substring(0, cutPoint);
-                            
-                            // Считаем открывающие и закрывающие теги
-                            int boldOpen = (preview.split('**').length - 1) ~/ 2;
-                            int boldClose = preview.split('**').length - 1 - boldOpen * 2;
-                            bool hasUnclosedBold = boldOpen > boldClose;
-                            
-                            // Если есть незакрытый bold, ищем закрытие
-                            if (hasUnclosedBold) {
-                              int searchEnd = (cutPoint + 100).clamp(0, description.length);
-                              int boldClosePos = description.indexOf('**', cutPoint);
-                              if (boldClosePos != -1 && boldClosePos < searchEnd) {
-                                cutPoint = boldClosePos + 2;
-                              } else {
-                                // Если не нашли, обрезаем до последнего пробела
-                                cutPoint = description.lastIndexOf(' ', 200);
-                                if (cutPoint == -1 || cutPoint < 150) cutPoint = 200;
-                              }
-                            } else {
-                              // Обрезаем до последнего пробела для красоты
-                              cutPoint = description.lastIndexOf(' ', cutPoint);
-                              if (cutPoint == -1 || cutPoint < 150) cutPoint = 200;
-                            }
-                            
-                            description = description.substring(0, cutPoint);
-                          }
-
-                          return MarkdownHtmlWidget(
-                            markdownText: description,
-                            fontSize: 16,
-                            textColor: Colors.black87,
+                  ),
+                ],
+                if (post.title.isEmpty) const SizedBox(height: 8),
+                if (post.title.isNotEmpty && post.description.isNotEmpty)
+                  const SizedBox(height: 8),
+                if (post.description.isNotEmpty)
+                  Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 12),
+                    child: MarkdownHtmlWidget(
+                      markdownText: _truncateDescription(post.description),
+                      fontSize: 16,
+                      textColor: Colors.black87,
+                    ),
+                  ),
+                if (post.description.length > 200)
+                  const Padding(
+                    padding: EdgeInsets.symmetric(horizontal: 12),
+                    child: Text(
+                      'Показать ещё',
+                      style: TextStyle(
+                        height: 1,
+                        color: Color(0xFF8B8B8B),
+                        fontSize: 14,
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                  ),
+                if (post.title.isNotEmpty || post.description.isNotEmpty)
+                  const SizedBox(height: 8),
+                BlogPostMediaContent(
+                  galleryImages: post.images,
+                  imageUrl: imageUrl,
+                  videoEmbedUrl: embedUrl != null && embedUrl.isNotEmpty
+                      ? embedUrl
+                      : null,
+                  videoUrlThumb: post.videoUrlThumb != null
+                      ? PostFeedMapper.resolveMediaUrl(post.videoUrlThumb)
+                      : null,
+                  currentGalleryIndex: currentGalleryIndex,
+                  heroTag: 'profile-blog-post-${post.id}-cover',
+                  onOpenGallery: (urls, index) => _openGallery(
+                    urls,
+                    index,
+                    heroTag: urls.length == 1
+                        ? 'profile-blog-post-${post.id}-cover'
+                        : null,
+                  ),
+                  onGalleryChanged: (index) {
+                    setState(() {
+                      currentGalleryIndex = index;
+                    });
+                  },
+                ),
+                const SizedBox(height: 12),
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 12),
+                  child: Row(
+                    children: [
+                      FeedIconButton(
+                        icon: isLiked
+                            ? Icons.favorite_rounded
+                            : Icons.favorite_border_rounded,
+                        text: totalLikes.toString(),
+                        iconColor: isLiked
+                            ? Colors.red.withValues(alpha: 0.8)
+                            : null,
+                        backgroundColor: isLiked
+                            ? Colors.red.withValues(alpha: 0.1)
+                            : null,
+                        textColor: isLiked
+                            ? Colors.red.withValues(alpha: 0.8)
+                            : null,
+                        onTap: () async {
+                          setState(() {
+                            isLiked = !isLiked;
+                            isLiked ? totalLikes++ : totalLikes--;
+                          });
+                          isLiked
+                              ? await context.read<FeedCubit>().likePost(
+                                  post.id,
+                                )
+                              : await context.read<FeedCubit>().unlikedPost(
+                                  post.id,
+                                );
+                          widget.profileCubit.updateFeedBlogPostList(
+                            post,
+                            isLiked ? false : true,
                           );
                         },
                       ),
-                    ),
-                  if (state.blogPosts[widget.index].description.length > 200)
-                    const Padding(
-                      padding: EdgeInsets.symmetric(horizontal: 12),
-                      child: Text(
-                        'Показать ещё',
-                        style: TextStyle(height: 1, color: Color(0xFF8B8B8B), fontSize: 14, fontWeight: FontWeight.w600),
-                      ),
-                    ),
-                  if (state.blogPosts[widget.index].title.isNotEmpty || state.blogPosts[widget.index].description.isNotEmpty) const SizedBox(height: 8),
-                  GestureDetector(
-                    onTap: () {
-                      context.pushTransparentRoute(
-                        rootNavigator: true,
-                        PhotoViewScreen(imageUrls: ['${sl<AppConfig>().baseUrl}/storage/${state.blogPosts[widget.index].image}'], index: 0),
-                      );
-                    },
-                    child: Hero(
-                      tag: '${sl<AppConfig>().baseUrl}/storage/${state.blogPosts[widget.index].image}',
-                      child: CachedNetworkImage(
-                        fit: BoxFit.fitWidth,
-                        width: MediaQuery.of(context).size.width,
-                        imageUrl: '${sl<AppConfig>().baseUrl}/storage/${state.blogPosts[widget.index].image}',
-                        errorWidget: (context, str, object) => const SizedBox.shrink(),
-                      ),
-                    ),
-                  ),
-                  const SizedBox(height: 12),
-                  Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 12),
-                    child: Row(
-                      children: [
-                        FeedIconButton(
-                          icon: isLiked ? Icons.favorite_rounded : Icons.favorite_border_rounded,
-                          text: totalLikes.toString(),
-                          iconColor: isLiked ? Colors.red.withValues(alpha: 0.8) : null,
-                          backgroundColor: isLiked ? Colors.red.withValues(alpha: 0.1) : null,
-                          textColor: isLiked ? Colors.red.withValues(alpha: 0.8) : null,
-                          onTap: () async {
-                            setState(() {
-                              isLiked = !isLiked;
-                              isLiked ? totalLikes++ : totalLikes--;
-                            });
-                            isLiked
-                                ? await context.read<FeedCubit>().likePost(state.blogPosts[widget.index].id)
-                                : await context.read<FeedCubit>().unlikedPost(state.blogPosts[widget.index].id);
-                            widget.profileCubit.updateFeedBlogPostList(state.blogPosts[widget.index], isLiked ? false : true);
-                          },
-                        ),
-                        const SizedBox(width: 8),
-                        FeedIconButton(
-                          svgIcon: SvgPicture.asset(
-                            'assets/icons/comment.svg',
-                            height: 20,
-                            width: 20,
-                            colorFilter: ColorFilter.mode(appTheme.gray600, BlendMode.srcIn),
+                      const SizedBox(width: 8),
+                      FeedIconButton(
+                        svgIcon: SvgPicture.asset(
+                          'assets/icons/comment.svg',
+                          height: 20,
+                          width: 20,
+                          colorFilter: ColorFilter.mode(
+                            appTheme.gray600,
+                            BlendMode.srcIn,
                           ),
-                          text: state.blogPosts[widget.index].totalComments.toString(),
-                          onTap: () => GoRouter.of(context).pushNamed('blogPostScreen', extra: state.blogPosts[widget.index].id),
                         ),
-                        const SizedBox(width: 8),
-                        FeedIconButton(
-                          svgIcon: SvgPicture.asset(
-                            height: 20,
-                            width: 20,
-                            'assets/icons/share.svg',
-                            colorFilter: ColorFilter.mode(appTheme.gray600, BlendMode.srcIn),
+                        text: post.totalComments.toString(),
+                        onTap: () => GoRouter.of(
+                          context,
+                        ).pushNamed('blogPostScreen', extra: post.id),
+                      ),
+                      const SizedBox(width: 8),
+                      FeedIconButton(
+                        svgIcon: SvgPicture.asset(
+                          height: 20,
+                          width: 20,
+                          'assets/icons/share.svg',
+                          colorFilter: ColorFilter.mode(
+                            appTheme.gray600,
+                            BlendMode.srcIn,
                           ),
-                          onTap: () {
-                            final box = context.findRenderObject() as RenderBox?;
-                            SharePlus.instance.share(
-                              ShareParams(
-                                uri: Uri.parse('${sl<AppConfig>().baseUrl}/ru/blog_post/${state.blogPosts[widget.index].id}'),
-                                sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
+                        ),
+                        onTap: () {
+                          final box = context.findRenderObject() as RenderBox?;
+                          SharePlus.instance.share(
+                            ShareParams(
+                              uri: Uri.parse(
+                                '${sl<AppConfig>().baseUrl}/ru/blog_post/${post.id}',
                               ),
-                            );
-                          },
+                              sharePositionOrigin:
+                                  box!.localToGlobal(Offset.zero) & box.size,
+                            ),
+                          );
+                        },
+                      ),
+                      const Spacer(),
+                      Icon(
+                        Icons.visibility_rounded,
+                        size: 16,
+                        color: appTheme.gray500,
+                      ),
+                      const SizedBox(width: 4),
+                      Text(
+                        post.totalViews.toString(),
+                        style: TextStyle(
+                          fontSize: 12,
+                          color: appTheme.gray500,
+                          fontWeight: FontWeight.w400,
                         ),
-                        const Spacer(),
-                        Icon(Icons.visibility_rounded, size: 16, color: appTheme.gray500),
-                        const SizedBox(width: 4),
-                        Text(
-                          state.blogPosts[widget.index].totalViews.toString(),
-                          style: TextStyle(fontSize: 12, color: appTheme.gray500, fontWeight: FontWeight.w400),
-                        ),
-                      ],
-                    ),
+                      ),
+                    ],
                   ),
-                  const SizedBox(height: 8),
-                ],
-              ),
+                ),
+                const SizedBox(height: 8),
+              ],
             ),
-          );
-        }
-        return const SizedBox.shrink();
+          ),
+        );
       },
     );
   }
 }
+
+String _truncateDescription(String description) {
+  final isLong = description.length > 200;
+  if (!isLong) return description;
+
+  var cutPoint = 200;
+  final preview = description.substring(0, cutPoint);
+  final boldOpen = (preview.split('**').length - 1) ~/ 2;
+  final boldClose = preview.split('**').length - 1 - boldOpen * 2;
+  final hasUnclosedBold = boldOpen > boldClose;
+
+  if (hasUnclosedBold) {
+    final searchEnd = (cutPoint + 100).clamp(0, description.length);
+    final boldClosePos = description.indexOf('**', cutPoint);
+    if (boldClosePos != -1 && boldClosePos < searchEnd) {
+      cutPoint = boldClosePos + 2;
+    } else {
+      cutPoint = description.lastIndexOf(' ', 200);
+      if (cutPoint == -1 || cutPoint < 150) cutPoint = 200;
+    }
+  } else {
+    cutPoint = description.lastIndexOf(' ', cutPoint);
+    if (cutPoint == -1 || cutPoint < 150) cutPoint = 200;
+  }
+
+  return description.substring(0, cutPoint);
+}
diff --git a/lib/features/settings/presentation/pages/settings_screen.dart b/lib/features/settings/presentation/pages/settings_screen.dart
index db230482..a1b0acab 100644
--- a/lib/features/settings/presentation/pages/settings_screen.dart
+++ b/lib/features/settings/presentation/pages/settings_screen.dart
@@ -238,7 +238,10 @@ class _SettingsScreenState extends State<SettingsScreen> {
       return Padding(
         padding: const EdgeInsets.symmetric(horizontal: 16) + const EdgeInsets.only(bottom: 8),
         child: InkWell(
-          onTap: () => GoRouter.of(context).pushNamed('becomeConsultantScreen'),
+          onTap: () => GoRouter.of(context).pushNamed(
+            'becomeConsultantScreen',
+            extra: {'slug': state.profile.slug},
+          ),
           borderRadius: BorderRadius.circular(20),
           child: Ink(
             height: 52,
diff --git a/lib/features/user_details/presentation/widgets/expandable_bouble.dart b/lib/features/user_details/presentation/widgets/expandable_bouble.dart
index d0dde725..5689a563 100644
--- a/lib/features/user_details/presentation/widgets/expandable_bouble.dart
+++ b/lib/features/user_details/presentation/widgets/expandable_bouble.dart
@@ -15,17 +15,20 @@ class ExpandableBouble extends StatelessWidget {
       child: MainBackgroundBouble(
         child: Theme(
           data: Theme.of(context).copyWith(dividerColor: Colors.transparent),
-          child: ExpansionTile(
-            initiallyExpanded: initiallyExpanded,
-            expandedCrossAxisAlignment: CrossAxisAlignment.start,
-            expandedAlignment: Alignment.bottomLeft,
-            tilePadding: const EdgeInsets.symmetric(horizontal: 16),
-            childrenPadding: const EdgeInsets.symmetric(horizontal: 16),
-            title: Text(
-              title,
-              style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+          child: Material(
+            color: Colors.transparent,
+            child: ExpansionTile(
+              initiallyExpanded: initiallyExpanded,
+              expandedCrossAxisAlignment: CrossAxisAlignment.start,
+              expandedAlignment: Alignment.bottomLeft,
+              tilePadding: const EdgeInsets.symmetric(horizontal: 16),
+              childrenPadding: const EdgeInsets.symmetric(horizontal: 16),
+              title: Text(
+                title,
+                style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+              ),
+              children: children,
             ),
-            children: children,
           ),
         ),
       ),
diff --git a/lib/features/video_calls/managers/video_call_manager.dart b/lib/features/video_calls/managers/video_call_manager.dart
new file mode 100644
index 00000000..12832204
--- /dev/null
+++ b/lib/features/video_calls/managers/video_call_manager.dart
@@ -0,0 +1,1139 @@
+import 'dart:async';
+
+import 'package:eatvio_app/core/app_router.dart';
+import 'package:eatvio_app/core/device/device_hw_id_provider.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
+import 'package:eatvio_app/features/video_calls/managers/video_call_manager_snapshot.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_audio_session_coordinator.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_foreground_coordinator.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_lifecycle_binding.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_notification_navigator.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_task_handler.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_top_overlay.dart';
+import 'package:eatvio_app/features/video_calls/repositories/video_call_repository.dart';
+import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_foreground_task/flutter_foreground_task.dart';
+import 'package:livekit_client/livekit_client.dart' as lk;
+import 'package:permission_handler/permission_handler.dart';
+
+typedef VideoCallManagerListener = void Function(VideoCallManagerSnapshot snapshot);
+
+class VideoCallManager {
+  VideoCallManager({
+    required VideoCallRepository videoCallRepository,
+    ProfileRepository? profileRepository,
+    VideoCallForegroundCoordinator? foregroundCoordinator,
+    VideoCallLifecycleBinding? lifecycleBinding,
+    VideoCallAudioSessionCoordinator? audioSessionCoordinator,
+  }) : _videoCallRepository = videoCallRepository,
+       _profileRepository = profileRepository,
+       _foreground = foregroundCoordinator ?? VideoCallForegroundCoordinator(),
+       _lifecycleBinding = lifecycleBinding ?? VideoCallLifecycleBinding(),
+       _audioSession =
+           audioSessionCoordinator ?? VideoCallAudioSessionCoordinator() {
+    FlutterForegroundTask.addTaskDataCallback(_onForegroundTaskData);
+  }
+
+  final VideoCallRepository _videoCallRepository;
+  final ProfileRepository? _profileRepository;
+  final VideoCallForegroundCoordinator _foreground;
+  final VideoCallLifecycleBinding _lifecycleBinding;
+  final VideoCallAudioSessionCoordinator _audioSession;
+
+  static const lk.AudioCaptureOptions _micCaptureOptions =
+      lk.AudioCaptureOptions(stopAudioCaptureOnMute: false);
+  static const Duration _mutedMicPollInterval = Duration(milliseconds: 320);
+  static const Duration _mutedMicOverlayMinInterval = Duration(
+    milliseconds: 2600,
+  );
+  static const double _mutedMicAudioLevelThreshold = 0.008;
+  static const double _mutedMicEnergyDelta = 1e-6;
+
+  final List<VideoCallManagerListener> _listeners = [];
+
+  lk.Room? _room;
+  lk.EventsListener<lk.RoomEvent>? _roomEventsListener;
+  Timer? _mutedMicPollTimer;
+  DateTime? _lastMutedMicOverlayAt;
+  bool _recordingOverlayScheduled = false;
+  bool _mutedMicStatsInFlight = false;
+  num? _lastMutedMicTotalEnergy;
+  bool _liveKitDisposed = true;
+  bool _callEndedNotified = true;
+  final Set<String> _callAcceptNotifiedConversationUuids = {};
+  bool _callStageEntered = false;
+  bool _joinInProgress = false;
+  bool _counterpartJoinedNotified = false;
+  Future<void>? _roomConnectFuture;
+  String? _preparedWsUrl;
+  String? _preparedToken;
+  bool _videoEnabledBeforeBackground = false;
+  bool _videoPausedForBackground = false;
+  bool _abortingLiveKitAutoReconnect = false;
+  Future<String?>? _myProfileNameFuture;
+
+  VideoCallManagerSnapshot _snapshot = VideoCallManagerSnapshot.initial;
+
+  VideoCallManagerSnapshot get snapshot => _snapshot;
+  lk.Room? get room => _room;
+  bool get callStageEntered => _callStageEntered;
+  String get conversationUuid => _snapshot.conversationUuid;
+  String? get counterpartName => _snapshot.counterpartName;
+  String? get localParticipantName => _snapshot.localParticipantName;
+
+  bool get isActiveCall =>
+      _snapshot.connectPhase == VideoCallConnectPhase.connected &&
+      _callStageEntered &&
+      !_snapshot.linkIssue.needsManualReconnect &&
+      !_liveKitDisposed &&
+      _room != null;
+
+  void addListener(VideoCallManagerListener listener) {
+    if (!_listeners.contains(listener)) {
+      _listeners.add(listener);
+    }
+  }
+
+  void removeListener(VideoCallManagerListener listener) {
+    _listeners.remove(listener);
+  }
+
+  @visibleForTesting
+  void markActiveCallForTesting(lk.Room room) {
+    _room = room;
+    _liveKitDisposed = false;
+    _callStageEntered = true;
+    _ensureLifecycleAttached();
+    _emitSnapshot(
+      _snapshot.copyWith(
+        conversationUuid: 'test-uuid',
+        counterpartName: 'Test User',
+        connectPhase: VideoCallConnectPhase.connected,
+        linkIssue: VideoCallLinkIssue.none,
+        micEnabled: true,
+      ),
+    );
+  }
+
+  @visibleForTesting
+  bool get liveKitDisposedForTesting => _liveKitDisposed;
+
+  @visibleForTesting
+  bool get videoPausedForBackgroundForTesting => _videoPausedForBackground;
+
+  @visibleForTesting
+  void setCallStageEnteredForTesting(bool value) => _callStageEntered = value;
+
+  void dispose() {
+    FlutterForegroundTask.removeTaskDataCallback(_onForegroundTaskData);
+    _lifecycleBinding.detach();
+    _mutedMicPollTimer?.cancel();
+  }
+
+  void _notifyListeners() {
+    final snap = _snapshot;
+    for (final listener in List<VideoCallManagerListener>.from(_listeners)) {
+      listener(snap);
+    }
+  }
+
+  void _emitSnapshot(VideoCallManagerSnapshot snapshot) {
+    _snapshot = snapshot;
+    _notifyListeners();
+  }
+
+  BuildContext? get _navigatorContext => AppRouter.navigatorKey.currentContext;
+
+  bool _useFrontCamera = true;
+
+  void setUseFrontCamera(bool value) => _useFrontCamera = value;
+
+  lk.CameraCaptureOptions cameraCaptureOptions({
+    lk.CameraPosition? cameraPosition,
+  }) {
+    return lk.CameraCaptureOptions(
+      cameraPosition:
+          cameraPosition ??
+          (_useFrontCamera
+              ? lk.CameraPosition.front
+              : lk.CameraPosition.back),
+      params: lk.VideoParametersPresets.h1080_169,
+    );
+  }
+
+  Future<void> startCall({
+    required String conversationUuid,
+    String? counterpartName,
+    String? localParticipantName,
+    bool micEnabled = false,
+    bool videoEnabled = false,
+  }) async {
+    if (_room != null &&
+        !_liveKitDisposed &&
+        _snapshot.conversationUuid == conversationUuid) {
+      if (_callStageEntered &&
+          _room!.connectionState == lk.ConnectionState.connected) {
+        _emitSnapshot(
+          _snapshot.copyWith(
+            counterpartName: counterpartName ?? _snapshot.counterpartName,
+            localParticipantName:
+                localParticipantName ?? _snapshot.localParticipantName,
+          ),
+        );
+        _ensureLifecycleAttached();
+        unawaited(_startCallAudioSession());
+        return;
+      }
+      if (!_callStageEntered &&
+          _snapshot.connectPhase == VideoCallConnectPhase.connected &&
+          _preparedWsUrl != null &&
+          _preparedToken != null) {
+        _emitSnapshot(
+          _snapshot.copyWith(
+            counterpartName: counterpartName ?? _snapshot.counterpartName,
+            localParticipantName:
+                localParticipantName ?? _snapshot.localParticipantName,
+          ),
+        );
+        _ensureLifecycleAttached();
+        return;
+      }
+    }
+
+    await endCall();
+
+    _resetSessionFlagsForNewRoom();
+    _callEndedNotified = false;
+    _liveKitDisposed = false;
+    _callStageEntered = false;
+    _room = lk.Room(
+      roomOptions: const lk.RoomOptions(
+        adaptiveStream: true,
+        defaultCameraCaptureOptions: lk.CameraCaptureOptions(
+          params: lk.VideoParametersPresets.h1080_169,
+        ),
+        defaultAudioCaptureOptions: _micCaptureOptions,
+      ),
+    );
+    _attachRoomEventListeners();
+    _startMutedMicPollTimer();
+    _ensureLifecycleAttached();
+
+    final resolvedLocalName = await _resolveLocalParticipantName(
+      localParticipantName,
+    );
+
+    _emitSnapshot(
+      VideoCallManagerSnapshot(
+        conversationUuid: conversationUuid,
+        counterpartName: counterpartName,
+        localParticipantName: resolvedLocalName,
+        micEnabled: micEnabled,
+        videoEnabled: videoEnabled,
+        connectError: null,
+        connectPhase: VideoCallConnectPhase.connecting,
+        linkIssue: VideoCallLinkIssue.none,
+      ),
+    );
+
+    await _prepareLiveKitConnection();
+  }
+
+  Future<void> onCallScreenVisible({
+    required String conversationUuid,
+    String? counterpartName,
+    String? localParticipantName,
+    bool micEnabled = false,
+    bool videoEnabled = false,
+  }) async {
+    if (_snapshot.conversationUuid != conversationUuid ||
+        _room == null ||
+        _liveKitDisposed) {
+      await startCall(
+        conversationUuid: conversationUuid,
+        counterpartName: counterpartName,
+        localParticipantName: localParticipantName,
+        micEnabled: micEnabled,
+        videoEnabled: videoEnabled,
+      );
+    } else {
+      _emitSnapshot(
+        _snapshot.copyWith(
+          counterpartName: counterpartName ?? _snapshot.counterpartName,
+          localParticipantName:
+              localParticipantName ?? _snapshot.localParticipantName,
+        ),
+      );
+      if (_room?.connectionState == lk.ConnectionState.connected) {
+        unawaited(_ensureLocalParticipantNamePublished());
+        _syncRemoteParticipantNameFromRoom();
+      }
+    }
+  }
+
+  Future<bool> onEnterCallStage() async {
+    if (_callStageEntered) return true;
+    if (_joinInProgress) return false;
+    if (_snapshot.connectPhase != VideoCallConnectPhase.connected) return false;
+
+    _joinInProgress = true;
+    try {
+      await _ensureRoomConnected();
+      if (_liveKitDisposed) return false;
+
+      _callStageEntered = true;
+      await _publishLocalMedia();
+      if (_liveKitDisposed || !_callStageEntered) return false;
+      await _startForegroundIfPossible();
+      await _startCallAudioSession();
+      return true;
+    } catch (e) {
+      _emitSnapshot(
+        _snapshot.copyWith(
+          connectError: e.toString(),
+          linkIssue: VideoCallLinkIssue.lost,
+        ),
+      );
+      return false;
+    } finally {
+      _joinInProgress = false;
+    }
+  }
+
+  /// Joins the LiveKit room without publishing local media so the outgoing
+  /// caller can detect when the callee enters.
+  Future<void> ensureLobbyRoomJoined() async {
+    if (_callStageEntered || _joinInProgress || _liveKitDisposed) return;
+    if (_snapshot.connectPhase != VideoCallConnectPhase.connected) return;
+
+    final room = _room;
+    if (room != null && room.connectionState == lk.ConnectionState.connected) {
+      _notifyCounterpartIfPresent();
+      return;
+    }
+
+    try {
+      await _ensureRoomConnected();
+      if (!_liveKitDisposed) {
+        _notifyCounterpartIfPresent();
+      }
+    } catch (_) {}
+  }
+
+  Future<void> _ensureRoomConnected() async {
+    final room = _room;
+    if (room != null && room.connectionState == lk.ConnectionState.connected) {
+      return;
+    }
+
+    final pending = _roomConnectFuture;
+    if (pending != null) {
+      await pending;
+      return;
+    }
+
+    final run = _joinLiveKitRoom();
+    _roomConnectFuture = run;
+    try {
+      await run;
+    } finally {
+      if (identical(_roomConnectFuture, run)) {
+        _roomConnectFuture = null;
+      }
+    }
+  }
+
+  void _notifyCounterpartIfPresent() {
+    if (_callStageEntered || _counterpartJoinedNotified || _liveKitDisposed) {
+      return;
+    }
+    final room = _room;
+    if (room == null ||
+        room.connectionState != lk.ConnectionState.connected) {
+      return;
+    }
+    if (room.remoteParticipants.isEmpty) return;
+
+    _counterpartJoinedNotified = true;
+    _emitSnapshot(_snapshot.copyWith(counterpartPresentInLobby: true));
+  }
+
+  Future<void> retryAfterConnectionLoss() async {
+    if (_snapshot.conversationUuid.isEmpty) return;
+    _disposeRoomEphemerals();
+    await _disconnectLiveKitOnly();
+    _resetSessionFlagsForNewRoom();
+    _liveKitDisposed = false;
+    _callStageEntered = false;
+    _room = lk.Room(
+      roomOptions: const lk.RoomOptions(
+        adaptiveStream: true,
+        defaultCameraCaptureOptions: lk.CameraCaptureOptions(
+          params: lk.VideoParametersPresets.h1080_169,
+        ),
+        defaultAudioCaptureOptions: _micCaptureOptions,
+      ),
+    );
+    _attachRoomEventListeners();
+    _startMutedMicPollTimer();
+    _emitSnapshot(
+      _snapshot.copyWith(
+        connectPhase: VideoCallConnectPhase.connecting,
+        linkIssue: VideoCallLinkIssue.none,
+        connectError: null,
+      ),
+    );
+    await _prepareLiveKitConnection();
+  }
+
+  Future<void> endCall() async {
+    final uuid = _snapshot.conversationUuid;
+    _disposeRoomEphemerals();
+    await _disconnectLiveKitOnly();
+    if (!_callEndedNotified && uuid.isNotEmpty) {
+      _callEndedNotified = true;
+      try {
+        await _videoCallRepository.notifyCallEnded(uuid);
+      } catch (_) {}
+    }
+    await _foreground.stopOngoingCall();
+    await _stopCallAudioSession();
+    _lifecycleBinding.detach();
+    _callStageEntered = false;
+    _videoPausedForBackground = false;
+    _liveKitDisposed = true;
+    _myProfileNameFuture = null;
+    _emitSnapshot(VideoCallManagerSnapshot.initial);
+  }
+
+  /// Notifies backend that this device accepted an incoming call so ringing
+  /// stops on the user's other devices.
+  Future<void> notifyIncomingCallAccepted(String conversationUuid) async {
+    final uuid = conversationUuid.trim();
+    if (uuid.isEmpty) return;
+    if (_callAcceptNotifiedConversationUuids.contains(uuid)) return;
+
+    final hwId = (await DeviceHwIdProvider.current())?.trim();
+    if (hwId == null || hwId.length < 8) return;
+
+    _callAcceptNotifiedConversationUuids.add(uuid);
+    try {
+      await _videoCallRepository.notifyCallAccepted(
+        conversationUuid: uuid,
+        hwId: hwId,
+      );
+    } catch (_) {
+      _callAcceptNotifiedConversationUuids.remove(uuid);
+    }
+  }
+
+  /// Decline from incoming UI before joining the LiveKit room.
+  Future<void> declineIncomingCall(String conversationUuid) async {
+    final uuid = conversationUuid.trim();
+    if (uuid.isEmpty) {
+      await endCall();
+      return;
+    }
+
+    if (_snapshot.conversationUuid == uuid) {
+      await endCall();
+      return;
+    }
+
+    await endCall();
+    try {
+      await _videoCallRepository.notifyCallEnded(uuid);
+    } catch (_) {}
+  }
+
+  /// [currentUiEnabled] reflects what the user sees on the mic control
+  /// ([VideoCallSessionState.isMicActiveForUi]), not only stored intent.
+  Future<void> toggleMic(bool currentUiEnabled) async {
+    final next = !currentUiEnabled;
+    if (!_callStageEntered) {
+      _emitSnapshot(_snapshot.copyWith(micEnabled: next));
+      _lastMutedMicTotalEnergy = null;
+      return;
+    }
+    if (_liveKitDisposed ||
+        _room == null ||
+        _room!.connectionState != lk.ConnectionState.connected) {
+      _emitSnapshot(_snapshot.copyWith(micEnabled: next));
+      _lastMutedMicTotalEnergy = null;
+      return;
+    }
+    if (next) {
+      final granted = await _ensureMicrophonePermission();
+      if (!granted) return;
+    }
+    _emitSnapshot(_snapshot.copyWith(micEnabled: next));
+    _lastMutedMicTotalEnergy = null;
+    await _room!.localParticipant?.setMicrophoneEnabled(
+      next,
+      audioCaptureOptions: _micCaptureOptions,
+    );
+  }
+
+  Future<void> toggleVideo(bool currentEnabled) async {
+    final next = !currentEnabled;
+    if (!_callStageEntered) {
+      _emitSnapshot(_snapshot.copyWith(videoEnabled: next));
+      return;
+    }
+    if (_liveKitDisposed ||
+        _room == null ||
+        _room!.connectionState != lk.ConnectionState.connected) {
+      _emitSnapshot(_snapshot.copyWith(videoEnabled: next));
+      return;
+    }
+    if (next) {
+      final granted = await _ensureCameraPermission();
+      if (!granted) return;
+    }
+    _emitSnapshot(_snapshot.copyWith(videoEnabled: next));
+    final lp = _room!.localParticipant;
+    if (lp == null) return;
+    if (next && !_videoPausedForBackground) {
+      await lp.setCameraEnabled(
+        true,
+        cameraCaptureOptions: cameraCaptureOptions(),
+      );
+    } else if (!next) {
+      await lp.setCameraEnabled(false);
+    }
+  }
+
+  Future<void> switchCameraFacing(bool currentUseFront) async {
+    if (_liveKitDisposed ||
+        _room == null ||
+        _room!.connectionState != lk.ConnectionState.connected) {
+      _useFrontCamera = !currentUseFront;
+      return;
+    }
+
+    final currentPosition = currentUseFront
+        ? lk.CameraPosition.front
+        : lk.CameraPosition.back;
+    final newPosition = currentPosition.switched();
+    _useFrontCamera = newPosition == lk.CameraPosition.front;
+
+    final lp = _room!.localParticipant;
+    if (lp == null) return;
+
+    final pub = lp.getTrackPublicationBySource(lk.TrackSource.camera);
+    final track = pub?.track;
+    if (track is lk.LocalVideoTrack) {
+      try {
+        await track.setCameraPosition(newPosition);
+      } catch (_) {}
+      return;
+    }
+
+    try {
+      await lp.setCameraEnabled(
+        true,
+        cameraCaptureOptions: cameraCaptureOptions(
+          cameraPosition: newPosition,
+        ),
+      );
+    } catch (_) {}
+  }
+
+  void scheduleRecordingNoticeOnce() {
+    if (_recordingOverlayScheduled) return;
+    final ctx = _navigatorContext;
+    if (ctx == null) return;
+    final shown = VideoCallTopOverlay.insertBanner(
+      ctx,
+      message: S.of(ctx).video_call_recording_notice,
+      backgroundColor: appTheme.videoCallNoticeBannerBackground,
+      svgAsset: VideoCallTopOverlay.warningSvg,
+      autoRemoveAfter: const Duration(seconds: 3),
+    ).mounted;
+    if (shown) {
+      _recordingOverlayScheduled = true;
+    }
+  }
+
+  String resolvedLocalDisplayName() {
+    final fromSnapshot = _snapshot.localParticipantName?.trim();
+    if (fromSnapshot != null && fromSnapshot.isNotEmpty) return fromSnapshot;
+    final fromRoom = (_room?.localParticipant?.name ?? '').trim();
+    if (fromRoom.isNotEmpty) return fromRoom;
+    return '';
+  }
+
+  String resolvedRemoteDisplayName([String fallback = '']) {
+    final fromSnapshot = _snapshot.counterpartName?.trim();
+    if (fromSnapshot != null && fromSnapshot.isNotEmpty) return fromSnapshot;
+    final room = _room;
+    if (room != null) {
+      for (final participant in room.remoteParticipants.values) {
+        final name = participant.name.trim();
+        if (name.isNotEmpty) return name;
+      }
+    }
+    return fallback;
+  }
+
+  Future<String?> _resolveLocalParticipantName(String? hint) async {
+    final fromHint = hint?.trim();
+    if (fromHint != null && fromHint.isNotEmpty) return fromHint;
+    final fromSnapshot = _snapshot.localParticipantName?.trim();
+    if (fromSnapshot != null && fromSnapshot.isNotEmpty) return fromSnapshot;
+    return _fetchMyProfileName();
+  }
+
+  Future<String?> _fetchMyProfileName() async {
+    _myProfileNameFuture ??= _loadMyProfileName();
+    return _myProfileNameFuture;
+  }
+
+  Future<String?> _loadMyProfileName() async {
+    final repository = _profileRepository;
+    if (repository == null) return null;
+    try {
+      final name = (await repository.getMyProfile()).name.trim();
+      return name.isEmpty ? null : name;
+    } catch (_) {
+      return null;
+    }
+  }
+
+  Future<void> _ensureLocalParticipantNamePublished() async {
+    var name = _snapshot.localParticipantName?.trim();
+    if (name == null || name.isEmpty) {
+      name = await _resolveLocalParticipantName(null);
+      if (name != null && name.isNotEmpty) {
+        _emitSnapshot(_snapshot.copyWith(localParticipantName: name));
+      }
+    }
+    _applyLocalParticipantNameToLiveKit();
+  }
+
+  void _applyLocalParticipantNameToLiveKit() {
+    final name = _snapshot.localParticipantName?.trim();
+    if (name == null || name.isEmpty) return;
+    try {
+      _room?.localParticipant?.setName(name);
+    } catch (_) {}
+  }
+
+  void _syncRemoteParticipantNameFromRoom() {
+    if (_snapshot.counterpartName?.trim().isNotEmpty == true) return;
+    final room = _room;
+    if (room == null) return;
+    for (final participant in room.remoteParticipants.values) {
+      final name = participant.name.trim();
+      if (name.isEmpty) continue;
+      _emitSnapshot(_snapshot.copyWith(counterpartName: name));
+      return;
+    }
+  }
+
+  void _ensureLifecycleAttached() {
+    _lifecycleBinding.attach(_onAppLifecycleStateChanged);
+  }
+
+  void _onAppLifecycleStateChanged(AppLifecycleState state) {
+    switch (state) {
+      case AppLifecycleState.paused:
+      case AppLifecycleState.hidden:
+        unawaited(_onAppBackgrounded());
+      case AppLifecycleState.resumed:
+        unawaited(_onAppResumed());
+      case AppLifecycleState.detached:
+        if (isActiveCall) {
+          unawaited(_onAppBackgrounded());
+        }
+      case AppLifecycleState.inactive:
+        break;
+    }
+  }
+
+  Future<void> _onAppBackgrounded() async {
+    if (!isActiveCall) return;
+    await _startForegroundIfPossible();
+    await _pauseVideoForBackground();
+  }
+
+  Future<void> _onAppResumed() async {
+    if (!isActiveCall) return;
+    await _resumeVideoAfterForeground();
+  }
+
+  Future<void> _startForegroundIfPossible() async {
+    if (!isActiveCall) return;
+    final ctx = _navigatorContext;
+    final s = ctx != null ? S.of(ctx) : null;
+    final title =
+        resolvedRemoteDisplayName(
+          s?.video_call_counterpart_default ?? 'Call',
+        );
+    final body =
+        s?.video_call_notification_in_progress ?? 'Call in progress';
+    final endLabel = s?.video_call_notification_end ?? 'End call';
+    await _foreground.startOngoingCall(
+      conversationUuid: _snapshot.conversationUuid,
+      notificationTitle: title,
+      notificationBody: body,
+      endCallButtonLabel: endLabel,
+    );
+  }
+
+  Future<void> _pauseVideoForBackground() async {
+    if (_videoPausedForBackground) return;
+    _videoEnabledBeforeBackground = _snapshot.videoEnabled;
+    if (!_videoEnabledBeforeBackground) return;
+    final room = _room;
+    if (room == null || _liveKitDisposed) return;
+    try {
+      await room.localParticipant?.setCameraEnabled(false);
+      _videoPausedForBackground = true;
+    } catch (_) {}
+  }
+
+  Future<void> _resumeVideoAfterForeground() async {
+    if (!_videoPausedForBackground) return;
+    _videoPausedForBackground = false;
+    if (!_videoEnabledBeforeBackground) return;
+    final room = _room;
+    if (room == null || _liveKitDisposed) return;
+    if (!_snapshot.videoEnabled) return;
+    try {
+      await room.localParticipant?.setCameraEnabled(
+        true,
+        cameraCaptureOptions: cameraCaptureOptions(),
+      );
+    } catch (_) {}
+  }
+
+  void _onForegroundTaskData(Object data) {
+    if (data is! Map) return;
+    final action = data[videoCallForegroundTaskActionKey];
+    if (action == videoCallForegroundEndCallAction) {
+      unawaited(endCall());
+      return;
+    }
+    if (action == videoCallForegroundOpenAction) {
+      unawaited(
+        _foreground.readActiveConversationUuid().then((uuid) {
+          return VideoCallNotificationNavigator.openActiveCall(
+            conversationUuid: uuid,
+          );
+        }),
+      );
+    }
+  }
+
+  void _resetSessionFlagsForNewRoom() {
+    _lastMutedMicOverlayAt = null;
+    _lastMutedMicTotalEnergy = null;
+    _recordingOverlayScheduled = false;
+    _joinInProgress = false;
+    _counterpartJoinedNotified = false;
+    _roomConnectFuture = null;
+    _clearPreparedConnectionCredentials();
+    _callAcceptNotifiedConversationUuids.clear();
+    _emitSnapshot(
+      _snapshot.copyWith(
+        counterpartPresentInLobby: false,
+      ),
+    );
+  }
+
+  void _clearPreparedConnectionCredentials() {
+    _preparedWsUrl = null;
+    _preparedToken = null;
+  }
+
+  void _disposeRoomEphemerals() {
+    _mutedMicPollTimer?.cancel();
+    _mutedMicPollTimer = null;
+    final listener = _roomEventsListener;
+    _roomEventsListener = null;
+    if (listener != null) {
+      unawaited(listener.dispose());
+    }
+    VideoCallTopOverlay.hidePoorConnectionIcon();
+  }
+
+  void _startMutedMicPollTimer() {
+    _mutedMicPollTimer?.cancel();
+    _mutedMicPollTimer = Timer.periodic(_mutedMicPollInterval, (_) {
+      if (_liveKitDisposed || _mutedMicStatsInFlight) {
+        return;
+      }
+      if (_snapshot.micEnabled) {
+        return;
+      }
+      if (_room == null ||
+          _room!.connectionState != lk.ConnectionState.connected) {
+        return;
+      }
+      _mutedMicStatsInFlight = true;
+      unawaited(
+        _pollMutedMicFromWebRtcStats().whenComplete(() {
+          _mutedMicStatsInFlight = false;
+        }),
+      );
+    });
+  }
+
+  /// Stops LiveKit's built-in auto-reconnect and surfaces [VideoCallLinkIssue.lost]
+  /// so the user can retry manually from [VideoCallConnectionLostScreen].
+  Future<void> _abortLiveKitAutoReconnect() async {
+    if (_liveKitDisposed || _abortingLiveKitAutoReconnect) return;
+    if (_snapshot.connectPhase != VideoCallConnectPhase.connected) return;
+    if (_snapshot.linkIssue == VideoCallLinkIssue.lost) return;
+
+    _abortingLiveKitAutoReconnect = true;
+    try {
+      _emitSnapshot(_snapshot.copyWith(linkIssue: VideoCallLinkIssue.lost));
+      VideoCallTopOverlay.hidePoorConnectionIcon();
+      final room = _room;
+      if (room != null &&
+          room.connectionState != lk.ConnectionState.disconnected) {
+        try {
+          await room.disconnect();
+        } catch (_) {}
+      }
+    } finally {
+      _abortingLiveKitAutoReconnect = false;
+    }
+  }
+
+  void _attachRoomEventListeners() {
+    final room = _room;
+    if (room == null) return;
+    _roomEventsListener = room.createListener()
+      ..on<lk.RoomReconnectingEvent>((_) {
+        unawaited(_abortLiveKitAutoReconnect());
+      })
+      ..on<lk.RoomReconnectedEvent>((_) {
+        if (_snapshot.linkIssue.needsManualReconnect) return;
+        _emitSnapshot(_snapshot.copyWith(linkIssue: VideoCallLinkIssue.none));
+      })
+      ..on<lk.RoomDisconnectedEvent>((_) {
+        if (_liveKitDisposed) return;
+        if (_snapshot.connectPhase != VideoCallConnectPhase.connected) return;
+        _emitSnapshot(_snapshot.copyWith(linkIssue: VideoCallLinkIssue.lost));
+      })
+      ..on<lk.ParticipantConnectionQualityUpdatedEvent>((e) {
+        if (e.participant != room.localParticipant) return;
+        _syncPoorConnectionOverlay(e.connectionQuality);
+      })
+      ..on<lk.ActiveSpeakersChangedEvent>((e) {
+        if (_snapshot.micEnabled) return;
+        final lp = room.localParticipant;
+        if (lp == null) return;
+        if (e.speakers.any((p) => p.sid == lp.sid)) {
+          _maybeShowMutedMicOverlay();
+        }
+      })
+      ..on<lk.ParticipantConnectedEvent>((_) {
+        _notifyCounterpartIfPresent();
+        _syncRemoteParticipantNameFromRoom();
+      });
+  }
+
+  void _syncPoorConnectionOverlay(lk.ConnectionQuality q) {
+    if (_liveKitDisposed || !_callStageEntered) {
+      VideoCallTopOverlay.hidePoorConnectionIcon();
+      return;
+    }
+    final ctx = _navigatorContext;
+    if (ctx == null) return;
+    final bad =
+        q == lk.ConnectionQuality.poor || q == lk.ConnectionQuality.lost;
+    if (bad) {
+      VideoCallTopOverlay.showPoorConnectionIcon(ctx);
+    } else {
+      VideoCallTopOverlay.hidePoorConnectionIcon();
+    }
+  }
+
+  void _maybeShowMutedMicOverlay() {
+    if (_snapshot.micEnabled) return;
+    final ctx = _navigatorContext;
+    if (ctx == null) return;
+    final now = DateTime.now();
+    if (_lastMutedMicOverlayAt != null &&
+        now.difference(_lastMutedMicOverlayAt!) < _mutedMicOverlayMinInterval) {
+      return;
+    }
+    _lastMutedMicOverlayAt = now;
+    VideoCallTopOverlay.insertBanner(
+      ctx,
+      message: S.of(ctx).video_call_muted_mic_warning,
+      backgroundColor: appTheme.videoCallNoticeBannerBackground,
+      svgAsset: VideoCallTopOverlay.warningSvg,
+      autoRemoveAfter: const Duration(seconds: 2),
+    );
+  }
+
+  Future<void> _pollMutedMicFromWebRtcStats() async {
+    if (_liveKitDisposed || _snapshot.micEnabled) return;
+    final room = _room;
+    if (room == null || room.connectionState != lk.ConnectionState.connected) {
+      return;
+    }
+    final lp = room.localParticipant;
+    if (lp == null) return;
+    final pub = lp.getTrackPublicationBySource(lk.TrackSource.microphone);
+    final track = pub?.track;
+    if (track is! lk.LocalAudioTrack) return;
+    if (!track.muted) return;
+    try {
+      final stats = await track.getSenderStats();
+      if (_liveKitDisposed || _snapshot.micEnabled) return;
+      final src = stats?.audioSourceStats;
+      if (src == null) return;
+
+      final level = src.audioLevel;
+      if (level != null && level >= _mutedMicAudioLevelThreshold) {
+        _maybeShowMutedMicOverlay();
+        _lastMutedMicTotalEnergy = src.totalAudioEnergy;
+        return;
+      }
+
+      final energy = src.totalAudioEnergy;
+      if (energy != null) {
+        final prev = _lastMutedMicTotalEnergy;
+        if (prev != null && energy > prev + _mutedMicEnergyDelta) {
+          _maybeShowMutedMicOverlay();
+        }
+        _lastMutedMicTotalEnergy = energy;
+      }
+    } catch (_) {}
+  }
+
+  Future<void> _prepareLiveKitConnection() async {
+    final room = _room;
+    if (room == null) return;
+    _emitSnapshot(_snapshot.copyWith(connectError: null));
+    try {
+      final tokenResponse = await _videoCallRepository.getParticipantToken(
+        _snapshot.conversationUuid,
+      );
+      if (_liveKitDisposed) return;
+
+      _preparedWsUrl = tokenResponse.wsUrl;
+      _preparedToken = tokenResponse.token;
+
+      await room.prepareConnection(
+        tokenResponse.wsUrl,
+        tokenResponse.token,
+      );
+      if (_liveKitDisposed) return;
+
+      _emitSnapshot(
+        _snapshot.copyWith(
+          connectPhase: VideoCallConnectPhase.connected,
+          linkIssue: VideoCallLinkIssue.none,
+          clearConnectError: true,
+        ),
+      );
+    } catch (e) {
+      _clearPreparedConnectionCredentials();
+      _emitSnapshot(
+        _snapshot.copyWith(
+          connectError: e.toString(),
+          connectPhase: VideoCallConnectPhase.idle,
+          linkIssue: VideoCallLinkIssue.lost,
+        ),
+      );
+    }
+  }
+
+  Future<void> _joinLiveKitRoom() async {
+    final room = _room;
+    if (room == null) {
+      throw StateError('VideoCallManager: room is null');
+    }
+    if (room.connectionState == lk.ConnectionState.connected) return;
+
+    var wsUrl = _preparedWsUrl;
+    var token = _preparedToken;
+    if (wsUrl == null || token == null) {
+      final tokenResponse = await _videoCallRepository.getParticipantToken(
+        _snapshot.conversationUuid,
+      );
+      if (_liveKitDisposed) return;
+      wsUrl = tokenResponse.wsUrl;
+      token = tokenResponse.token;
+      _preparedWsUrl = wsUrl;
+      _preparedToken = token;
+    }
+
+    await room.connect(wsUrl, token);
+    if (_liveKitDisposed) return;
+
+    await _ensureLocalParticipantNamePublished();
+    _syncRemoteParticipantNameFromRoom();
+
+    _syncPoorConnectionOverlay(
+      room.localParticipant?.connectionQuality ??
+          lk.ConnectionQuality.unknown,
+    );
+  }
+
+  Future<void> _disconnectLiveKitOnly() async {
+    if (_room == null) return;
+    await _stopCallAudioSession();
+    _liveKitDisposed = true;
+    final room = _room!;
+    _room = null;
+    try {
+      if (room.connectionState != lk.ConnectionState.disconnected) {
+        await room.disconnect();
+      }
+    } catch (_) {}
+    try {
+      await room.dispose();
+    } catch (_) {}
+  }
+
+  bool _permissionNeedsSettings(PermissionStatus status) =>
+      status.isPermanentlyDenied || status.isRestricted;
+
+  Future<bool> _ensureCameraPermission() async {
+    final ctx = _navigatorContext;
+    if (ctx == null) return false;
+    var status = await Permission.camera.status;
+    if (status.isGranted) return true;
+    status = await Permission.camera.request();
+    if (status.isGranted) return true;
+    final ctx2 = _navigatorContext;
+    if (ctx2 == null || !ctx2.mounted) return false;
+    final s = S.of(ctx2);
+    if (!ctx2.mounted) return false;
+    await showErrorDialog(
+      ctx2,
+      title: s.video_call_permission_camera_title,
+      description: s.video_call_permission_camera_description,
+      buttonTitle: s.allowAccess,
+      needToOpenSettings: _permissionNeedsSettings(status),
+    );
+    return false;
+  }
+
+  Future<bool> _ensureMicrophonePermission() async {
+    final ctx = _navigatorContext;
+    if (ctx == null) return false;
+    var status = await Permission.microphone.status;
+    if (status.isGranted) return true;
+    status = await Permission.microphone.request();
+    if (status.isGranted) return true;
+    final ctx2 = _navigatorContext;
+    if (ctx2 == null || !ctx2.mounted) return false;
+    final s = S.of(ctx2);
+    if (!ctx2.mounted) return false;
+    await showErrorDialog(
+      ctx2,
+      title: s.video_call_permission_microphone_title,
+      description: s.video_call_permission_microphone_description,
+      buttonTitle: s.allowAccess,
+      needToOpenSettings: _permissionNeedsSettings(status),
+    );
+    return false;
+  }
+
+  bool get _canHandleCallAudio =>
+      _callStageEntered &&
+      !_liveKitDisposed &&
+      _room != null &&
+      _snapshot.connectPhase == VideoCallConnectPhase.connected;
+
+  Future<void> _publishLocalMedia() async {
+    if (_liveKitDisposed || !_callStageEntered) return;
+    final room = _room;
+    if (room == null || room.connectionState != lk.ConnectionState.connected) {
+      return;
+    }
+
+    var micOn = _snapshot.micEnabled;
+    var videoOn = _snapshot.videoEnabled;
+    if (micOn) {
+      final granted = await _ensureMicrophonePermission();
+      if (_liveKitDisposed || !_callStageEntered) return;
+      if (!granted) micOn = false;
+    }
+    if (videoOn) {
+      final granted = await _ensureCameraPermission();
+      if (_liveKitDisposed || !_callStageEntered) return;
+      if (!granted) videoOn = false;
+    }
+    if (micOn != _snapshot.micEnabled || videoOn != _snapshot.videoEnabled) {
+      _emitSnapshot(
+        _snapshot.copyWith(micEnabled: micOn, videoEnabled: videoOn),
+      );
+    }
+
+    final lp = room.localParticipant;
+    var effectiveMic = micOn;
+    var effectiveVideo = videoOn;
+
+    if (micOn) {
+      try {
+        await lp?.setMicrophoneEnabled(
+          true,
+          audioCaptureOptions: _micCaptureOptions,
+        );
+      } catch (_) {
+        effectiveMic = false;
+      }
+    } else {
+      try {
+        await lp?.setMicrophoneEnabled(
+          false,
+          audioCaptureOptions: _micCaptureOptions,
+        );
+      } catch (_) {}
+    }
+    if (_liveKitDisposed || !_callStageEntered) return;
+
+    if (videoOn && !_videoPausedForBackground) {
+      try {
+        await lp?.setCameraEnabled(
+          true,
+          cameraCaptureOptions: cameraCaptureOptions(),
+        );
+      } catch (_) {
+        effectiveVideo = false;
+      }
+    } else {
+      try {
+        await lp?.setCameraEnabled(false);
+      } catch (_) {}
+    }
+
+    if (effectiveMic != _snapshot.micEnabled ||
+        effectiveVideo != _snapshot.videoEnabled) {
+      _emitSnapshot(
+        _snapshot.copyWith(
+          micEnabled: effectiveMic,
+          videoEnabled: effectiveVideo,
+        ),
+      );
+    }
+    _lastMutedMicTotalEnergy = null;
+  }
+
+  Future<void> _startCallAudioSession() async {
+    if (!_canHandleCallAudio) return;
+    try {
+      await _audioSession.start();
+    } catch (_) {}
+  }
+
+  Future<void> _stopCallAudioSession() async {
+    try {
+      await _audioSession.stop();
+    } catch (_) {}
+  }
+}
\ No newline at end of file
diff --git a/lib/features/video_calls/managers/video_call_manager_snapshot.dart b/lib/features/video_calls/managers/video_call_manager_snapshot.dart
new file mode 100644
index 00000000..86a16070
--- /dev/null
+++ b/lib/features/video_calls/managers/video_call_manager_snapshot.dart
@@ -0,0 +1,59 @@
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+
+class VideoCallManagerSnapshot {
+  const VideoCallManagerSnapshot({
+    required this.conversationUuid,
+    this.counterpartName,
+    this.localParticipantName,
+    required this.micEnabled,
+    required this.videoEnabled,
+    this.connectError,
+    required this.connectPhase,
+    required this.linkIssue,
+    this.counterpartPresentInLobby = false,
+  });
+
+  final String conversationUuid;
+  final String? counterpartName;
+  final String? localParticipantName;
+  final bool micEnabled;
+  final bool videoEnabled;
+  final String? connectError;
+  final VideoCallConnectPhase connectPhase;
+  final VideoCallLinkIssue linkIssue;
+  final bool counterpartPresentInLobby;
+
+  static const initial = VideoCallManagerSnapshot(
+    conversationUuid: '',
+    micEnabled: false,
+    videoEnabled: false,
+    connectPhase: VideoCallConnectPhase.idle,
+    linkIssue: VideoCallLinkIssue.none,
+  );
+
+  VideoCallManagerSnapshot copyWith({
+    String? conversationUuid,
+    String? counterpartName,
+    String? localParticipantName,
+    bool? micEnabled,
+    bool? videoEnabled,
+    String? connectError,
+    VideoCallConnectPhase? connectPhase,
+    VideoCallLinkIssue? linkIssue,
+    bool? counterpartPresentInLobby,
+    bool clearConnectError = false,
+  }) {
+    return VideoCallManagerSnapshot(
+      conversationUuid: conversationUuid ?? this.conversationUuid,
+      counterpartName: counterpartName ?? this.counterpartName,
+      localParticipantName: localParticipantName ?? this.localParticipantName,
+      micEnabled: micEnabled ?? this.micEnabled,
+      videoEnabled: videoEnabled ?? this.videoEnabled,
+      connectError: clearConnectError ? null : (connectError ?? this.connectError),
+      connectPhase: connectPhase ?? this.connectPhase,
+      linkIssue: linkIssue ?? this.linkIssue,
+      counterpartPresentInLobby:
+          counterpartPresentInLobby ?? this.counterpartPresentInLobby,
+    );
+  }
+}
diff --git a/lib/features/video_calls/models/video_call_models.dart b/lib/features/video_calls/models/video_call_models.dart
index 7ab0a747..f344822d 100644
--- a/lib/features/video_calls/models/video_call_models.dart
+++ b/lib/features/video_calls/models/video_call_models.dart
@@ -35,3 +35,14 @@ abstract class VideoCallEndedResponse with _$VideoCallEndedResponse {
   factory VideoCallEndedResponse.fromJson(Map<String, Object?> json) =>
       _$VideoCallEndedResponseFromJson(json);
 }
+
+@freezed
+abstract class VideoCallAcceptResponse with _$VideoCallAcceptResponse {
+  const factory VideoCallAcceptResponse({
+    required bool sent,
+    @JsonKey(name: 'devices_notified') required int devicesNotified,
+  }) = _VideoCallAcceptResponse;
+
+  factory VideoCallAcceptResponse.fromJson(Map<String, Object?> json) =>
+      _$VideoCallAcceptResponseFromJson(json);
+}
diff --git a/lib/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart b/lib/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart
new file mode 100644
index 00000000..c35b9b34
--- /dev/null
+++ b/lib/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart
@@ -0,0 +1,599 @@
+import 'dart:async';
+
+import 'package:eatvio_app/core/cubit/base_cubit.dart';
+import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart';
+import 'package:eatvio_app/features/video_calls/managers/video_call_manager_snapshot.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_screen_wake_lock_coordinator.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_system_pip_coordinator.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:livekit_client/livekit_client.dart' as lk;
+import 'package:permission_handler/permission_handler.dart';
+
+class VideoCallSessionCubit extends BaseCubit<VideoCallSessionState> {
+  VideoCallSessionCubit({
+    required VideoCallManager videoCallManager,
+    VideoCallSystemPipCoordinator? systemPipCoordinator,
+    VideoCallScreenWakeLockCoordinator? screenWakeLockCoordinator,
+  }) : _videoCallManager = videoCallManager,
+       _systemPipCoordinator =
+           systemPipCoordinator ?? VideoCallSystemPipCoordinator(),
+       _screenWakeLock =
+           screenWakeLockCoordinator ?? VideoCallScreenWakeLockCoordinator(),
+       super(const VideoCallSessionState()) {
+    _videoCallManager.addListener(_onManagerSnapshot);
+    _syncFromManager(_videoCallManager.snapshot);
+  }
+
+  final VideoCallManager _videoCallManager;
+  final VideoCallSystemPipCoordinator _systemPipCoordinator;
+  final VideoCallScreenWakeLockCoordinator _screenWakeLock;
+  bool _callScreenRouteVisible = false;
+  bool _autoEnterInFlight = false;
+  bool _counterpartPresentWhenLobbyReady = false;
+  bool _sawEmptyLobbyWhenConnected = false;
+  bool _lobbyReadyTracked = false;
+  String? _lobbyReadyTrackedConversationUuid;
+  Future<void>? _autoEnterFuture;
+  Future<void>? _outgoingAutoEnterFuture;
+
+  lk.Room? get liveKitRoom => _videoCallManager.room;
+  bool get isCallScreenRouteVisible => _callScreenRouteVisible;
+
+  static bool _isCallSessionInactive(VideoCallManagerSnapshot snapshot) {
+    return snapshot.conversationUuid.isEmpty ||
+        snapshot.connectPhase == VideoCallConnectPhase.idle;
+  }
+
+  VideoCallSessionState _sessionStateFromSnapshot(
+    VideoCallManagerSnapshot snapshot,
+  ) {
+    final hideStaleConnectError =
+        snapshot.connectPhase == VideoCallConnectPhase.connected &&
+        !snapshot.linkIssue.needsManualReconnect;
+    final resetCallStage =
+        _isCallSessionInactive(snapshot) ||
+        snapshot.connectPhase == VideoCallConnectPhase.connecting;
+
+    return state.copyWith(
+      conversationUuid: snapshot.conversationUuid,
+      counterpartName: snapshot.counterpartName,
+      localParticipantName: snapshot.localParticipantName,
+      micEnabled: snapshot.micEnabled,
+      videoEnabled: snapshot.videoEnabled,
+      connectError: hideStaleConnectError ? null : snapshot.connectError,
+      connectPhase: snapshot.connectPhase,
+      linkIssue: snapshot.linkIssue,
+      callStageEntered: resetCallStage ? false : state.callStageEntered,
+      uiMode:
+          _isCallSessionInactive(snapshot)
+              ? VideoCallUiMode.hidden
+              : state.uiMode,
+    );
+  }
+
+  void _onManagerSnapshot(VideoCallManagerSnapshot snapshot) {
+    if (isClosed) return;
+    if (_isCallSessionInactive(snapshot)) {
+      unawaited(_systemPipCoordinator.disarm());
+      if (_callScreenRouteVisible) {
+        // [VideoCallManager.startCall] briefly emits idle while replacing the room.
+        return;
+      }
+      _resetLobbyReadyTracking();
+      emit(const VideoCallSessionState());
+      unawaited(_restoreSystemUiAfterCall());
+      return;
+    }
+    _trackLobbyReadyCounterpartPresence(snapshot);
+    final next = _sessionStateFromSnapshot(snapshot);
+    emit(next);
+    _scheduleAutoEnterIfNeeded(next);
+    _scheduleOutgoingAutoEnterIfNeeded(next, snapshot);
+  }
+
+  void _syncFromManager(VideoCallManagerSnapshot snapshot) {
+    if (_isCallSessionInactive(snapshot)) {
+      unawaited(_systemPipCoordinator.disarm());
+      if (_callScreenRouteVisible) return;
+      _resetLobbyReadyTracking();
+      emit(const VideoCallSessionState());
+      return;
+    }
+    _trackLobbyReadyCounterpartPresence(snapshot);
+    emit(_sessionStateFromSnapshot(snapshot));
+  }
+
+  void _resetLobbyReadyTracking() {
+    _lobbyReadyTrackedConversationUuid = null;
+    _counterpartPresentWhenLobbyReady = false;
+    _sawEmptyLobbyWhenConnected = false;
+    _lobbyReadyTracked = false;
+  }
+
+  void _trackLobbyReadyCounterpartPresence(VideoCallManagerSnapshot snapshot) {
+    final uuid = snapshot.conversationUuid;
+    if (uuid.isEmpty) {
+      _resetLobbyReadyTracking();
+      return;
+    }
+    if (snapshot.connectPhase != VideoCallConnectPhase.connected) return;
+
+    if (!_lobbyReadyTracked || _lobbyReadyTrackedConversationUuid != uuid) {
+      _lobbyReadyTracked = true;
+      _lobbyReadyTrackedConversationUuid = uuid;
+      _counterpartPresentWhenLobbyReady = snapshot.counterpartPresentInLobby;
+      _sawEmptyLobbyWhenConnected = !snapshot.counterpartPresentInLobby;
+      return;
+    }
+
+    if (_sawEmptyLobbyWhenConnected && snapshot.counterpartPresentInLobby) {
+      _counterpartPresentWhenLobbyReady = false;
+      _sawEmptyLobbyWhenConnected = false;
+    }
+  }
+
+  Future<void> _notifyIncomingCallAcceptedIfNeeded(String conversationUuid) {
+    return _videoCallManager.notifyIncomingCallAccepted(conversationUuid);
+  }
+
+  /// Синхронизирует UI-состояние после [VideoCallManager.endCall] из notification /
+  /// foreground task (без повторного disconnect).
+  Future<void> onCallEndedExternally() async {
+    await _onCallEndedExternally();
+  }
+
+  Future<void> _onCallEndedExternally() async {
+    if (isClosed) return;
+    await _systemPipCoordinator.disarm();
+    await _restoreSystemUiAfterCall();
+    emit(const VideoCallSessionState());
+  }
+
+  Future<void> startCall({
+    required String conversationUuid,
+    String? counterpartName,
+    String? localParticipantName,
+  }) async {
+    await _videoCallManager.startCall(
+      conversationUuid: conversationUuid,
+      counterpartName: counterpartName,
+      localParticipantName: localParticipantName,
+      micEnabled: state.micEnabled,
+      videoEnabled: state.videoEnabled,
+    );
+  }
+
+  Future<void> onCallScreenVisible({
+    required String conversationUuid,
+    String? counterpartName,
+    String? localParticipantName,
+    bool? counterpartIsConsultant,
+    VideoCallEntryMode entryMode = VideoCallEntryMode.outgoing,
+  }) async {
+    _callScreenRouteVisible = true;
+    await _screenWakeLock.acquire();
+
+    final effectiveEntryMode =
+        state.entryMode == VideoCallEntryMode.incomingAccepted ||
+            entryMode == VideoCallEntryMode.incomingAccepted
+        ? VideoCallEntryMode.incomingAccepted
+        : entryMode;
+    final isIncomingAccepted =
+        effectiveEntryMode == VideoCallEntryMode.incomingAccepted;
+    final isResumingActiveCall =
+        state.conversationUuid == conversationUuid &&
+        state.callStageEntered &&
+        _videoCallManager.room != null;
+    final isSameCallConnecting =
+        state.conversationUuid == conversationUuid &&
+        !state.callStageEntered &&
+        state.connectPhase != VideoCallConnectPhase.idle;
+
+    if (isIncomingAccepted && !isResumingActiveCall) {
+      unawaited(_notifyIncomingCallAcceptedIfNeeded(conversationUuid));
+    }
+
+    if (!isResumingActiveCall && !isSameCallConnecting) {
+      _resetLobbyReadyTracking();
+      await _systemPipCoordinator.disarm();
+    }
+
+    if (isSameCallConnecting) {
+      emit(
+        state.copyWith(
+          counterpartName: counterpartName ?? state.counterpartName,
+          localParticipantName:
+              localParticipantName ?? state.localParticipantName,
+          counterpartIsConsultant:
+              counterpartIsConsultant ?? state.counterpartIsConsultant,
+          entryMode: effectiveEntryMode,
+        ),
+      );
+      if (isIncomingAccepted) {
+        await _tryAutoEnterCallStage();
+      }
+      emit(state.copyWith(uiMode: VideoCallUiMode.fullscreen));
+      await _ensureSystemPipArmedIfInCall();
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        unawaited(_applyVideoCallSystemUi());
+      });
+      return;
+    }
+
+    if (isResumingActiveCall) {
+      await _videoCallManager.onCallScreenVisible(
+        conversationUuid: conversationUuid,
+        counterpartName: counterpartName,
+        localParticipantName: localParticipantName,
+        micEnabled: state.micEnabled,
+        videoEnabled: state.videoEnabled,
+      );
+      if (counterpartIsConsultant != null) {
+        emit(state.copyWith(counterpartIsConsultant: counterpartIsConsultant));
+      }
+    } else {
+      emit(
+        state.copyWith(
+          conversationUuid: conversationUuid,
+          counterpartName: counterpartName,
+          localParticipantName: localParticipantName,
+          counterpartIsConsultant: counterpartIsConsultant ?? false,
+          micEnabled: false,
+          videoEnabled: false,
+          callStageEntered: false,
+          connectError: null,
+          linkIssue: VideoCallLinkIssue.none,
+          connectPhase: VideoCallConnectPhase.connecting,
+          entryMode: effectiveEntryMode,
+        ),
+      );
+      await _videoCallManager.startCall(
+        conversationUuid: conversationUuid,
+        counterpartName: counterpartName,
+        localParticipantName: localParticipantName,
+        micEnabled: false,
+        videoEnabled: false,
+      );
+      emit(state.copyWith(entryMode: effectiveEntryMode));
+      if (isIncomingAccepted) {
+        await _tryAutoEnterCallStage();
+      }
+    }
+
+    emit(state.copyWith(uiMode: VideoCallUiMode.fullscreen));
+    await _ensureSystemPipArmedIfInCall();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      unawaited(_applyVideoCallSystemUi());
+    });
+  }
+
+  Future<void> _ensureSystemPipArmedIfInCall() async {
+    if (!_videoCallManager.isActiveCall) {
+      await _systemPipCoordinator.disarm();
+      return;
+    }
+    await _systemPipCoordinator.armAutoPipOnLeave();
+  }
+
+  void _scheduleAutoEnterIfNeeded(VideoCallSessionState sessionState) {
+    if (sessionState.entryMode != VideoCallEntryMode.incomingAccepted) return;
+    if (sessionState.callStageEntered) return;
+    if (sessionState.connectPhase != VideoCallConnectPhase.connected) return;
+    unawaited(_tryAutoEnterCallStage());
+  }
+
+  void _scheduleOutgoingAutoEnterIfNeeded(
+    VideoCallSessionState sessionState,
+    VideoCallManagerSnapshot snapshot,
+  ) {
+    if (!_callScreenRouteVisible) return;
+    if (sessionState.entryMode != VideoCallEntryMode.outgoing) return;
+    if (sessionState.callStageEntered) return;
+    if (sessionState.connectPhase != VideoCallConnectPhase.connected) return;
+
+    if (!snapshot.counterpartPresentInLobby) {
+      unawaited(_videoCallManager.ensureLobbyRoomJoined());
+      return;
+    }
+    unawaited(_tryAutoEnterWhenCounterpartJoins());
+  }
+
+  Future<void> _tryAutoEnterWhenCounterpartJoins() {
+    final pending = _outgoingAutoEnterFuture;
+    if (pending != null) return pending;
+
+    final run = _runOutgoingAutoEnterCallStage();
+    _outgoingAutoEnterFuture = run;
+    return run.whenComplete(() {
+      if (identical(_outgoingAutoEnterFuture, run)) {
+        _outgoingAutoEnterFuture = null;
+      }
+    });
+  }
+
+  Future<void> _runOutgoingAutoEnterCallStage() async {
+    if (isClosed || _autoEnterInFlight) return;
+    if (!_callScreenRouteVisible) return;
+    if (state.entryMode != VideoCallEntryMode.outgoing) return;
+    if (state.callStageEntered) return;
+    if (state.connectPhase != VideoCallConnectPhase.connected) return;
+
+    _autoEnterInFlight = true;
+    try {
+      await enterCallStage();
+    } finally {
+      _autoEnterInFlight = false;
+    }
+  }
+
+  Future<void> _tryAutoEnterCallStage() {
+    final pending = _autoEnterFuture;
+    if (pending != null) return pending;
+
+    final run = _runAutoEnterCallStage();
+    _autoEnterFuture = run;
+    return run.whenComplete(() {
+      if (identical(_autoEnterFuture, run)) {
+        _autoEnterFuture = null;
+      }
+    });
+  }
+
+  Future<void> _runAutoEnterCallStage() async {
+    if (isClosed || _autoEnterInFlight) return;
+    if (state.entryMode != VideoCallEntryMode.incomingAccepted) return;
+    if (state.callStageEntered) return;
+    if (state.connectPhase != VideoCallConnectPhase.connected) return;
+
+    _autoEnterInFlight = true;
+    try {
+      await _requestMicBeforeIncomingEnter();
+      await enterCallStage();
+    } finally {
+      _autoEnterInFlight = false;
+    }
+  }
+
+  /// After the loading/connect phase, request mic before joining the room.
+  Future<void> _requestMicBeforeIncomingEnter() async {
+    if (state.entryMode != VideoCallEntryMode.incomingAccepted) return;
+
+    final granted = await _requestMicPermissionForCall();
+    if (!granted || isClosed) return;
+
+    await _videoCallManager.toggleMic(state.isMicActiveForUi);
+    if (isClosed) return;
+    emit(state.copyWith(micEnabled: true));
+  }
+
+  @visibleForTesting
+  Future<bool> requestMicPermissionForCall() => _requestMicPermissionForCall();
+
+  Future<bool> _requestMicPermissionForCall() async {
+    try {
+      final status = await Permission.microphone.request();
+      return status.isGranted;
+    } catch (_) {
+      return false;
+    }
+  }
+
+  void onCallScreenDisposed() {
+    _callScreenRouteVisible = false;
+    if (state.uiMode != VideoCallUiMode.fullscreen) {
+      if (state.uiMode == VideoCallUiMode.pip && state.callStageEntered) {
+        // [isCallScreenRouteVisible] is not in bloc state; refresh the global
+        // PiP overlay after the call route is removed.
+        emit(state.copyWith());
+      }
+      return;
+    }
+    if (state.connectPhase == VideoCallConnectPhase.connected &&
+        !state.linkIssue.needsManualReconnect) {
+      if (state.callStageEntered) {
+        unawaited(minimizeToPip());
+      } else {
+        unawaited(endCall());
+      }
+    } else if (state.connectPhase == VideoCallConnectPhase.connecting) {
+      unawaited(endCall());
+    } else if (state.linkIssue.needsManualReconnect) {
+      unawaited(endCall());
+    }
+  }
+
+  bool get _canMinimizeToPip =>
+      state.connectPhase == VideoCallConnectPhase.connected &&
+      !state.linkIssue.needsManualReconnect &&
+      state.callStageEntered;
+
+  Future<void> _applyPipUiState() async {
+    emit(state.copyWith(uiMode: VideoCallUiMode.pip));
+    await _restoreSystemUiAfterCall();
+    await _ensureSystemPipArmedIfInCall();
+  }
+
+  /// Called when Android enters system PiP (e.g. Home gesture).
+  Future<void> syncPipUiStateFromSystem() async {
+    if (!_canMinimizeToPip) return;
+    if (state.uiMode == VideoCallUiMode.pip) return;
+    // Call screen already renders the in-call mini preview; enabling the global
+    // overlay here would duplicate PiP after returning from system PiP.
+    if (_callScreenRouteVisible) return;
+    await _applyPipUiState();
+  }
+
+  /// Re-applies immersive UI after Android system PiP while the call screen
+  /// route is still on the stack.
+  Future<void> onSystemPipExitedWithCallScreenVisible() async {
+    if (!_callScreenRouteVisible) return;
+    if (state.uiMode != VideoCallUiMode.fullscreen) return;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      unawaited(_applyVideoCallSystemUi());
+    });
+  }
+
+  Future<void> minimizeToPip() async {
+    if (!_canMinimizeToPip) return;
+    await _applyPipUiState();
+  }
+
+  Future<void> restoreFullscreenFromPip() async {
+    if (state.uiMode != VideoCallUiMode.pip) return;
+    emit(state.copyWith(uiMode: VideoCallUiMode.fullscreen));
+    unawaited(_ensureSystemPipArmedIfInCall());
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      unawaited(_applyVideoCallSystemUi());
+    });
+  }
+
+  Future<void> leaveCallRoute() async {
+    if (state.connectPhase == VideoCallConnectPhase.connected &&
+        !state.linkIssue.needsManualReconnect) {
+      if (state.callStageEntered) {
+        _callScreenRouteVisible = false;
+        await minimizeToPip();
+      } else {
+        await endCall();
+      }
+    } else {
+      await endCall();
+    }
+  }
+
+  void updateCounterpartIsConsultant(bool isConsultant) {
+    if (isClosed || state.counterpartIsConsultant == isConsultant) return;
+    emit(state.copyWith(counterpartIsConsultant: isConsultant));
+  }
+
+  Future<void> enterCallStage() async {
+    if (isClosed) return;
+    if (state.connectPhase != VideoCallConnectPhase.connected) return;
+    if (state.callStageEntered) return;
+
+    if (state.entryMode == VideoCallEntryMode.outgoing &&
+        _counterpartPresentWhenLobbyReady) {
+      unawaited(_notifyIncomingCallAcceptedIfNeeded(state.conversationUuid));
+    }
+
+    final entered = await _videoCallManager.onEnterCallStage();
+    if (!entered || isClosed) return;
+
+    emit(
+      state.copyWith(
+        callStageEntered: true,
+        splitParticipantView: false,
+        mainStageShowsLocalVideo: false,
+      ),
+    );
+    await _ensureSystemPipArmedIfInCall();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (isClosed) return;
+      _videoCallManager.scheduleRecordingNoticeOnce();
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (isClosed) return;
+        _videoCallManager.scheduleRecordingNoticeOnce();
+      });
+    });
+  }
+
+  Future<void> retryAfterConnectionLoss() async {
+    final entryMode = state.entryMode;
+    final wasInCallStage = state.callStageEntered;
+    await _videoCallManager.retryAfterConnectionLoss();
+    if (isClosed) return;
+    emit(state.copyWith(callStageEntered: false, entryMode: entryMode));
+    if (wasInCallStage &&
+        state.connectPhase == VideoCallConnectPhase.connected &&
+        !state.linkIssue.needsManualReconnect) {
+      await enterCallStage();
+    }
+  }
+
+  Future<void> endCall() async {
+    await _screenWakeLock.release();
+    await _systemPipCoordinator.disarm();
+    await _videoCallManager.endCall();
+  }
+
+  void expandLocal() {
+    emit(
+      state.copyWith(
+        splitParticipantView: false,
+        mainStageShowsLocalVideo: true,
+      ),
+    );
+  }
+
+  void expandRemote() {
+    emit(
+      state.copyWith(
+        splitParticipantView: false,
+        mainStageShowsLocalVideo: false,
+      ),
+    );
+  }
+
+  void shrinkToSplit() {
+    emit(state.copyWith(splitParticipantView: true));
+  }
+
+  void toggleStageSwap() {
+    emit(
+      state.copyWith(mainStageShowsLocalVideo: !state.mainStageShowsLocalVideo),
+    );
+  }
+
+  Future<void> toggleMic() async {
+    await _videoCallManager.toggleMic(state.isMicActiveForUi);
+  }
+
+  Future<void> toggleVideo() async {
+    await _videoCallManager.toggleVideo(state.videoEnabled);
+  }
+
+  Future<void> switchCameraFacing() async {
+    await _videoCallManager.switchCameraFacing(state.useFrontCamera);
+    emit(state.copyWith(useFrontCamera: !state.useFrontCamera));
+  }
+
+  Future<void> _applyVideoCallSystemUi() async {
+    try {
+      await SystemChrome.setPreferredOrientations(const [
+        DeviceOrientation.portraitUp,
+        DeviceOrientation.portraitDown,
+        DeviceOrientation.landscapeLeft,
+        DeviceOrientation.landscapeRight,
+      ]);
+      await SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
+    } on PlatformException catch (_) {
+      await SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+    }
+  }
+
+  Future<void> _restoreSystemUiAfterCall() async {
+    await _screenWakeLock.release();
+    try {
+      await SystemChrome.setPreferredOrientations(const <DeviceOrientation>[]);
+      await SystemChrome.setEnabledSystemUIMode(
+        SystemUiMode.manual,
+        overlays: SystemUiOverlay.values,
+      );
+    } on PlatformException catch (_) {}
+  }
+
+  String resolvedLocalDisplayName() =>
+      _videoCallManager.resolvedLocalDisplayName();
+
+  String resolvedRemoteDisplayName([String fallback = '']) =>
+      _videoCallManager.resolvedRemoteDisplayName(fallback);
+
+  @override
+  Future<void> close() async {
+    _videoCallManager.removeListener(_onManagerSnapshot);
+    await endCall();
+    return super.close();
+  }
+}
diff --git a/lib/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart b/lib/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart
new file mode 100644
index 00000000..28b7fabc
--- /dev/null
+++ b/lib/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart
@@ -0,0 +1,53 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'video_call_session_state.freezed.dart';
+
+enum VideoCallUiMode {
+  hidden,
+  fullscreen,
+  pip,
+}
+
+enum VideoCallConnectPhase { idle, connecting, connected }
+
+enum VideoCallLinkIssue { none, reconnecting, lost }
+
+extension VideoCallLinkIssueX on VideoCallLinkIssue {
+  /// True when the user must manually retry (lost link or LiveKit auto-reconnect).
+  bool get needsManualReconnect =>
+      this == VideoCallLinkIssue.lost || this == VideoCallLinkIssue.reconnecting;
+}
+
+/// How the user reached [VideoCallScreen].
+enum VideoCallEntryMode {
+  /// Outgoing call — connecting lobby; manual enter or auto-enter when callee joins.
+  outgoing,
+
+  /// Accepted incoming CallKit / VoIP / notification — loader then auto-enter.
+  incomingAccepted,
+}
+
+@freezed
+abstract class VideoCallSessionState with _$VideoCallSessionState {
+  const VideoCallSessionState._();
+
+  const factory VideoCallSessionState({
+    @Default('') String conversationUuid,
+    String? counterpartName,
+    @Default(false) bool counterpartIsConsultant,
+    String? localParticipantName,
+    @Default(false) bool micEnabled,
+    @Default(false) bool videoEnabled,
+    @Default(false) bool splitParticipantView,
+    @Default(false) bool mainStageShowsLocalVideo,
+    @Default(true) bool useFrontCamera,
+    String? connectError,
+    @Default(VideoCallUiMode.hidden) VideoCallUiMode uiMode,
+    @Default(VideoCallConnectPhase.idle) VideoCallConnectPhase connectPhase,
+    @Default(VideoCallLinkIssue.none) VideoCallLinkIssue linkIssue,
+    @Default(false) bool callStageEntered,
+    @Default(VideoCallEntryMode.outgoing) VideoCallEntryMode entryMode,
+  }) = _VideoCallSessionState;
+
+  bool get isMicActiveForUi => micEnabled;
+}
diff --git a/lib/features/video_calls/presentation/pages/video_call_screen.dart b/lib/features/video_calls/presentation/pages/video_call_screen.dart
index 327bdafd..76b3934d 100644
--- a/lib/features/video_calls/presentation/pages/video_call_screen.dart
+++ b/lib/features/video_calls/presentation/pages/video_call_screen.dart
@@ -2,24 +2,35 @@ import 'dart:async';
 
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
-import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/features/video_calls/repositories/video_call_repository.dart';
+import 'package:eatvio_app/core/websockets/ws_manager.dart';
+import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
+import 'package:eatvio_app/features/chat/utils/chat_counterpart_utils.dart';
+import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_connecting_entrance_screen.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_flow_placeholder_screens.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_stage_layout.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
-import 'package:livekit_client/livekit_client.dart' as lk;
-import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_stage_layout.dart';
-import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_top_overlay.dart';
-import 'package:permission_handler/permission_handler.dart';
 
 class VideoCallScreen extends StatefulWidget {
   const VideoCallScreen({
     super.key,
     required this.conversationUuid,
     this.counterpartName,
+    this.counterpartAvatarUrl,
+    this.counterpartUserId,
+    this.counterpartIsOnline,
+    this.counterpartLastSeenText,
+    this.counterpartIsConsultant,
     this.localParticipantName,
+    this.entryMode = VideoCallEntryMode.outgoing,
     this.onBackToChat,
     this.onHangUp,
   });
@@ -29,7 +40,13 @@ class VideoCallScreen extends StatefulWidget {
 
   final String conversationUuid;
   final String? counterpartName;
+  final String? counterpartAvatarUrl;
+  final int? counterpartUserId;
+  final bool? counterpartIsOnline;
+  final String? counterpartLastSeenText;
+  final bool? counterpartIsConsultant;
   final String? localParticipantName;
+  final VideoCallEntryMode entryMode;
   final VoidCallback? onBackToChat;
   final VoidCallback? onHangUp;
 
@@ -38,437 +55,151 @@ class VideoCallScreen extends StatefulWidget {
 }
 
 class _VideoCallScreenState extends State<VideoCallScreen> {
-  static const lk.AudioCaptureOptions _micCaptureOptions = lk.AudioCaptureOptions(stopAudioCaptureOnMute: false);
-  static const Duration _mutedMicPollInterval = Duration(milliseconds: 320);
-  static const Duration _mutedMicOverlayMinInterval = Duration(milliseconds: 2600);
-  static const double _mutedMicAudioLevelThreshold = 0.008;
-  static const double _mutedMicEnergyDelta = 1e-6;
+  static const SystemUiOverlayStyle _videoCallOverlayStyle =
+      SystemUiOverlayStyle(
+        statusBarColor: Colors.transparent,
+        statusBarIconBrightness: Brightness.light,
+        statusBarBrightness: Brightness.dark,
+        systemNavigationBarColor: Colors.transparent,
+        systemNavigationBarIconBrightness: Brightness.light,
+        systemNavigationBarContrastEnforced: false,
+      );
 
-  final lk.Room _room = lk.Room(
-    roomOptions: const lk.RoomOptions(
-      adaptiveStream: true,
-      defaultCameraCaptureOptions: lk.CameraCaptureOptions(params: lk.VideoParametersPresets.h1080_169),
-      defaultAudioCaptureOptions: _micCaptureOptions,
-    ),
-  );
-  final VideoCallRepository _videoCallRepository = sl();
+  VideoCallSessionCubit get _cubit => sl<VideoCallSessionCubit>();
+  WsManager get _wsManager => sl<WsManager>();
 
-  bool _micEnabled = true;
-  bool _videoEnabled = true;
-  bool _splitParticipantView = true;
-  bool _mainStageShowsLocalVideo = false;
-  bool _useFrontCamera = true;
-  String? _connectError;
-  bool _liveKitDisposed = false;
-  bool _callEndedNotified = false;
-
-  lk.EventsListener<lk.RoomEvent>? _roomEventsListener;
-  OverlayEntry? _poorConnectionEntry;
-  Timer? _mutedMicPollTimer;
-  DateTime? _lastMutedMicOverlayAt;
-  bool _recordingOverlayScheduled = false;
-  bool _mutedMicStatsInFlight = false;
-  num? _lastMutedMicTotalEnergy;
-
-  lk.CameraCaptureOptions _cameraCaptureOptions({lk.CameraPosition? cameraPosition}) {
-    return lk.CameraCaptureOptions(
-      cameraPosition: cameraPosition ?? (_useFrontCamera ? lk.CameraPosition.front : lk.CameraPosition.back),
-      params: lk.VideoParametersPresets.h1080_169,
-    );
-  }
+  bool _counterpartIsOnline = false;
+  String _counterpartLastSeenText = '';
+  void Function(bool isOnline)? _presenceOnlineListener;
 
   @override
   void initState() {
     super.initState();
-    _attachRoomEventListeners();
-    _mutedMicPollTimer = Timer.periodic(_mutedMicPollInterval, (_) {
-      if (!mounted || _liveKitDisposed || _micEnabled || _mutedMicStatsInFlight) return;
-      if (_room.connectionState != lk.ConnectionState.connected) return;
-      _mutedMicStatsInFlight = true;
-      unawaited(
-        _pollMutedMicFromWebRtcStats().whenComplete(() {
-          _mutedMicStatsInFlight = false;
-        }),
-      );
-    });
+    _counterpartIsOnline = widget.counterpartIsOnline ?? false;
+    _counterpartLastSeenText = widget.counterpartLastSeenText ?? '';
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (!mounted) return;
-      unawaited(_applyVideoCallSystemUi());
-      _scheduleRecordingNoticeOnce();
-    });
-    unawaited(_connectLiveKit());
-  }
-
-  void _attachRoomEventListeners() {
-    _roomEventsListener = _room.createListener()
-      ..on<lk.ParticipantConnectionQualityUpdatedEvent>((e) {
-        if (e.participant != _room.localParticipant) return;
-        if (!mounted) return;
-        _syncPoorConnectionOverlay(e.connectionQuality);
-      })
-      ..on<lk.ActiveSpeakersChangedEvent>((e) {
-        if (!mounted || _micEnabled) return;
-        final lp = _room.localParticipant;
-        if (lp == null) return;
-        if (e.speakers.any((p) => p.sid == lp.sid)) {
-          _maybeShowMutedMicOverlay();
-        }
-      });
-  }
-
-  void _scheduleRecordingNoticeOnce() {
-    if (_recordingOverlayScheduled || !mounted) return;
-    _recordingOverlayScheduled = true;
-    VideoCallTopOverlay.insertBanner(
-      context,
-      message: S.of(context).video_call_recording_notice,
-      backgroundColor: appTheme.videoCallNoticeBannerBackground,
-      svgAsset: VideoCallTopOverlay.warningSvg,
-      autoRemoveAfter: const Duration(seconds: 3),
-    );
-  }
-
-  void _syncPoorConnectionOverlay(lk.ConnectionQuality q) {
-    final bad = q == lk.ConnectionQuality.poor || q == lk.ConnectionQuality.lost;
-    if (bad) {
-      if (_poorConnectionEntry != null) return;
-      if (!mounted) return;
-      _poorConnectionEntry = VideoCallTopOverlay.insertBanner(
-        context,
-        message: S.of(context).video_call_poor_connection,
-        backgroundColor: appTheme.strongRed,
-        svgAsset: VideoCallTopOverlay.poorConnectionSvg,
+      unawaited(_initCounterpartMetadata());
+      unawaited(
+        _cubit.onCallScreenVisible(
+          conversationUuid: widget.conversationUuid,
+          counterpartName: widget.counterpartName,
+          localParticipantName: widget.localParticipantName,
+          counterpartIsConsultant: widget.counterpartIsConsultant,
+          entryMode: widget.entryMode,
+        ),
       );
-    } else {
-      final e = _poorConnectionEntry;
-      if (e != null && e.mounted) {
-        e.remove();
-      }
-      _poorConnectionEntry = null;
-    }
+    });
   }
 
-  void _maybeShowMutedMicOverlay() {
-    if (!mounted || _micEnabled) return;
-    final now = DateTime.now();
-    if (_lastMutedMicOverlayAt != null && now.difference(_lastMutedMicOverlayAt!) < _mutedMicOverlayMinInterval) {
-      return;
+  Future<void> _initCounterpartMetadata() async {
+    var isOnline = widget.counterpartIsOnline ?? false;
+    var lastSeenText = widget.counterpartLastSeenText ?? '';
+    var counterpartUserId = widget.counterpartUserId;
+    var counterpartIsConsultant = widget.counterpartIsConsultant;
+
+    final shouldFetchChatRoom =
+        counterpartUserId == null ||
+        widget.counterpartIsOnline == null ||
+        widget.counterpartLastSeenText == null ||
+        counterpartIsConsultant == null;
+
+    if (shouldFetchChatRoom) {
+      try {
+        final chatRoom = await sl<ChatRepository>().getChatRoom(
+          widget.conversationUuid,
+        );
+        final counterpart = resolveChatCounterpart(
+          users: chatRoom.users,
+          currentUserId: _wsManager.userId,
+        );
+        isOnline = counterpart.isOnline;
+        lastSeenText = counterpart.lastSeenText;
+        counterpartUserId = counterpart.id;
+
+        if (counterpartIsConsultant == null) {
+          try {
+            final profile = await sl<ProfileRepository>().getProfileBySlug(
+              counterpart.slug,
+            );
+            counterpartIsConsultant = profile.roles.contains('consultant');
+          } catch (_) {
+            counterpartIsConsultant = false;
+          }
+        }
+      } catch (_) {}
     }
-    _lastMutedMicOverlayAt = now;
-    VideoCallTopOverlay.insertBanner(
-      context,
-      message: S.of(context).video_call_muted_mic_warning,
-      backgroundColor: appTheme.videoCallNoticeBannerBackground,
-      svgAsset: VideoCallTopOverlay.warningSvg,
-      autoRemoveAfter: const Duration(seconds: 2),
+
+    if (!mounted) return;
+    setState(() {
+      _counterpartIsOnline = isOnline;
+      _counterpartLastSeenText = lastSeenText;
+    });
+    if (counterpartIsConsultant != null) {
+      _cubit.updateCounterpartIsConsultant(counterpartIsConsultant);
+    }
+
+    if (counterpartUserId == null) return;
+
+    _presenceOnlineListener = (isOnline) {
+      if (!mounted) return;
+      if (isOnline) {
+        setState(() {
+          _counterpartIsOnline = true;
+          _counterpartLastSeenText = '';
+        });
+        return;
+      }
+      unawaited(_refreshCounterpartOnlineStatus());
+    };
+    await _wsManager.initPresenceDirectChatChannel(widget.conversationUuid);
+    _wsManager.addPresenceDirectChatListener(
+      counterpartUserId: counterpartUserId,
+      onCounterpartOnlineChanged: _presenceOnlineListener!,
     );
   }
 
-  Future<void> _pollMutedMicFromWebRtcStats() async {
-    if (!mounted || _liveKitDisposed || _micEnabled) return;
-    if (_room.connectionState != lk.ConnectionState.connected) return;
-    final lp = _room.localParticipant;
-    if (lp == null) return;
-    final pub = lp.getTrackPublicationBySource(lk.TrackSource.microphone);
-    final track = pub?.track;
-    if (track is! lk.LocalAudioTrack) return;
-    if (!track.muted) return;
+  Future<void> _refreshCounterpartOnlineStatus() async {
     try {
-      final stats = await track.getSenderStats();
-      if (!mounted || _liveKitDisposed || _micEnabled) return;
-      final src = stats?.audioSourceStats;
-      if (src == null) return;
-
-      final level = src.audioLevel;
-      if (level != null && level >= _mutedMicAudioLevelThreshold) {
-        _maybeShowMutedMicOverlay();
-        _lastMutedMicTotalEnergy = src.totalAudioEnergy;
-        return;
-      }
-
-      final energy = src.totalAudioEnergy;
-      if (energy != null) {
-        final prev = _lastMutedMicTotalEnergy;
-        if (prev != null && energy > prev + _mutedMicEnergyDelta) {
-          _maybeShowMutedMicOverlay();
-        }
-        _lastMutedMicTotalEnergy = energy;
-      }
-    } catch (_) {}
-  }
-
-  Future<void> _applyVideoCallSystemUi() async {
-    try {
-      await SystemChrome.setPreferredOrientations(const [
-        DeviceOrientation.portraitUp,
-        DeviceOrientation.portraitDown,
-        DeviceOrientation.landscapeLeft,
-        DeviceOrientation.landscapeRight,
-      ]);
+      final chatRoom = await sl<ChatRepository>().getChatRoom(
+        widget.conversationUuid,
+      );
+      final counterpart = resolveChatCounterpart(
+        users: chatRoom.users,
+        currentUserId: _wsManager.userId,
+      );
       if (!mounted) return;
-      await SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
-    } on PlatformException catch (_) {
-      if (!mounted) return;
-      await SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-    }
-  }
-
-  Future<void> _restoreSystemUiAfterCall() async {
-    try {
-      await SystemChrome.setPreferredOrientations(const <DeviceOrientation>[]);
-      await SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: SystemUiOverlay.values);
-    } on PlatformException catch (_) {}
-  }
-
-  Future<void> _connectLiveKit() async {
-    setState(() => _connectError = null);
-    try {
-      final tokenResponse = await _videoCallRepository.getParticipantToken(widget.conversationUuid);
-      if (!mounted) return;
-
-      var micOn = _micEnabled;
-      var videoOn = _videoEnabled;
-      if (micOn) {
-        final granted = await _ensureMicrophonePermission();
-        if (!mounted) return;
-        if (!granted) micOn = false;
-      }
-      if (videoOn) {
-        final granted = await _ensureCameraPermission();
-        if (!mounted) return;
-        if (!granted) videoOn = false;
-      }
-      if (micOn != _micEnabled || videoOn != _videoEnabled) {
-        setState(() {
-          _micEnabled = micOn;
-          _videoEnabled = videoOn;
-        });
-      }
-
-      await _room.connect(tokenResponse.wsUrl, tokenResponse.token);
-      if (!mounted || _liveKitDisposed) {
-        return;
-      }
-
-      var effectiveMic = micOn;
-      var effectiveVideo = videoOn;
-      final lp = _room.localParticipant;
-
-      if (micOn) {
-        try {
-          await lp?.setMicrophoneEnabled(true, audioCaptureOptions: _micCaptureOptions);
-        } catch (_) {
-          effectiveMic = false;
-        }
-      }
-      if (!mounted || _liveKitDisposed) return;
-
-      if (videoOn) {
-        try {
-          await lp?.setCameraEnabled(true, cameraCaptureOptions: _cameraCaptureOptions());
-        } catch (_) {
-          effectiveVideo = false;
-        }
-      }
-
-      if (effectiveMic != _micEnabled || effectiveVideo != _videoEnabled) {
-        setState(() {
-          _micEnabled = effectiveMic;
-          _videoEnabled = effectiveVideo;
-        });
-      }
-
-      if (mounted) {
-        _syncPoorConnectionOverlay(_room.localParticipant?.connectionQuality ?? lk.ConnectionQuality.unknown);
-      }
-    } catch (e) {
-      if (mounted) setState(() => _connectError = e.toString());
-    }
-  }
-
-  Future<void> _disconnectLiveKitOnly() async {
-    if (_liveKitDisposed) return;
-    _liveKitDisposed = true;
-    try {
-      if (_room.connectionState != lk.ConnectionState.disconnected) {
-        await _room.disconnect();
-      }
+      setState(() {
+        _counterpartIsOnline = counterpart.isOnline;
+        _counterpartLastSeenText = counterpart.lastSeenText;
+      });
     } catch (_) {}
-    try {
-      await _room.dispose();
-    } catch (_) {}
-  }
-
-  Future<void> _notifyCallEndedOnce() async {
-    if (_callEndedNotified) return;
-    _callEndedNotified = true;
-    try {
-      await _videoCallRepository.notifyCallEnded(widget.conversationUuid);
-    } catch (_) {}
-  }
-
-  Future<void> _cleanupLiveKitAndNotifyBackend() async {
-    await _disconnectLiveKitOnly();
-    await _notifyCallEndedOnce();
   }
 
   @override
   void dispose() {
-    _mutedMicPollTimer?.cancel();
-    final listener = _roomEventsListener;
-    _roomEventsListener = null;
-    if (listener != null) {
-      unawaited(listener.dispose());
+    if (_presenceOnlineListener != null) {
+      _wsManager.removePresenceDirectChatListener(_presenceOnlineListener!);
+      _presenceOnlineListener = null;
     }
-    final poor = _poorConnectionEntry;
-    _poorConnectionEntry = null;
-    if (poor != null && poor.mounted) {
-      poor.remove();
-    }
-    unawaited(_cleanupLiveKitAndNotifyBackend());
-    unawaited(_restoreSystemUiAfterCall());
+    _cubit.onCallScreenDisposed();
     super.dispose();
   }
 
   Future<void> _handleBackToChat() async {
     widget.onBackToChat?.call();
-    await _cleanupLiveKitAndNotifyBackend();
+    await _cubit.leaveCallRoute();
     if (!mounted) return;
     if (context.canPop()) context.pop();
   }
 
   Future<void> _handleHangUp() async {
     widget.onHangUp?.call();
-    await _cleanupLiveKitAndNotifyBackend();
+    await _cubit.endCall();
     if (!mounted) return;
     if (context.canPop()) context.pop();
   }
 
-  Future<void> _toggleMic() async {
-    if (_liveKitDisposed || _room.connectionState != lk.ConnectionState.connected) {
-      setState(() => _micEnabled = !_micEnabled);
-      _lastMutedMicTotalEnergy = null;
-      return;
-    }
-    final next = !_micEnabled;
-    if (next) {
-      final granted = await _ensureMicrophonePermission();
-      if (!mounted) return;
-      if (!granted) return;
-    }
-    setState(() => _micEnabled = next);
-    _lastMutedMicTotalEnergy = null;
-    await _room.localParticipant?.setMicrophoneEnabled(next, audioCaptureOptions: _micCaptureOptions);
-  }
-
-  Future<void> _toggleVideo() async {
-    if (_liveKitDisposed || _room.connectionState != lk.ConnectionState.connected) {
-      setState(() => _videoEnabled = !_videoEnabled);
-      return;
-    }
-    final next = !_videoEnabled;
-    if (next) {
-      final granted = await _ensureCameraPermission();
-      if (!mounted) return;
-      if (!granted) return;
-    }
-    setState(() => _videoEnabled = next);
-    final lp = _room.localParticipant;
-    if (lp == null) return;
-    if (next) {
-      await lp.setCameraEnabled(true, cameraCaptureOptions: _cameraCaptureOptions());
-    } else {
-      await lp.setCameraEnabled(false);
-    }
-  }
-
-  Future<void> _switchCameraFacing() async {
-    if (_liveKitDisposed || _room.connectionState != lk.ConnectionState.connected) {
-      setState(() => _useFrontCamera = !_useFrontCamera);
-      return;
-    }
-    if (!_videoEnabled) return;
-
-    final lp = _room.localParticipant;
-    if (lp == null) return;
-
-    final currentPosition = _useFrontCamera ? lk.CameraPosition.front : lk.CameraPosition.back;
-    final newPosition = currentPosition.switched();
-
-    final pub = lp.getTrackPublicationBySource(lk.TrackSource.camera);
-    final track = pub?.track;
-    if (track is lk.LocalVideoTrack) {
-      try {
-        await track.setCameraPosition(newPosition);
-        if (mounted) {
-          setState(() => _useFrontCamera = newPosition == lk.CameraPosition.front);
-        }
-      } catch (_) {}
-      return;
-    }
-
-    try {
-      await lp.setCameraEnabled(true, cameraCaptureOptions: _cameraCaptureOptions(cameraPosition: newPosition));
-      if (mounted) {
-        setState(() => _useFrontCamera = newPosition == lk.CameraPosition.front);
-      }
-    } catch (_) {}
-  }
-
-  bool _permissionNeedsSettings(PermissionStatus status) => status.isPermanentlyDenied || status.isRestricted;
-
-  Future<bool> _ensureCameraPermission() async {
-    var status = await Permission.camera.status;
-    if (status.isGranted) return true;
-    status = await Permission.camera.request();
-    if (status.isGranted) return true;
-    if (!mounted) return false;
-    final s = S.of(context);
-    await showErrorDialog(
-      context,
-      title: s.video_call_permission_camera_title,
-      description: s.video_call_permission_camera_description,
-      buttonTitle: s.allowAccess,
-      needToOpenSettings: _permissionNeedsSettings(status),
-    );
-    return false;
-  }
-
-  Future<bool> _ensureMicrophonePermission() async {
-    var status = await Permission.microphone.status;
-    if (status.isGranted) return true;
-    status = await Permission.microphone.request();
-    if (status.isGranted) return true;
-    if (!mounted) return false;
-    final s = S.of(context);
-    await showErrorDialog(
-      context,
-      title: s.video_call_permission_microphone_title,
-      description: s.video_call_permission_microphone_description,
-      buttonTitle: s.allowAccess,
-      needToOpenSettings: _permissionNeedsSettings(status),
-    );
-    return false;
-  }
-
-  String _resolvedLocalDisplayName(BuildContext context) {
-    final fromNav = widget.localParticipantName?.trim();
-    if (fromNav != null && fromNav.isNotEmpty) return fromNav;
-    final n = (_room.localParticipant?.name ?? '').trim();
-    if (n.isNotEmpty) return n;
-    return S.of(context).video_call_you;
-  }
-
-  String _resolvedRemoteDisplayName(BuildContext context, String fallback) {
-    for (final p in _room.remoteParticipants.values) {
-      final n = p.name.trim();
-      if (n.isNotEmpty) return n;
-    }
-    final c = widget.counterpartName?.trim();
-    if (c != null && c.isNotEmpty) return c;
-    return fallback;
-  }
-
   @override
   Widget build(BuildContext context) {
     final s = S.of(context);
@@ -476,56 +207,202 @@ class _VideoCallScreenState extends State<VideoCallScreen> {
     final topInset = viewPadding.top > 0 ? viewPadding.top : 16.0;
     final bottomInset = viewPadding.bottom;
 
-    final counterpartFallback = s.video_call_counterpart_default;
-    final controlLabelStyle = TextStyles.textSMedium.copyWith(color: appTheme.whiteA700, height: 20 / 14);
+    final controlLabelStyle = TextStyles.textSMedium.copyWith(
+      color: appTheme.whiteA700,
+      height: 20 / 14,
+    );
 
-    return AnnotatedRegion<SystemUiOverlayStyle>(
-      value: const SystemUiOverlayStyle(
-        statusBarColor: Colors.transparent,
-        statusBarIconBrightness: Brightness.light,
-        statusBarBrightness: Brightness.dark,
-        systemNavigationBarColor: Colors.transparent,
-        systemNavigationBarIconBrightness: Brightness.light,
-        systemNavigationBarContrastEnforced: false,
-      ),
-      child: Scaffold(
-        backgroundColor: appTheme.whiteA700,
-        body: ListenableBuilder(
-          listenable: _room,
-          builder: (context, _) {
-            return VideoCallStageLayout(
-              room: _room,
-              connectError: _connectError,
-              localDisplayName: _resolvedLocalDisplayName(context),
-              remoteDisplayName: _resolvedRemoteDisplayName(context, counterpartFallback),
-              micEnabled: _micEnabled,
-              videoEnabled: _videoEnabled,
-              splitParticipantView: _splitParticipantView,
-              mainStageShowsLocalVideo: _mainStageShowsLocalVideo,
-              useFrontCamera: _useFrontCamera,
-              onExpandLocal: () => setState(() {
-                _splitParticipantView = false;
-                _mainStageShowsLocalVideo = true;
-              }),
-              onExpandRemote: () => setState(() {
-                _splitParticipantView = false;
-                _mainStageShowsLocalVideo = false;
-              }),
-              onShrinkFromFullscreen: () => setState(() => _splitParticipantView = true),
-              onToggleStageSwap: () => setState(() => _mainStageShowsLocalVideo = !_mainStageShowsLocalVideo),
-              onChat: () => unawaited(_handleBackToChat()),
-              onToggleMic: () => unawaited(_toggleMic()),
-              onToggleVideo: () => unawaited(_toggleVideo()),
-              onHangUp: () => unawaited(_handleHangUp()),
-              onSwitchCamera: () => unawaited(_switchCameraFacing()),
-              controlLabelStyle: controlLabelStyle,
-              labels: (chat: s.video_call_chat, sound: s.video_call_sound, video: s.video_call_video, leave: s.video_call_leave),
-              topInset: topInset,
-              bottomInset: bottomInset,
+    return PopScope(
+      canPop: false,
+      onPopInvokedWithResult: (bool didPop, Object? result) async {
+        if (didPop) return;
+        await _cubit.leaveCallRoute();
+        if (!context.mounted) return;
+        if (context.canPop()) context.pop();
+      },
+      child: BlocBuilder<VideoCallSessionCubit, VideoCallSessionState>(
+        bloc: _cubit,
+        buildWhen: (a, b) =>
+            a.connectPhase != b.connectPhase ||
+            a.connectError != b.connectError ||
+            a.linkIssue != b.linkIssue ||
+            a.counterpartName != b.counterpartName ||
+            a.counterpartIsConsultant != b.counterpartIsConsultant ||
+            a.localParticipantName != b.localParticipantName ||
+            a.callStageEntered != b.callStageEntered ||
+            a.micEnabled != b.micEnabled ||
+            a.videoEnabled != b.videoEnabled ||
+            a.splitParticipantView != b.splitParticipantView ||
+            a.mainStageShowsLocalVideo != b.mainStageShowsLocalVideo ||
+            a.useFrontCamera != b.useFrontCamera ||
+            a.entryMode != b.entryMode,
+        builder: (context, sessionState) {
+          final room = _cubit.liveKitRoom;
+
+          final showLost =
+              sessionState.linkIssue.needsManualReconnect ||
+              (sessionState.connectPhase == VideoCallConnectPhase.idle &&
+                  sessionState.connectError != null);
+
+          if (showLost) {
+            return AnnotatedRegion<SystemUiOverlayStyle>(
+              value: _videoCallOverlayStyle,
+              child: Scaffold(
+                backgroundColor: appTheme.whiteA700,
+                body: VideoCallConnectionLostScreen(
+                  detailMessage: sessionState.connectError,
+                  onRetry: () => unawaited(_cubit.retryAfterConnectionLoss()),
+                  onLeave: () => unawaited(_handleHangUp()),
+                ),
+              ),
             );
-          },
-        ),
+          }
+
+          final showEntranceLobby =
+              sessionState.entryMode == VideoCallEntryMode.outgoing &&
+              !sessionState.callStageEntered &&
+              sessionState.linkIssue == VideoCallLinkIssue.none &&
+              sessionState.connectPhase != VideoCallConnectPhase.idle;
+
+          final showAutoEnterLoading =
+              sessionState.entryMode == VideoCallEntryMode.incomingAccepted &&
+              !sessionState.callStageEntered &&
+              sessionState.linkIssue == VideoCallLinkIssue.none &&
+              sessionState.connectPhase != VideoCallConnectPhase.idle;
+
+          if (showAutoEnterLoading) {
+            return AnnotatedRegion<SystemUiOverlayStyle>(
+              value: _videoCallOverlayStyle,
+              child: Scaffold(
+                backgroundColor: appTheme.whiteA700,
+                body: VideoCallLoadingScreen(
+                  onClose: () => unawaited(_handleHangUp()),
+                ),
+              ),
+            );
+          }
+
+          if (showEntranceLobby) {
+            final remoteName = _resolveRemoteDisplayName(sessionState);
+            final canEnterCall =
+                sessionState.connectPhase == VideoCallConnectPhase.connected;
+            return AnnotatedRegion<SystemUiOverlayStyle>(
+              value: _videoCallOverlayStyle,
+              child: Scaffold(
+                backgroundColor: appTheme.whiteA700,
+                body: VideoCallConnectingEntranceScreen(
+                  counterpartDisplayName: remoteName,
+                  counterpartAvatarUrl: widget.counterpartAvatarUrl,
+                  counterpartIsOnline: _counterpartIsOnline,
+                  counterpartLastSeenText: _counterpartLastSeenText,
+                  micEnabled: sessionState.isMicActiveForUi,
+                  videoEnabled: sessionState.videoEnabled,
+                  canEnterCall: canEnterCall,
+                  onEnterCall: _cubit.enterCallStage,
+                  labels: (
+                    chat: s.video_call_chat,
+                    sound: s.video_call_sound,
+                    video: s.video_call_video,
+                    leave: s.video_call_leave,
+                  ),
+                  controlLabelStyle: controlLabelStyle,
+                  onToggleMic: () => unawaited(_cubit.toggleMic()),
+                  onToggleVideo: () => unawaited(_cubit.toggleVideo()),
+                  onHangUp: () => unawaited(_handleHangUp()),
+                  bottomInset: bottomInset,
+                ),
+              ),
+            );
+          }
+
+          if (room == null &&
+              sessionState.linkIssue == VideoCallLinkIssue.none &&
+              sessionState.connectError == null) {
+            return AnnotatedRegion<SystemUiOverlayStyle>(
+              value: _videoCallOverlayStyle,
+              child: Scaffold(
+                backgroundColor: appTheme.whiteA700,
+                body: VideoCallLoadingScreen(
+                  onClose: () => unawaited(_handleHangUp()),
+                ),
+              ),
+            );
+          }
+
+          final activeRoom = room;
+          if (activeRoom == null) {
+            return AnnotatedRegion<SystemUiOverlayStyle>(
+              value: _videoCallOverlayStyle,
+              child: Scaffold(
+                backgroundColor: appTheme.whiteA700,
+                body: VideoCallLoadingScreen(
+                  onClose: () => unawaited(_handleHangUp()),
+                ),
+              ),
+            );
+          }
+
+          return AnnotatedRegion<SystemUiOverlayStyle>(
+            value: _videoCallOverlayStyle,
+            child: Scaffold(
+              backgroundColor: appTheme.whiteA700,
+              body: ListenableBuilder(
+                listenable: videoCallRoomTracksListenable(activeRoom),
+                builder: (context, _) {
+                  return VideoCallStageLayout(
+                    room: activeRoom,
+                    connectError: sessionState.connectError,
+                    localDisplayName: _resolveLocalDisplayName(sessionState),
+                    remoteDisplayName: _resolveRemoteDisplayName(sessionState),
+                    remoteIsConsultant: sessionState.counterpartIsConsultant,
+                    micEnabled: sessionState.micEnabled,
+                    videoEnabled: sessionState.videoEnabled,
+                    splitParticipantView: sessionState.splitParticipantView,
+                    mainStageShowsLocalVideo:
+                        sessionState.mainStageShowsLocalVideo,
+                    useFrontCamera: sessionState.useFrontCamera,
+                    onExpandLocal: () => _cubit.expandLocal(),
+                    onExpandRemote: () => _cubit.expandRemote(),
+                    onShrinkFromFullscreen: () => _cubit.shrinkToSplit(),
+                    onToggleStageSwap: () => _cubit.toggleStageSwap(),
+                    onChat: () => unawaited(_handleBackToChat()),
+                    onToggleMic: () => unawaited(_cubit.toggleMic()),
+                    onToggleVideo: () => unawaited(_cubit.toggleVideo()),
+                    onHangUp: () => unawaited(_handleHangUp()),
+                    onSwitchCamera: () =>
+                        unawaited(_cubit.switchCameraFacing()),
+                    controlLabelStyle: controlLabelStyle,
+                    labels: (
+                      chat: s.video_call_chat,
+                      sound: s.video_call_sound,
+                      video: s.video_call_video,
+                      leave: s.video_call_leave,
+                    ),
+                    topInset: topInset,
+                    bottomInset: bottomInset,
+                  );
+                },
+              ),
+            ),
+          );
+        },
       ),
     );
   }
+
+  String _resolveLocalDisplayName(VideoCallSessionState sessionState) {
+    final resolved = _cubit.resolvedLocalDisplayName().trim();
+    if (resolved.isNotEmpty) return resolved;
+    return sessionState.localParticipantName?.trim() ??
+        widget.localParticipantName?.trim() ??
+        '';
+  }
+
+  String _resolveRemoteDisplayName(VideoCallSessionState sessionState) {
+    final resolved = _cubit.resolvedRemoteDisplayName().trim();
+    if (resolved.isNotEmpty) return resolved;
+    return sessionState.counterpartName?.trim() ??
+        widget.counterpartName?.trim() ??
+        '';
+  }
 }
diff --git a/lib/features/video_calls/presentation/widgets/video_call_app_shell.dart b/lib/features/video_calls/presentation/widgets/video_call_app_shell.dart
new file mode 100644
index 00000000..bf9d774a
--- /dev/null
+++ b/lib/features/video_calls/presentation/widgets/video_call_app_shell.dart
@@ -0,0 +1,56 @@
+import 'dart:io';
+
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_banner_overlay.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_global_pip_layer.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_system_pip_content.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_system_pip_listener.dart';
+import 'package:floating/floating.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+/// Root overlay shell: system PiP on Android, in-app PiP fallback on iOS.
+class VideoCallAppShell extends StatelessWidget {
+  const VideoCallAppShell({super.key, required this.child});
+
+  final Widget? child;
+
+  @override
+  Widget build(BuildContext context) {
+    final shell = Stack(
+      clipBehavior: Clip.none,
+      children: [
+        child ?? const SizedBox.shrink(),
+        Overlay(
+          key: VideoCallBannerOverlay.overlayKey,
+          initialEntries: const <OverlayEntry>[],
+        ),
+        const VideoCallGlobalPipLayer(),
+        const VideoCallSystemPipListener(),
+      ],
+    );
+
+    if (!Platform.isAndroid) return shell;
+
+    return BlocBuilder<VideoCallSessionCubit, VideoCallSessionState>(
+      bloc: sl<VideoCallSessionCubit>(),
+      buildWhen: (previous, current) =>
+          previous.callStageEntered != current.callStageEntered ||
+          previous.connectPhase != current.connectPhase ||
+          previous.linkIssue != current.linkIssue,
+      builder: (context, state) {
+        final allowSystemPipShell = sl<VideoCallManager>().isActiveCall;
+
+        if (!allowSystemPipShell) return shell;
+
+        return PiPSwitcher(
+          childWhenDisabled: shell,
+          childWhenEnabled: const VideoCallSystemPipContent(),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/features/video_calls/presentation/widgets/video_call_banner_overlay.dart b/lib/features/video_calls/presentation/widgets/video_call_banner_overlay.dart
new file mode 100644
index 00000000..9bdb2f40
--- /dev/null
+++ b/lib/features/video_calls/presentation/widgets/video_call_banner_overlay.dart
@@ -0,0 +1,10 @@
+import 'package:flutter/material.dart';
+
+/// Dedicated overlay layer above the app navigator for in-call banners.
+abstract final class VideoCallBannerOverlay {
+  static final GlobalKey<OverlayState> overlayKey = GlobalKey<OverlayState>(
+    debugLabel: 'videoCallBannerOverlay',
+  );
+
+  static OverlayState? get overlayState => overlayKey.currentState;
+}
diff --git a/lib/features/video_calls/presentation/widgets/video_call_connecting_entrance_screen.dart b/lib/features/video_calls/presentation/widgets/video_call_connecting_entrance_screen.dart
new file mode 100644
index 00000000..7870eac8
--- /dev/null
+++ b/lib/features/video_calls/presentation/widgets/video_call_connecting_entrance_screen.dart
@@ -0,0 +1,352 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/chat/presentation/widgets/chat_user_online_status_line.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_controls.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+class VideoCallConnectingEntranceScreen extends StatelessWidget {
+  const VideoCallConnectingEntranceScreen({
+    super.key,
+    required this.counterpartDisplayName,
+    this.counterpartAvatarUrl,
+    required this.counterpartIsOnline,
+    required this.counterpartLastSeenText,
+    required this.micEnabled,
+    required this.videoEnabled,
+    required this.canEnterCall,
+    required this.onEnterCall,
+    required this.labels,
+    required this.controlLabelStyle,
+    required this.onToggleMic,
+    required this.onToggleVideo,
+    required this.onHangUp,
+    required this.bottomInset,
+  });
+
+  final String counterpartDisplayName;
+  final String? counterpartAvatarUrl;
+  final bool counterpartIsOnline;
+  final String counterpartLastSeenText;
+  final bool micEnabled;
+  final bool videoEnabled;
+  final bool canEnterCall;
+  final VoidCallback onEnterCall;
+  final VideoCallControlLabels labels;
+  final TextStyle controlLabelStyle;
+  final VoidCallback onToggleMic;
+  final VoidCallback onToggleVideo;
+  final VoidCallback onHangUp;
+  final double bottomInset;
+
+  static const double _bottomPanelHeight = 132;
+  static const double _topContentSpacing = 60;
+
+  String _firstChar(String s) {
+    if (s.isEmpty) return '';
+    return String.fromCharCode(s.runes.first);
+  }
+
+  String _initials(String name) {
+    final trimmed = name.trim();
+    if (trimmed.isEmpty) return '?';
+    final parts = trimmed.split(RegExp(r'\s+'));
+    if (parts.length >= 2) {
+      final a = _firstChar(parts[0]);
+      final b = _firstChar(parts[1]);
+      if (a.isNotEmpty && b.isNotEmpty) {
+        return (a + b).toUpperCase();
+      }
+    }
+    final single = parts[0];
+    final runes = single.runes.toList();
+    if (runes.length >= 2) {
+      return String.fromCharCodes([runes[0], runes[1]]).toUpperCase();
+    }
+    final c = _firstChar(single);
+    return c.isNotEmpty ? c.toUpperCase() : '?';
+  }
+
+  Widget _initialsPlaceholder(String initials) {
+    return ColoredBox(
+      color: appTheme.backgroundAvatar,
+      child: Center(
+        child: Text(
+          initials,
+          style: TextStyles.textFS24FW700.copyWith(
+            color: appTheme.blueA400,
+            fontWeight: FontWeight.w600,
+            fontSize: 28,
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _avatar(BuildContext context, String name, String? urlRaw) {
+    final url = urlRaw?.trim();
+    final initials = _initials(name);
+    final border = Border.all(color: appTheme.blueA400, width: 1);
+    if (url != null && url.isNotEmpty) {
+      return Container(
+        width: 100,
+        height: 100,
+        decoration: BoxDecoration(shape: BoxShape.circle, border: border),
+        child: ClipOval(
+          child: Image.network(
+            url,
+            fit: BoxFit.cover,
+            errorBuilder: (context, error, stackTrace) =>
+                _initialsPlaceholder(initials),
+          ),
+        ),
+      );
+    }
+    return Container(
+      width: 100,
+      height: 100,
+      decoration: BoxDecoration(
+        shape: BoxShape.circle,
+        color: appTheme.backgroundAvatar,
+        border: border,
+      ),
+      alignment: Alignment.center,
+      child: Text(
+        initials,
+        style: TextStyles.textFS24FW700.copyWith(
+          color: appTheme.blueA400,
+          fontWeight: FontWeight.w600,
+          fontSize: 28,
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    return ColoredBox(
+      color: appTheme.whiteA700,
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          SafeArea(
+            child: Padding(
+              padding: EdgeInsets.only(
+                bottom: _bottomPanelHeight + bottomInset,
+              ),
+              child: SingleChildScrollView(
+                physics: const ClampingScrollPhysics(),
+                padding: const EdgeInsets.symmetric(horizontal: 24),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    const SizedBox(height: _topContentSpacing),
+                    _avatar(context, counterpartDisplayName, counterpartAvatarUrl),
+                    const SizedBox(height: 16),
+                    _buildStatusLine(context, s),
+                    SizedBox(height: canEnterCall ? 20 : 16),
+                    Text(
+                      s.video_call_screen_connecting_title,
+                      textAlign: TextAlign.center,
+                      style: CustomTextStyles.videoCallFlowPlaceholderTitle,
+                    ),
+                    const SizedBox(height: 16),
+                    Text(
+                      s.video_call_recording_notice,
+                      textAlign: TextAlign.center,
+                      style: CustomTextStyles.videoCallFlowPlaceholderConnectingSubtitle,
+                    ),
+                    const SizedBox(height: 8),
+                    Text(
+                      counterpartDisplayName,
+                      textAlign: TextAlign.center,
+                      style:
+                          CustomTextStyles.videoCallFlowPlaceholderConnectingSubtitle
+                              .copyWith(fontWeight: FontWeight.w700),
+                    ),
+                    const SizedBox(height: 24),
+                  ],
+                ),
+              ),
+            ),
+          ),
+          Positioned(
+            left: 0,
+            right: 0,
+            bottom: 0,
+            height: _bottomPanelHeight + bottomInset,
+            child: DecoratedBox(
+              decoration: BoxDecoration(
+                gradient: LinearGradient(
+                  begin: Alignment.topCenter,
+                  end: Alignment.bottomCenter,
+                  colors: [
+                    Colors.black.withValues(alpha: 0),
+                    Colors.black.withValues(alpha: 0.52),
+                  ],
+                ),
+              ),
+              child: Padding(
+                padding: EdgeInsets.fromLTRB(12, 16, 12, 12 + bottomInset),
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.end,
+                  children: [
+                    Expanded(
+                      child: Center(
+                        child: IgnorePointer(
+                          ignoring: !canEnterCall,
+                          child: Opacity(
+                            opacity: canEnterCall ? 1 : 0.45,
+                            child: VideoCallControlTile(
+                              label: s.video_call_enter,
+                              labelStyle: controlLabelStyle,
+                              onTap: onEnterCall,
+                              face: ClipRRect(
+                                borderRadius: BorderRadius.circular(12),
+                                child: SizedBox(
+                                  width: 48,
+                                  height: 48,
+                                  child: ColoredBox(
+                                    color: appTheme.greenA700,
+                                    child: Center(
+                                      child: SvgPicture.asset(
+                                        'assets/icons/video_call/vc_control_enter.svg',
+                                        width: 28,
+                                        height: 28,
+                                        fit: BoxFit.contain,
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                    Expanded(
+                      child: Center(
+                        child: VideoCallControlTile(
+                          label: labels.sound,
+                          labelStyle: controlLabelStyle,
+                          onTap: onToggleMic,
+                          face: ClipRRect(
+                            borderRadius: BorderRadius.circular(12),
+                            child: SizedBox(
+                              width: 48,
+                              height: 48,
+                              child: micEnabled
+                                  ? ColoredBox(
+                                      color: appTheme.blueA400,
+                                      child: Center(
+                                        child: SvgPicture.asset(
+                                          'assets/icons/video_call/vc_mic_on.svg',
+                                          width: 28,
+                                          height: 28,
+                                        ),
+                                      ),
+                                    )
+                                  : ColoredBox(
+                                      color: appTheme.videoCallControlOffBackground,
+                                      child: Center(
+                                        child: SvgPicture.asset(
+                                          'assets/icons/video_call/vc_mic_off.svg',
+                                          width: 28,
+                                          height: 28,
+                                        ),
+                                      ),
+                                    ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                    Expanded(
+                      child: Center(
+                        child: VideoCallControlTile(
+                          label: labels.video,
+                          labelStyle: controlLabelStyle,
+                          onTap: onToggleVideo,
+                          face: ClipRRect(
+                            borderRadius: BorderRadius.circular(12),
+                            child: SizedBox(
+                              width: 48,
+                              height: 48,
+                              child: videoEnabled
+                                  ? Image.asset(
+                                      'assets/icons/video_call/vc_control_video.png',
+                                      fit: BoxFit.cover,
+                                    )
+                                  : ColoredBox(
+                                      color: appTheme.videoCallControlOffBackground,
+                                      child: Center(
+                                        child: SvgPicture.asset(
+                                          'assets/icons/video_call/vc_cam_off.svg',
+                                          width: 28,
+                                          height: 28,
+                                        ),
+                                      ),
+                                    ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                    Expanded(
+                      child: Center(
+                        child: VideoCallControlTile(
+                          label: labels.leave,
+                          labelStyle: controlLabelStyle,
+                          onTap: onHangUp,
+                          face: ClipRRect(
+                            borderRadius: BorderRadius.circular(12),
+                            child: SizedBox(
+                              width: 48,
+                              height: 48,
+                              child: Image.asset(
+                                'assets/icons/video_call/vc_control_leave.png',
+                                fit: BoxFit.cover,
+                                alignment: const Alignment(0, -0.82),
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildStatusLine(BuildContext context, S s) {
+    final statusStyle = CustomTextStyles.bodySmallMulishBlack900.copyWith(
+      height: 14 / 12,
+    );
+    final onlineStatus = ChatUserOnlineStatusLine(
+      isOnline: counterpartIsOnline,
+      lastSeenText: counterpartLastSeenText,
+      style: statusStyle,
+    );
+
+    if (counterpartIsOnline || counterpartLastSeenText.trim().isNotEmpty) {
+      return Center(child: onlineStatus);
+    }
+
+    if (!canEnterCall) {
+      return Text(
+        s.video_call_screen_connecting_subtitle,
+        textAlign: TextAlign.center,
+        style: statusStyle,
+      );
+    }
+
+    return const SizedBox.shrink();
+  }
+}
diff --git a/lib/features/video_calls/presentation/widgets/video_call_flow_placeholder_screens.dart b/lib/features/video_calls/presentation/widgets/video_call_flow_placeholder_screens.dart
new file mode 100644
index 00000000..1207d56b
--- /dev/null
+++ b/lib/features/video_calls/presentation/widgets/video_call_flow_placeholder_screens.dart
@@ -0,0 +1,305 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+const double _kVideoCallFlowBottomBarHeight = 132;
+
+Widget _videoCallFlowBottomBarGradient({
+  required double bottomInset,
+  required Widget child,
+}) {
+  return Positioned(
+    left: 0,
+    right: 0,
+    bottom: 0,
+    height: _kVideoCallFlowBottomBarHeight + bottomInset,
+    child: DecoratedBox(
+      decoration: BoxDecoration(
+        gradient: LinearGradient(
+          begin: Alignment.topCenter,
+          end: Alignment.bottomCenter,
+          colors: [
+            Colors.black.withValues(alpha: 0),
+            Colors.black.withValues(alpha: 0.52),
+          ],
+        ),
+      ),
+      child: Padding(
+        padding: EdgeInsets.fromLTRB(24, 24, 24, 24 + bottomInset),
+        child: child,
+      ),
+    ),
+  );
+}
+
+ButtonStyle _videoCallFlowBarButtonStyle({required Color backgroundColor}) {
+  return FilledButton.styleFrom(
+    backgroundColor: backgroundColor,
+    foregroundColor: appTheme.whiteA700,
+    padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+    minimumSize: const Size(0, 48),
+    tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+    shape: RoundedRectangleBorder(
+      borderRadius: BorderRadius.circular(8),
+    ),
+  );
+}
+
+class _VideoCallFlowScaffold extends StatelessWidget {
+  const _VideoCallFlowScaffold({required this.child});
+
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    return ColoredBox(
+      color: appTheme.whiteA700,
+      child: SafeArea(
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 28),
+          child: Column(
+            children: [
+              const SizedBox(height: 40),
+              Image.asset(
+                'assets/icons/video_call/eatvio_c.png',
+                width: 88,
+                height: 88,
+                fit: BoxFit.contain,
+              ),
+              const SizedBox(height: 32),
+              Expanded(child: Center(child: child)),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class VideoCallLoadingScreen extends StatelessWidget {
+  const VideoCallLoadingScreen({super.key, required this.onClose});
+
+  final VoidCallback onClose;
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    final bottomInset = MediaQuery.viewPaddingOf(context).bottom;
+    return ColoredBox(
+      color: appTheme.whiteA700,
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          SafeArea(
+            bottom: false,
+            child: Padding(
+              padding: EdgeInsets.only(
+                bottom: _kVideoCallFlowBottomBarHeight + bottomInset,
+              ),
+              child: Center(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    SizedBox(
+                      width: 40,
+                      height: 40,
+                      child: CircularProgressIndicator(
+                        strokeWidth: 3,
+                        color: appTheme.blueA400,
+                      ),
+                    ),
+                    const SizedBox(height: 28),
+                    Text(
+                      s.video_call_screen_loading_title,
+                      textAlign: TextAlign.center,
+                      style: CustomTextStyles.videoCallFlowPlaceholderTitle,
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+          _videoCallFlowBottomBarGradient(
+            bottomInset: bottomInset,
+            child: Align(
+              alignment: Alignment.bottomCenter,
+              child: FilledButton.icon(
+                onPressed: onClose,
+                style: _videoCallFlowBarButtonStyle(
+                  backgroundColor: appTheme.videoCallControlOffBackground,
+                ),
+                icon: Icon(
+                  Icons.close,
+                  size: 18,
+                  color: appTheme.whiteA700,
+                ),
+                label: Text(
+                  s.video_call_close,
+                  style: CustomTextStyles.videoCallFlowPlaceholderFilledButtonLabel,
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class VideoCallConnectingScreen extends StatelessWidget {
+  const VideoCallConnectingScreen({super.key, required this.isReconnecting});
+
+  final bool isReconnecting;
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    final title = isReconnecting
+        ? s.video_call_screen_reconnecting_title
+        : s.video_call_screen_connecting_title;
+    final subtitle = isReconnecting
+        ? s.video_call_screen_reconnecting_subtitle
+        : s.video_call_screen_connecting_subtitle;
+    return _VideoCallFlowScaffold(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          SizedBox(
+            width: 44,
+            height: 44,
+            child: CircularProgressIndicator(
+              strokeWidth: 3,
+              color: appTheme.blueA400,
+            ),
+          ),
+          const SizedBox(height: 28),
+          Text(
+            title,
+            textAlign: TextAlign.center,
+            style: CustomTextStyles.videoCallFlowPlaceholderTitle,
+          ),
+          const SizedBox(height: 8),
+          Text(
+            subtitle,
+            textAlign: TextAlign.center,
+            style: isReconnecting
+                ? CustomTextStyles.videoCallFlowPlaceholderReconnectingSubtitle
+                : CustomTextStyles.videoCallFlowPlaceholderConnectingSubtitle,
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class VideoCallConnectionLostScreen extends StatelessWidget {
+  const VideoCallConnectionLostScreen({
+    super.key,
+    required this.detailMessage,
+    required this.onRetry,
+    required this.onLeave,
+  });
+
+  final String? detailMessage;
+  final VoidCallback onRetry;
+  final VoidCallback onLeave;
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    final bottomInset = MediaQuery.viewPaddingOf(context).bottom;
+    return ColoredBox(
+      color: appTheme.whiteA700,
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          SafeArea(
+            bottom: false,
+            child: Padding(
+              padding: EdgeInsets.only(
+                left: 24,
+                right: 24,
+                bottom: _kVideoCallFlowBottomBarHeight + bottomInset,
+              ),
+              child: Center(
+                child: SingleChildScrollView(
+                  physics: const ClampingScrollPhysics(),
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      SvgPicture.asset(
+                        'assets/icons/video_call/poor_connection.svg',
+                        width: 120,
+                        height: 107,
+                        fit: BoxFit.contain,
+                      ),
+                      const SizedBox(height: 16),
+                      Text(
+                        s.video_call_connection_lost_title,
+                        textAlign: TextAlign.center,
+                        style: CustomTextStyles.videoCallFlowPlaceholderTitle,
+                      ),
+                      const SizedBox(height: 8),
+                      Text(
+                        s.video_call_connection_lost_message,
+                        textAlign: TextAlign.center,
+                        style: CustomTextStyles
+                            .videoCallFlowPlaceholderConnectionLostBody,
+                      ),
+                      if (detailMessage != null &&
+                          detailMessage!.trim().isNotEmpty) ...[
+                        const SizedBox(height: 16),
+                        Text(
+                          detailMessage!,
+                          textAlign: TextAlign.center,
+                          style: CustomTextStyles
+                              .videoCallFlowPlaceholderConnectionLostDetail,
+                        ),
+                      ],
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+          _videoCallFlowBottomBarGradient(
+            bottomInset: bottomInset,
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.end,
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                FilledButton(
+                  onPressed: onRetry,
+                  style: _videoCallFlowBarButtonStyle(
+                    backgroundColor: appTheme.greenA700,
+                  ),
+                  child: Text(
+                    s.video_call_try_again,
+                    style: CustomTextStyles.videoCallFlowPlaceholderFilledButtonLabel,
+                  ),
+                ),
+                FilledButton.icon(
+                  onPressed: onLeave,
+                  style: _videoCallFlowBarButtonStyle(
+                    backgroundColor: appTheme.videoCallControlOffBackground,
+                  ),
+                  icon: Icon(
+                    Icons.close,
+                    size: 18,
+                    color: appTheme.whiteA700,
+                  ),
+                  label: Text(
+                    s.video_call_close,
+                    style: CustomTextStyles.videoCallFlowPlaceholderFilledButtonLabel,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/features/video_calls/presentation/widgets/video_call_global_pip_layer.dart b/lib/features/video_calls/presentation/widgets/video_call_global_pip_layer.dart
new file mode 100644
index 00000000..9a1e4e55
--- /dev/null
+++ b/lib/features/video_calls/presentation/widgets/video_call_global_pip_layer.dart
@@ -0,0 +1,160 @@
+import 'dart:async';
+import 'dart:io';
+import 'dart:math' as math;
+
+import 'package:eatvio_app/core/app_router.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+import 'package:eatvio_app/features/video_calls/presentation/pages/video_call_screen.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_pip_video_preview.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
+
+class VideoCallGlobalPipLayer extends StatefulWidget {
+  const VideoCallGlobalPipLayer({super.key});
+
+  @override
+  State<VideoCallGlobalPipLayer> createState() =>
+      _VideoCallGlobalPipLayerState();
+}
+
+class _VideoCallGlobalPipLayerState extends State<VideoCallGlobalPipLayer> {
+  static const double _pipW = 142;
+  static const double _pipH = 201;
+  static const double _edgeInset = 8;
+  static const double _pipInitialExtraLeft = 28;
+  static const double _pipInitialExtraDown = 16;
+
+  double? _pipLeft;
+  double? _pipTop;
+  Offset? _pipPanPointerGlobal;
+  double? _pipPanOriginLeft;
+  double? _pipPanOriginTop;
+
+  void _resetPipPanState() {
+    _pipPanPointerGlobal = null;
+    _pipPanOriginLeft = null;
+    _pipPanOriginTop = null;
+  }
+
+  void _openFullscreenRoute(VideoCallSessionState s) {
+    final ctx = AppRouter.navigatorKey.currentContext;
+    if (ctx == null) return;
+    unawaited(sl<VideoCallSessionCubit>().restoreFullscreenFromPip());
+    GoRouter.of(ctx).pushNamed(
+      VideoCallScreen.name,
+      extra: <String, dynamic>{
+        'conversationUuid': s.conversationUuid,
+        'counterpartName': s.counterpartName,
+        'localParticipantName': s.localParticipantName,
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<VideoCallSessionCubit, VideoCallSessionState>(
+      bloc: sl<VideoCallSessionCubit>(),
+      buildWhen: (a, b) =>
+          a.uiMode != b.uiMode ||
+          a.connectPhase != b.connectPhase ||
+          a.callStageEntered != b.callStageEntered ||
+          a.videoEnabled != b.videoEnabled,
+      builder: (context, state) {
+        if (state.uiMode != VideoCallUiMode.pip ||
+            state.connectPhase != VideoCallConnectPhase.connected ||
+            !state.callStageEntered) {
+          return const SizedBox.shrink();
+        }
+        final cubit = context.read<VideoCallSessionCubit>();
+        if (Platform.isAndroid && cubit.isCallScreenRouteVisible) {
+          return const SizedBox.shrink();
+        }
+        final room = cubit.liveKitRoom;
+        if (room == null) return const SizedBox.shrink();
+
+        final mq = MediaQuery.of(context);
+        final maxW = mq.size.width;
+        final maxH = mq.size.height;
+        final topInset = mq.viewPadding.top > 0 ? mq.viewPadding.top : 16.0;
+        final bottomInset = mq.viewPadding.bottom;
+        final defaultPipLeft = maxW - _pipW - _edgeInset - _pipInitialExtraLeft;
+        final minPipTop = topInset + _edgeInset;
+        final defaultPipTop = minPipTop + _pipInitialExtraDown;
+        final maxPipLeft = math.max(_edgeInset, maxW - _pipW - _edgeInset);
+        final maxPipTop = math.max(
+          minPipTop,
+          maxH - _pipH - _edgeInset - bottomInset,
+        );
+        final pipLeft =
+            ((_pipLeft ?? defaultPipLeft).clamp(_edgeInset, maxPipLeft) as num)
+                .toDouble();
+        final pipTop =
+            ((_pipTop ?? defaultPipTop).clamp(minPipTop, maxPipTop) as num)
+                .toDouble();
+
+        return Material(
+          type: MaterialType.transparency,
+          child: ListenableBuilder(
+            listenable: videoCallRoomTracksListenable(room),
+            builder: (context, _) {
+              return Stack(
+                clipBehavior: Clip.none,
+                children: [
+                  Positioned(
+                    left: pipLeft,
+                    top: pipTop,
+                    child: GestureDetector(
+                      behavior: HitTestBehavior.opaque,
+                      onTap: () => _openFullscreenRoute(state),
+                      onPanStart: (details) {
+                        _pipPanPointerGlobal = details.globalPosition;
+                        _pipPanOriginLeft = pipLeft;
+                        _pipPanOriginTop = pipTop;
+                      },
+                      onPanUpdate: (details) {
+                        if (_pipPanPointerGlobal == null ||
+                            _pipPanOriginLeft == null ||
+                            _pipPanOriginTop == null) {
+                          return;
+                        }
+                        final delta =
+                            details.globalPosition - _pipPanPointerGlobal!;
+                        setState(() {
+                          final nx = (_pipPanOriginLeft! + delta.dx)
+                              .clamp(_edgeInset, maxPipLeft);
+                          final ny = (_pipPanOriginTop! + delta.dy).clamp(
+                            minPipTop,
+                            maxPipTop,
+                          );
+                          _pipLeft = (nx as num).toDouble();
+                          _pipTop = (ny as num).toDouble();
+                        });
+                      },
+                      onPanEnd: (_) => _resetPipPanState(),
+                      onPanCancel: _resetPipPanState,
+                      child: ClipRRect(
+                        borderRadius: BorderRadius.circular(8),
+                        child: SizedBox(
+                          width: _pipW,
+                          height: _pipH,
+                          child: VideoCallPipVideoPreview(
+                            sessionState: state,
+                            room: room,
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/features/video_calls/presentation/widgets/video_call_livekit_track_utils.dart b/lib/features/video_calls/presentation/widgets/video_call_livekit_track_utils.dart
index 44011084..18b1acba 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_livekit_track_utils.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_livekit_track_utils.dart
@@ -8,6 +8,9 @@ abstract final class VideoCallLiveKitTrackUtils {
 
   static lk.VideoTrack? visibleVideoFromPublication(lk.TrackPublication? pub) {
     if (pub == null || pub.muted) return null;
+    if (pub is lk.RemoteTrackPublication && !pub.subscribed) {
+      return null;
+    }
     final v = asVideoTrack(pub.track);
     if (v == null || v.muted) return null;
     return v;
@@ -37,4 +40,6 @@ abstract final class VideoCallLiveKitTrackUtils {
       room.localParticipant?.getTrackPublicationBySource(lk.TrackSource.camera),
     );
   }
+
+  static bool isSoloInRoom(lk.Room room) => room.remoteParticipants.isEmpty;
 }
diff --git a/lib/features/video_calls/presentation/widgets/video_call_name_chips.dart b/lib/features/video_calls/presentation/widgets/video_call_name_chips.dart
index ff4829eb..389af26e 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_name_chips.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_name_chips.dart
@@ -2,40 +2,74 @@ import 'dart:ui';
 
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 
 class VideoCallParticipantNameLabel extends StatelessWidget {
-  const VideoCallParticipantNameLabel({super.key, required this.name});
+  const VideoCallParticipantNameLabel({
+    super.key,
+    required this.name,
+    this.isConsultant = false,
+  });
 
   final String name;
+  final bool isConsultant;
 
   @override
   Widget build(BuildContext context) {
+    final roleLabel = isConsultant ? S.of(context).video_call_role_consultant : null;
+
     return Positioned(
       left: 12,
       bottom: 12,
       right: 12,
       child: Align(
         alignment: Alignment.bottomLeft,
-        child: ClipRRect(
-          borderRadius: BorderRadius.circular(60),
-          child: BackdropFilter(
-            filter: ImageFilter.blur(sigmaX: 5.5, sigmaY: 5.5),
-            child: Container(
-              constraints: const BoxConstraints(maxWidth: 240),
-              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
-              decoration: BoxDecoration(
-                color: appTheme.transparentBlack,
-                borderRadius: BorderRadius.circular(60),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            if (roleLabel != null) ...[
+              Container(
+                constraints: const BoxConstraints(maxWidth: 240),
+                padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
+                decoration: BoxDecoration(
+                  color: appTheme.whiteA700,
+                  borderRadius: BorderRadius.circular(60),
+                ),
+                child: Text(
+                  roleLabel,
+                  style: TextStyles.textXSSemibold.copyWith(
+                    color: appTheme.blueA400,
+                    height: 14 / 12,
+                  ),
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                ),
               ),
-              child: Text(
-                name,
-                style: TextStyles.textMMedium.copyWith(color: appTheme.whiteA700),
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
+              const SizedBox(height: 16),
+            ],
+            ClipRRect(
+              borderRadius: BorderRadius.circular(60),
+              child: BackdropFilter(
+                filter: ImageFilter.blur(sigmaX: 5.5, sigmaY: 5.5),
+                child: Container(
+                  constraints: const BoxConstraints(maxWidth: 240),
+                  padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
+                  decoration: BoxDecoration(
+                    color: appTheme.transparentBlack,
+                    borderRadius: BorderRadius.circular(60),
+                  ),
+                  child: Text(
+                    name,
+                    style: TextStyles.textMMedium.copyWith(color: appTheme.whiteA700),
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                ),
               ),
             ),
-          ),
+          ],
         ),
       ),
     );
diff --git a/lib/features/video_calls/presentation/widgets/video_call_pip_video_preview.dart b/lib/features/video_calls/presentation/widgets/video_call_pip_video_preview.dart
new file mode 100644
index 00000000..c3baad4c
--- /dev/null
+++ b/lib/features/video_calls/presentation/widgets/video_call_pip_video_preview.dart
@@ -0,0 +1,73 @@
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_livekit_track_utils.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_no_video_background.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_remote_video_stage.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart';
+import 'package:flutter/material.dart';
+import 'package:livekit_client/livekit_client.dart' as lk;
+
+/// Shared compact preview for both in-app and Android system PiP.
+class VideoCallPipVideoPreview extends StatelessWidget {
+  const VideoCallPipVideoPreview({
+    super.key,
+    required this.sessionState,
+    required this.room,
+  });
+
+  final VideoCallSessionState sessionState;
+  final lk.Room room;
+
+  static const double _pipNoVideoLogoSize = 56;
+
+  @override
+  Widget build(BuildContext context) {
+    return ListenableBuilder(
+      listenable: videoCallRoomTracksListenable(room),
+      builder: (context, _) {
+        if (VideoCallLiveKitTrackUtils.isSoloInRoom(room)) {
+          return _VideoCallPipLocalPreview(
+            room: room,
+            videoEnabled: sessionState.videoEnabled,
+          );
+        }
+
+        return VideoCallRemoteVideoStage(
+          room: room,
+          connectError: null,
+          noVideoLogoSize: _pipNoVideoLogoSize,
+        );
+      },
+    );
+  }
+}
+
+class _VideoCallPipLocalPreview extends StatelessWidget {
+  const _VideoCallPipLocalPreview({
+    required this.room,
+    required this.videoEnabled,
+  });
+
+  final lk.Room room;
+  final bool videoEnabled;
+
+  @override
+  Widget build(BuildContext context) {
+    if (!videoEnabled) {
+      return const VideoCallNoVideoBackground(logoSize: 56);
+    }
+
+    final local = VideoCallLiveKitTrackUtils.localCameraVideoTrack(room);
+    if (local != null) {
+      return IgnorePointer(
+        child: lk.VideoTrackRenderer(
+          local,
+          key: ValueKey(local.sid),
+          fit: lk.VideoViewFit.cover,
+          mirrorMode: lk.VideoViewMirrorMode.auto,
+        ),
+      );
+    }
+
+    return const VideoCallNoVideoBackground(logoSize: 56);
+  }
+}
diff --git a/lib/features/video_calls/presentation/widgets/video_call_remote_video_stage.dart b/lib/features/video_calls/presentation/widgets/video_call_remote_video_stage.dart
index 1cf3a376..3f35cd61 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_remote_video_stage.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_remote_video_stage.dart
@@ -2,6 +2,7 @@ import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_livekit_track_utils.dart';
 import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_no_video_background.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart';
 import 'package:flutter/material.dart';
 import 'package:livekit_client/livekit_client.dart' as lk;
 
@@ -10,25 +11,34 @@ class VideoCallRemoteVideoStage extends StatelessWidget {
     super.key,
     required this.room,
     required this.connectError,
+    this.noVideoLogoSize = 96,
   });
 
   final lk.Room room;
   final String? connectError;
+  final double noVideoLogoSize;
 
   @override
   Widget build(BuildContext context) {
     return ListenableBuilder(
-      listenable: room,
+      listenable: videoCallRoomTracksListenable(room),
       builder: (context, _) {
         final remote = VideoCallLiveKitTrackUtils.remoteCameraVideoTrack(room);
         if (remote != null) {
-          return lk.VideoTrackRenderer(remote, fit: lk.VideoViewFit.cover);
+          return lk.VideoTrackRenderer(
+            remote,
+            key: ValueKey(remote.sid),
+            fit: lk.VideoViewFit.cover,
+          );
         }
+        final showConnectError =
+            connectError != null &&
+            room.connectionState != lk.ConnectionState.connected;
         return Stack(
           fit: StackFit.expand,
           children: [
-            const VideoCallNoVideoBackground(),
-            if (connectError != null)
+            VideoCallNoVideoBackground(logoSize: noVideoLogoSize),
+            if (showConnectError)
               Center(
                 child: Padding(
                   padding: const EdgeInsets.all(24),
diff --git a/lib/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart b/lib/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart
new file mode 100644
index 00000000..c36801d7
--- /dev/null
+++ b/lib/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart
@@ -0,0 +1,11 @@
+import 'package:flutter/foundation.dart';
+import 'package:livekit_client/livekit_client.dart' as lk;
+
+
+Listenable videoCallRoomTracksListenable(lk.Room room) {
+  return Listenable.merge([
+    room,
+    ...room.remoteParticipants.values,
+    if (room.localParticipant != null) room.localParticipant!,
+  ]);
+}
diff --git a/lib/features/video_calls/presentation/widgets/video_call_stage_layout.dart b/lib/features/video_calls/presentation/widgets/video_call_stage_layout.dart
index 38ea44d5..131c7a55 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_stage_layout.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_stage_layout.dart
@@ -5,6 +5,7 @@ import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_
 import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_name_chips.dart';
 import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_no_video_background.dart';
 import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_remote_video_stage.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:livekit_client/livekit_client.dart' as lk;
@@ -24,6 +25,7 @@ class VideoCallStageLayout extends StatefulWidget {
     required this.connectError,
     required this.localDisplayName,
     required this.remoteDisplayName,
+    this.remoteIsConsultant = false,
     required this.micEnabled,
     required this.videoEnabled,
     required this.splitParticipantView,
@@ -48,6 +50,7 @@ class VideoCallStageLayout extends StatefulWidget {
   final String? connectError;
   final String localDisplayName;
   final String remoteDisplayName;
+  final bool remoteIsConsultant;
   final bool micEnabled;
   final bool videoEnabled;
   final bool splitParticipantView;
@@ -83,6 +86,8 @@ class _VideoCallStageLayoutState extends State<VideoCallStageLayout> {
   static const double _pipInitialExtraDown = 16;
   static const double _bottomGradientHeight = 140;
   static const double _splitExpandButtonTop = 8 + _shrinkExpandExtraTop;
+  static const int _splitRemoteFlex = 7;
+  static const int _splitLocalFlex = 3;
 
   double? _pipLeft;
   double? _pipTop;
@@ -90,13 +95,6 @@ class _VideoCallStageLayoutState extends State<VideoCallStageLayout> {
   double? _pipPanOriginLeft;
   double? _pipPanOriginTop;
 
-  bool _pipHasVisibleVideo() {
-    if (widget.mainStageShowsLocalVideo) {
-      return VideoCallLiveKitTrackUtils.remoteCameraVideoTrack(widget.room) != null;
-    }
-    return widget.videoEnabled && VideoCallLiveKitTrackUtils.localCameraVideoTrack(widget.room) != null;
-  }
-
   @override
   Widget build(BuildContext context) {
     return LayoutBuilder(
@@ -110,15 +108,17 @@ class _VideoCallStageLayoutState extends State<VideoCallStageLayout> {
   }
 
   Widget _buildSplitLayout(BoxConstraints constraints) {
-    return Stack(
-      fit: StackFit.expand,
-      children: [
-        Positioned.fill(
-          child: Padding(
-            padding: EdgeInsets.fromLTRB(_edgeInset, widget.topInset + _edgeInset, _edgeInset, _edgeInset),
-            child: Column(
-              children: [
-                Expanded(
+    return ListenableBuilder(
+      listenable: videoCallRoomTracksListenable(widget.room),
+      builder: (context, _) {
+        final soloInRoom = VideoCallLiveKitTrackUtils.isSoloInRoom(widget.room);
+        if (soloInRoom) {
+          return Stack(
+            fit: StackFit.expand,
+            children: [
+              Positioned.fill(
+                child: Padding(
+                  padding: EdgeInsets.fromLTRB(_edgeInset, widget.topInset + _edgeInset, _edgeInset, _edgeInset),
                   child: _SplitParticipantPane(
                     room: widget.room,
                     displayName: widget.localDisplayName,
@@ -128,40 +128,73 @@ class _VideoCallStageLayoutState extends State<VideoCallStageLayout> {
                     useFrontCamera: widget.useFrontCamera,
                     onExpand: widget.onExpandLocal,
                     onSwitchCamera: widget.onSwitchCamera,
-                    borderRadius: const BorderRadius.only(
-                      topLeft: Radius.circular(_mainStageCornerRadius),
-                      topRight: Radius.circular(_mainStageCornerRadius),
-                      bottomLeft: Radius.zero,
-                      bottomRight: Radius.zero,
-                    ),
+                    borderRadius: BorderRadius.circular(_mainStageCornerRadius),
                   ),
                 ),
-                const SizedBox(height: _edgeInset),
-                Expanded(
-                  child: _SplitParticipantPane(
-                    room: widget.room,
-                    displayName: widget.remoteDisplayName,
-                    isLocal: false,
-                    connectError: widget.connectError,
-                    videoEnabled: widget.videoEnabled,
-                    useFrontCamera: widget.useFrontCamera,
-                    onExpand: widget.onExpandRemote,
-                    onSwitchCamera: widget.onSwitchCamera,
-                    borderRadius: const BorderRadius.only(
-                      topLeft: Radius.zero,
-                      topRight: Radius.zero,
-                      bottomLeft: Radius.circular(_mainStageCornerRadius),
-                      bottomRight: Radius.circular(_mainStageCornerRadius),
+              ),
+              ..._bottomBarGradient(),
+              ..._bottomControlsRow(),
+            ],
+          );
+        }
+
+        return Stack(
+          fit: StackFit.expand,
+          children: [
+            Positioned.fill(
+              child: Padding(
+                padding: EdgeInsets.fromLTRB(_edgeInset, widget.topInset + _edgeInset, _edgeInset, _edgeInset),
+                child: Column(
+                  children: [
+                    Expanded(
+                      flex: _splitRemoteFlex,
+                      child: _SplitParticipantPane(
+                        room: widget.room,
+                        displayName: widget.remoteDisplayName,
+                        isConsultant: widget.remoteIsConsultant,
+                        isLocal: false,
+                        connectError: widget.connectError,
+                        videoEnabled: widget.videoEnabled,
+                        useFrontCamera: widget.useFrontCamera,
+                        onExpand: widget.onExpandRemote,
+                        onSwitchCamera: widget.onSwitchCamera,
+                        borderRadius: const BorderRadius.only(
+                          topLeft: Radius.circular(_mainStageCornerRadius),
+                          topRight: Radius.circular(_mainStageCornerRadius),
+                          bottomLeft: Radius.zero,
+                          bottomRight: Radius.zero,
+                        ),
+                      ),
                     ),
-                  ),
+                    const SizedBox(height: _edgeInset),
+                    Expanded(
+                      flex: _splitLocalFlex,
+                      child: _SplitParticipantPane(
+                        room: widget.room,
+                        displayName: widget.localDisplayName,
+                        isLocal: true,
+                        connectError: null,
+                        videoEnabled: widget.videoEnabled,
+                        useFrontCamera: widget.useFrontCamera,
+                        onExpand: widget.onExpandLocal,
+                        onSwitchCamera: widget.onSwitchCamera,
+                        borderRadius: const BorderRadius.only(
+                          topLeft: Radius.zero,
+                          topRight: Radius.zero,
+                          bottomLeft: Radius.circular(_mainStageCornerRadius),
+                          bottomRight: Radius.circular(_mainStageCornerRadius),
+                        ),
+                      ),
+                    ),
+                  ],
                 ),
-              ],
+              ),
             ),
-          ),
-        ),
-        ..._bottomBarGradient(),
-        ..._bottomControlsRow(),
-      ],
+            ..._bottomBarGradient(),
+            ..._bottomControlsRow(),
+          ],
+        );
+      },
     );
   }
 
@@ -176,99 +209,106 @@ class _VideoCallStageLayoutState extends State<VideoCallStageLayout> {
     final pipLeft = ((_pipLeft ?? defaultPipLeft).clamp(_edgeInset, maxPipLeft) as num).toDouble();
     final pipTop = ((_pipTop ?? defaultPipTop).clamp(minPipTop, maxPipTop) as num).toDouble();
 
-    return Stack(
-      fit: StackFit.expand,
-      children: [
-        Positioned.fill(
-          child: Padding(
-            padding: EdgeInsets.fromLTRB(_edgeInset, widget.topInset + _edgeInset, _edgeInset, _edgeInset),
-            child: Material(
-              type: MaterialType.transparency,
-              clipBehavior: Clip.antiAlias,
-              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(_mainStageCornerRadius)),
-              child: Stack(
-                fit: StackFit.expand,
-                children: [
-                  _VideoCallMainStage(
-                    room: widget.room,
-                    connectError: widget.connectError,
-                    mainShowsLocal: widget.mainStageShowsLocalVideo,
-                    videoEnabled: widget.videoEnabled,
-                  ),
-                  VideoCallParticipantNameLabel(name: widget.mainStageShowsLocalVideo ? widget.localDisplayName : widget.remoteDisplayName),
-                ],
-              ),
-            ),
-          ),
-        ),
-        ..._bottomBarGradient(),
-        ..._bottomControlsRow(),
-        Positioned(
-          top: widget.topInset + _edgeInset + _shrinkExpandExtraTop,
-          left: _controlsHorizontalInset,
-          child: Padding(
-            padding: _kExpandShrinkOuterPadding,
-            child: VideoCallPipStyleIconButton(
-              onPressed: widget.onShrinkFromFullscreen,
-              child: SvgPicture.asset(_VideoCallStageAssets.shrink, width: 20, height: 20, fit: BoxFit.contain),
-            ),
-          ),
-        ),
-        ListenableBuilder(
-          listenable: widget.room,
-          builder: (context, _) {
-            if (!_pipHasVisibleVideo()) {
-              return const SizedBox.shrink();
-            }
-            return Positioned(
-              left: pipLeft,
-              top: pipTop,
-              child: GestureDetector(
-                behavior: HitTestBehavior.opaque,
-                onTap: widget.onToggleStageSwap,
-                onPanStart: (details) {
-                  _pipPanPointerGlobal = details.globalPosition;
-                  _pipPanOriginLeft = pipLeft;
-                  _pipPanOriginTop = pipTop;
-                },
-                onPanUpdate: (details) {
-                  if (_pipPanPointerGlobal == null || _pipPanOriginLeft == null || _pipPanOriginTop == null) {
-                    return;
-                  }
-                  final delta = details.globalPosition - _pipPanPointerGlobal!;
-                  setState(() {
-                    final nx = (_pipPanOriginLeft! + delta.dx).clamp(_edgeInset, maxPipLeft);
-                    final ny = (_pipPanOriginTop! + delta.dy).clamp(minPipTop, maxPipTop);
-                    _pipLeft = (nx as num).toDouble();
-                    _pipTop = (ny as num).toDouble();
-                  });
-                },
-                onPanEnd: (_) {
-                  _resetPipPanState();
-                },
-                onPanCancel: _resetPipPanState,
-                child: AnimatedContainer(
-                  duration: const Duration(milliseconds: 220),
-                  curve: Curves.easeOutCubic,
-                  width: _pipW,
-                  height: _pipH,
-                  child: ClipRRect(
-                    borderRadius: BorderRadius.circular(8),
-                    child: widget.mainStageShowsLocalVideo
-                        ? _VideoCallPipRemoteContent(room: widget.room)
-                        : _VideoCallPipLocalContent(
-                            room: widget.room,
-                            videoEnabled: widget.videoEnabled,
-                            useFrontCamera: widget.useFrontCamera,
-                            onSwitchCamera: widget.onSwitchCamera,
-                          ),
+    return ListenableBuilder(
+      listenable: videoCallRoomTracksListenable(widget.room),
+      builder: (context, _) {
+        final soloInRoom = VideoCallLiveKitTrackUtils.isSoloInRoom(widget.room);
+        final mainShowsLocal =
+            soloInRoom || widget.mainStageShowsLocalVideo;
+
+        return Stack(
+          fit: StackFit.expand,
+          children: [
+            Positioned.fill(
+              child: Padding(
+                padding: EdgeInsets.fromLTRB(_edgeInset, widget.topInset + _edgeInset, _edgeInset, _edgeInset),
+                child: Material(
+                  type: MaterialType.transparency,
+                  clipBehavior: Clip.antiAlias,
+                  shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(_mainStageCornerRadius)),
+                  child: Stack(
+                    fit: StackFit.expand,
+                    children: [
+                      _VideoCallMainStage(
+                        room: widget.room,
+                        connectError: widget.connectError,
+                        mainShowsLocal: mainShowsLocal,
+                        videoEnabled: widget.videoEnabled,
+                      ),
+                      VideoCallParticipantNameLabel(
+                        name: mainShowsLocal
+                            ? widget.localDisplayName
+                            : widget.remoteDisplayName,
+                        isConsultant: !mainShowsLocal && widget.remoteIsConsultant,
+                      ),
+                    ],
                   ),
                 ),
               ),
-            );
-          },
-        ),
-      ],
+            ),
+            ..._bottomBarGradient(),
+            ..._bottomControlsRow(),
+            Positioned(
+              top: widget.topInset + _edgeInset + _shrinkExpandExtraTop,
+              left: _controlsHorizontalInset,
+              child: Padding(
+                padding: _kExpandShrinkOuterPadding,
+                child: VideoCallPipStyleIconButton(
+                  onPressed: widget.onShrinkFromFullscreen,
+                  child: SvgPicture.asset(_VideoCallStageAssets.shrink, width: 20, height: 20, fit: BoxFit.contain),
+                ),
+              ),
+            ),
+            if (!soloInRoom)
+              Positioned(
+                left: pipLeft,
+                top: pipTop,
+                child: GestureDetector(
+                  behavior: HitTestBehavior.opaque,
+                  onTap: widget.onToggleStageSwap,
+                  onPanStart: (details) {
+                    _pipPanPointerGlobal = details.globalPosition;
+                    _pipPanOriginLeft = pipLeft;
+                    _pipPanOriginTop = pipTop;
+                  },
+                  onPanUpdate: (details) {
+                    if (_pipPanPointerGlobal == null || _pipPanOriginLeft == null || _pipPanOriginTop == null) {
+                      return;
+                    }
+                    final delta = details.globalPosition - _pipPanPointerGlobal!;
+                    setState(() {
+                      final nx = (_pipPanOriginLeft! + delta.dx).clamp(_edgeInset, maxPipLeft);
+                      final ny = (_pipPanOriginTop! + delta.dy).clamp(minPipTop, maxPipTop);
+                      _pipLeft = (nx as num).toDouble();
+                      _pipTop = (ny as num).toDouble();
+                    });
+                  },
+                  onPanEnd: (_) {
+                    _resetPipPanState();
+                  },
+                  onPanCancel: _resetPipPanState,
+                  child: AnimatedContainer(
+                    duration: const Duration(milliseconds: 220),
+                    curve: Curves.easeOutCubic,
+                    width: _pipW,
+                    height: _pipH,
+                    child: ClipRRect(
+                      borderRadius: BorderRadius.circular(8),
+                      child: mainShowsLocal
+                          ? _VideoCallPipRemoteContent(room: widget.room)
+                          : _VideoCallPipLocalContent(
+                              room: widget.room,
+                              videoEnabled: widget.videoEnabled,
+                              useFrontCamera: widget.useFrontCamera,
+                              onSwitchCamera: widget.onSwitchCamera,
+                            ),
+                    ),
+                  ),
+                ),
+              ),
+          ],
+        );
+      },
     );
   }
 
@@ -332,6 +372,7 @@ class _SplitParticipantPane extends StatelessWidget {
   const _SplitParticipantPane({
     required this.room,
     required this.displayName,
+    this.isConsultant = false,
     required this.isLocal,
     required this.connectError,
     required this.videoEnabled,
@@ -343,6 +384,7 @@ class _SplitParticipantPane extends StatelessWidget {
 
   final lk.Room room;
   final String displayName;
+  final bool isConsultant;
   final bool isLocal;
   final String? connectError;
   final bool videoEnabled;
@@ -362,7 +404,7 @@ class _SplitParticipantPane extends StatelessWidget {
         children: [
           Positioned.fill(
             child: ListenableBuilder(
-              listenable: room,
+              listenable: videoCallRoomTracksListenable(room),
               builder: (context, _) {
                 if (isLocal) {
                   if (!videoEnabled) {
@@ -371,7 +413,12 @@ class _SplitParticipantPane extends StatelessWidget {
                   final local = VideoCallLiveKitTrackUtils.localCameraVideoTrack(room);
                   if (local != null) {
                     return IgnorePointer(
-                      child: lk.VideoTrackRenderer(local, fit: lk.VideoViewFit.cover, mirrorMode: lk.VideoViewMirrorMode.auto),
+                      child: lk.VideoTrackRenderer(
+                        local,
+                        key: ValueKey(local.sid),
+                        fit: lk.VideoViewFit.cover,
+                        mirrorMode: lk.VideoViewMirrorMode.auto,
+                      ),
                     );
                   }
                   return const VideoCallNoVideoBackground();
@@ -380,7 +427,10 @@ class _SplitParticipantPane extends StatelessWidget {
               },
             ),
           ),
-          VideoCallParticipantNameLabel(name: displayName),
+          VideoCallParticipantNameLabel(
+            name: displayName,
+            isConsultant: !isLocal && isConsultant,
+          ),
           Positioned(
             left: 0,
             top: _VideoCallStageLayoutState._splitExpandButtonTop,
@@ -421,7 +471,7 @@ class _VideoCallMainStage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ListenableBuilder(
-      listenable: room,
+      listenable: videoCallRoomTracksListenable(room),
       builder: (context, _) {
         if (mainShowsLocal) {
           if (!videoEnabled) {
@@ -430,7 +480,12 @@ class _VideoCallMainStage extends StatelessWidget {
           final local = VideoCallLiveKitTrackUtils.localCameraVideoTrack(room);
           if (local != null) {
             return IgnorePointer(
-              child: lk.VideoTrackRenderer(local, fit: lk.VideoViewFit.cover, mirrorMode: lk.VideoViewMirrorMode.auto),
+              child: lk.VideoTrackRenderer(
+                local,
+                key: ValueKey(local.sid),
+                fit: lk.VideoViewFit.cover,
+                mirrorMode: lk.VideoViewMirrorMode.auto,
+              ),
             );
           }
           return const VideoCallNoVideoBackground();
@@ -448,7 +503,13 @@ class _VideoCallPipRemoteContent extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return IgnorePointer(child: VideoCallRemoteVideoStage(room: room, connectError: null));
+    return IgnorePointer(
+      child: VideoCallRemoteVideoStage(
+        room: room,
+        connectError: null,
+        noVideoLogoSize: 56,
+      ),
+    );
   }
 }
 
@@ -470,7 +531,12 @@ class _VideoCallPipLocalContent extends StatelessWidget {
           const VideoCallNoVideoBackground(logoSize: 56)
         else if (local != null)
           IgnorePointer(
-            child: lk.VideoTrackRenderer(local, fit: lk.VideoViewFit.cover, mirrorMode: lk.VideoViewMirrorMode.auto),
+            child: lk.VideoTrackRenderer(
+              local,
+              key: ValueKey(local.sid),
+              fit: lk.VideoViewFit.cover,
+              mirrorMode: lk.VideoViewMirrorMode.auto,
+            ),
           )
         else
           const VideoCallNoVideoBackground(logoSize: 56),
diff --git a/lib/features/video_calls/presentation/widgets/video_call_system_pip_content.dart b/lib/features/video_calls/presentation/widgets/video_call_system_pip_content.dart
new file mode 100644
index 00000000..3abcb415
--- /dev/null
+++ b/lib/features/video_calls/presentation/widgets/video_call_system_pip_content.dart
@@ -0,0 +1,66 @@
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_pip_video_preview.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+/// Compact call UI rendered by [PiPSwitcher] while Android is in system PiP mode.
+class VideoCallSystemPipContent extends StatelessWidget {
+  const VideoCallSystemPipContent({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<VideoCallSessionCubit, VideoCallSessionState>(
+      bloc: sl<VideoCallSessionCubit>(),
+      buildWhen: (a, b) =>
+          a.connectPhase != b.connectPhase ||
+          a.linkIssue != b.linkIssue ||
+          a.callStageEntered != b.callStageEntered ||
+          a.videoEnabled != b.videoEnabled,
+      builder: (context, state) {
+        if (state.connectPhase != VideoCallConnectPhase.connected ||
+            state.linkIssue.needsManualReconnect ||
+            !state.callStageEntered) {
+          if (state.conversationUuid.isNotEmpty &&
+              state.connectPhase != VideoCallConnectPhase.idle &&
+              !state.linkIssue.needsManualReconnect) {
+            return ColoredBox(
+              color: appTheme.gray100,
+              child: Center(
+                child: SizedBox(
+                  width: 36,
+                  height: 36,
+                  child: CircularProgressIndicator(
+                    strokeWidth: 3,
+                    color: appTheme.blueA400,
+                  ),
+                ),
+              ),
+            );
+          }
+          return const ColoredBox(color: Colors.black);
+        }
+
+        final cubit = sl<VideoCallSessionCubit>();
+        final room = cubit.liveKitRoom;
+        if (room == null) {
+          return const ColoredBox(color: Colors.black);
+        }
+
+        return Material(
+          color: Colors.black,
+          child: ListenableBuilder(
+            listenable: videoCallRoomTracksListenable(room),
+            builder: (context, _) => VideoCallPipVideoPreview(
+              sessionState: state,
+              room: room,
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/features/video_calls/presentation/widgets/video_call_system_pip_listener.dart b/lib/features/video_calls/presentation/widgets/video_call_system_pip_listener.dart
new file mode 100644
index 00000000..7a0f8957
--- /dev/null
+++ b/lib/features/video_calls/presentation/widgets/video_call_system_pip_listener.dart
@@ -0,0 +1,117 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:eatvio_app/core/app_router.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+import 'package:eatvio_app/features/video_calls/presentation/pages/video_call_screen.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_system_pip_coordinator.dart';
+import 'package:floating/floating.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:go_router/go_router.dart';
+
+/// Syncs [VideoCallSessionCubit] with Android system PiP lifecycle events.
+class VideoCallSystemPipListener extends StatefulWidget {
+  const VideoCallSystemPipListener({super.key});
+
+  @override
+  State<VideoCallSystemPipListener> createState() =>
+      _VideoCallSystemPipListenerState();
+}
+
+class _VideoCallSystemPipListenerState extends State<VideoCallSystemPipListener>
+    with WidgetsBindingObserver {
+  static const MethodChannel _userLeaveHintChannel = MethodChannel(
+    'com.eatvioapp/video_call_pip',
+  );
+
+  StreamSubscription<PiPStatus>? _subscription;
+  PiPStatus? _lastStatus;
+
+  @override
+  void initState() {
+    super.initState();
+    if (!Platform.isAndroid) return;
+
+    WidgetsBinding.instance.addObserver(this);
+    _userLeaveHintChannel.setMethodCallHandler(_onNativePipMethodCall);
+    final coordinator = sl<VideoCallSystemPipCoordinator>();
+    _subscription = coordinator.statusStream.listen(_onPipStatus);
+    unawaited(_disarmSystemPipIfNoActiveCall());
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    if (state == AppLifecycleState.resumed) {
+      unawaited(_disarmSystemPipIfNoActiveCall());
+    }
+  }
+
+  Future<void> _disarmSystemPipIfNoActiveCall() async {
+    if (!sl<VideoCallManager>().isActiveCall) {
+      await sl<VideoCallSystemPipCoordinator>().disarm();
+    }
+  }
+
+  Future<void> _onNativePipMethodCall(MethodCall call) async {
+    if (call.method != 'onUserLeaveHint') return;
+    await sl<VideoCallSessionCubit>().syncPipUiStateFromSystem();
+  }
+
+  Future<void> _onPipStatus(PiPStatus status) async {
+    final cubit = sl<VideoCallSessionCubit>();
+    final wasEnabled = _lastStatus == PiPStatus.enabled;
+    _lastStatus = status;
+
+    if (status == PiPStatus.enabled) {
+      await cubit.syncPipUiStateFromSystem();
+      return;
+    }
+
+    if (!wasEnabled || status != PiPStatus.disabled) return;
+
+    if (cubit.isCallScreenRouteVisible) {
+      await cubit.onSystemPipExitedWithCallScreenVisible();
+      return;
+    }
+
+    if (cubit.state.uiMode != VideoCallUiMode.pip) return;
+
+    await cubit.restoreFullscreenFromPip();
+    if (!mounted) return;
+    if (cubit.isCallScreenRouteVisible) return;
+    _openCallScreen(cubit.state);
+  }
+
+  void _openCallScreen(VideoCallSessionState state) {
+    if (state.conversationUuid.isEmpty) return;
+
+    final ctx = AppRouter.navigatorKey.currentContext;
+    if (ctx == null) return;
+
+    GoRouter.of(ctx).pushNamed(
+      VideoCallScreen.name,
+      extra: <String, dynamic>{
+        'conversationUuid': state.conversationUuid,
+        'counterpartName': state.counterpartName,
+        'localParticipantName': state.localParticipantName,
+      },
+    );
+  }
+
+  @override
+  void dispose() {
+    if (Platform.isAndroid) {
+      WidgetsBinding.instance.removeObserver(this);
+      _userLeaveHintChannel.setMethodCallHandler(null);
+    }
+    unawaited(_subscription?.cancel());
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) => const SizedBox.shrink();
+}
diff --git a/lib/features/video_calls/presentation/widgets/video_call_top_overlay.dart b/lib/features/video_calls/presentation/widgets/video_call_top_overlay.dart
index 1f0bff71..8ea2ddb4 100644
--- a/lib/features/video_calls/presentation/widgets/video_call_top_overlay.dart
+++ b/lib/features/video_calls/presentation/widgets/video_call_top_overlay.dart
@@ -1,12 +1,75 @@
+import 'package:eatvio_app/core/app_router.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_banner_overlay.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 
-
 abstract final class VideoCallTopOverlay {
-  static const String poorConnectionSvg = 'assets/icons/video_call/poor_connection.svg';
+  static const String poorConnectionSvg =
+      'assets/icons/video_call/poor_connection.svg';
   static const String warningSvg = 'assets/icons/video_call/warning.svg';
 
+  static const double _poorConnectionIconSize = 44;
+  static const double _poorConnectionGlyphSize = 22;
+
+  static OverlayEntry? _poorConnectionEntry;
+
+  static bool get isPoorConnectionIconVisible =>
+      _poorConnectionEntry?.mounted ?? false;
+
+  static OverlayState? _resolveOverlayState(BuildContext context) {
+    return VideoCallBannerOverlay.overlayState ??
+        AppRouter.navigatorKey.currentState?.overlay ??
+        Overlay.maybeOf(context, rootOverlay: true);
+  }
+
+  /// Compact poor-connection indicator: red square with icon only.
+  static void showPoorConnectionIcon(BuildContext context) {
+    if (isPoorConnectionIconVisible) return;
+
+    hidePoorConnectionIcon();
+
+    final overlayState = _resolveOverlayState(context);
+    late OverlayEntry entry;
+    entry = OverlayEntry(
+      builder: (ctx) {
+        final topInset = MediaQuery.viewPaddingOf(ctx).top;
+        return Positioned(
+          left: 16,
+          top: topInset + 8,
+          width: _poorConnectionIconSize,
+          height: _poorConnectionIconSize,
+          child: Material(
+            color: appTheme.strongRed,
+            borderRadius: BorderRadius.circular(10),
+            elevation: 6,
+            child: Center(
+              child: SvgPicture.asset(
+                poorConnectionSvg,
+                width: _poorConnectionGlyphSize,
+                height: _poorConnectionGlyphSize,
+              ),
+            ),
+          ),
+        );
+      },
+    );
+
+    _poorConnectionEntry = entry;
+    if (overlayState == null) {
+      _poorConnectionEntry = null;
+      return;
+    }
+    overlayState.insert(entry);
+  }
+
+  static void hidePoorConnectionIcon() {
+    final entry = _poorConnectionEntry;
+    _poorConnectionEntry = null;
+    if (entry != null && entry.mounted) {
+      entry.remove();
+    }
+  }
 
   static OverlayEntry insertBanner(
     BuildContext context, {
@@ -15,7 +78,7 @@ abstract final class VideoCallTopOverlay {
     required String svgAsset,
     Duration? autoRemoveAfter,
   }) {
-    final overlayState = Overlay.of(context, rootOverlay: true);
+    final overlayState = _resolveOverlayState(context);
     late OverlayEntry entry;
     entry = OverlayEntry(
       builder: (ctx) => Positioned(
@@ -50,6 +113,9 @@ abstract final class VideoCallTopOverlay {
         ),
       ),
     );
+    if (overlayState == null) {
+      return entry;
+    }
     overlayState.insert(entry);
     if (autoRemoveAfter != null) {
       Future<void>.delayed(autoRemoveAfter, () {
diff --git a/lib/features/video_calls/repositories/video_call_repository.dart b/lib/features/video_calls/repositories/video_call_repository.dart
index 1b9835b5..15cbb4f1 100644
--- a/lib/features/video_calls/repositories/video_call_repository.dart
+++ b/lib/features/video_calls/repositories/video_call_repository.dart
@@ -24,4 +24,14 @@ class VideoCallRepository {
       body: _emptyJsonBody,
     );
   }
+
+  Future<VideoCallAcceptResponse> notifyCallAccepted({
+    required String conversationUuid,
+    required String hwId,
+  }) {
+    return videoCallService.notifyCallAccepted(
+      conversationUuid: conversationUuid,
+      body: <String, dynamic>{'hw_id': hwId},
+    );
+  }
 }
diff --git a/lib/features/video_calls/services/video_call_audio_session_coordinator.dart b/lib/features/video_calls/services/video_call_audio_session_coordinator.dart
new file mode 100644
index 00000000..55c2477d
--- /dev/null
+++ b/lib/features/video_calls/services/video_call_audio_session_coordinator.dart
@@ -0,0 +1,68 @@
+import 'dart:async';
+
+import 'package:audio_session/audio_session.dart';
+
+typedef VideoCallAudioSessionFactory = Future<AudioSession> Function();
+
+/// Configures and owns the platform audio session for an active VoIP call.
+class VideoCallAudioSessionCoordinator {
+  VideoCallAudioSessionCoordinator({
+    VideoCallAudioSessionFactory? audioSessionFactory,
+  }) : _audioSessionFactory =
+            audioSessionFactory ?? (() => AudioSession.instance);
+
+  final VideoCallAudioSessionFactory _audioSessionFactory;
+
+  static final AudioSessionConfiguration callConfiguration =
+      AudioSessionConfiguration(
+    avAudioSessionCategory: AVAudioSessionCategory.playAndRecord,
+    avAudioSessionCategoryOptions:
+        AVAudioSessionCategoryOptions.allowBluetooth |
+            AVAudioSessionCategoryOptions.defaultToSpeaker,
+    avAudioSessionMode: AVAudioSessionMode.voiceChat,
+    avAudioSessionRouteSharingPolicy:
+        AVAudioSessionRouteSharingPolicy.defaultPolicy,
+    avAudioSessionSetActiveOptions: AVAudioSessionSetActiveOptions.none,
+    androidAudioAttributes: const AndroidAudioAttributes(
+      contentType: AndroidAudioContentType.speech,
+      flags: AndroidAudioFlags.none,
+      usage: AndroidAudioUsage.voiceCommunication,
+    ),
+    androidAudioFocusGainType: AndroidAudioFocusGainType.gain,
+    androidWillPauseWhenDucked: true,
+  );
+
+  AudioSession? _session;
+  bool _configured = false;
+
+  bool get isActive => _session != null;
+
+  Future<void> start() async {
+    final session = await _audioSessionFactory();
+    _session = session;
+    if (!_configured) {
+      await session.configure(callConfiguration);
+      _configured = true;
+    }
+    await session.setActive(true);
+  }
+
+  Future<bool> reactivate() async {
+    final session = _session;
+    if (session == null) return false;
+    try {
+      return await session.setActive(true);
+    } catch (_) {
+      return false;
+    }
+  }
+
+  Future<void> stop() async {
+    final session = _session;
+    _session = null;
+    if (session == null) return;
+    try {
+      await session.setActive(false);
+    } catch (_) {}
+  }
+}
diff --git a/lib/features/video_calls/services/video_call_callkit_coordinator.dart b/lib/features/video_calls/services/video_call_callkit_coordinator.dart
new file mode 100644
index 00000000..8facc589
--- /dev/null
+++ b/lib/features/video_calls/services/video_call_callkit_coordinator.dart
@@ -0,0 +1,1020 @@
+import 'dart:async';
+import 'dart:developer';
+import 'dart:io';
+
+import 'package:eatvio_app/core/firebase_api.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_fcm_handler.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_notification_navigator.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_callkit_incoming/entities/call_event.dart';
+import 'package:flutter_callkit_incoming/entities/call_kit_params.dart';
+import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart';
+import 'package:flutter_native_splash/flutter_native_splash.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
+
+class VideoCallCallKitCoordinator {
+  VideoCallCallKitCoordinator({
+    required FirebaseApi firebaseApi,
+    VideoCallManager? videoCallManager,
+    VideoCallSessionCubit? videoCallSessionCubit,
+  }) : _firebaseApi = firebaseApi,
+       _videoCallManager = videoCallManager,
+       _videoCallSessionCubit = videoCallSessionCubit;
+
+  final FirebaseApi _firebaseApi;
+  final VideoCallManager? _videoCallManager;
+  final VideoCallSessionCubit? _videoCallSessionCubit;
+
+  StreamSubscription<CallEvent?>? _eventSubscription;
+  final Map<String, CallKitParams> _callKitParamsById = {};
+  final Set<String> _acceptNavigationCompletedIds = {};
+  final Map<String, Future<void>> _acceptDeliveriesInFlight = {};
+  final Set<String> _suppressedEndCallKitIds = {};
+  String? _activeCallKitId;
+  bool _initialized = false;
+  bool _nativeDiagnosticsDrainScheduled = false;
+
+  static const MethodChannel _voipDiagnosticsChannel = MethodChannel(
+    'com.eatvioapp/voip_diagnostics',
+  );
+  static const MethodChannel _androidCallPushChannel = MethodChannel(
+    'com.eatvioapp/video_call_push',
+  );
+
+  _PendingIncomingAccept? _pendingIncomingAccept;
+  _AndroidAcceptResumeObserver? _androidResumeObserver;
+  bool _pendingAcceptDrainScheduled = false;
+
+  Future<void> initialize() async {
+    if (_initialized) return;
+    _initialized = true;
+
+    _eventSubscription = FlutterCallkitIncoming.onEvent.listen(
+      _onCallKitEvent,
+      onError: (Object error, StackTrace stackTrace) {
+        log(
+          'VideoCallCallKitCoordinator: CallKit event stream error: $error',
+          name: 'VideoCallCallKit',
+          stackTrace: stackTrace,
+        );
+      },
+      cancelOnError: false,
+    );
+
+    VideoCallFcmHandler.registerForegroundListener();
+
+    if (Platform.isIOS) {
+      _voipDiagnosticsChannel.setMethodCallHandler((call) async {
+        switch (call.method) {
+          case 'voipDiagnosticsUpdated':
+            _scheduleNativeVoipDiagnosticsDrain();
+          case 'acceptedVoipCall':
+            await _handleNativeAcceptedVoipCall(call.arguments);
+        }
+      });
+      await _firebaseApi.registerPushToken();
+      await _drainPendingNativeAcceptedVoipCall();
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        _scheduleNativeVoipDiagnosticsDrain();
+        unawaited(_drainPendingNativeAcceptedVoipCall());
+      });
+      return;
+    }
+
+    if (Platform.isAndroid) {
+      FlutterCallkitIncoming.acceptCallHandle(_onNativeAcceptCallHandle);
+      _androidResumeObserver = _AndroidAcceptResumeObserver(
+        onResumed: _onAndroidAppResumed,
+      );
+      WidgetsBinding.instance.addObserver(_androidResumeObserver!);
+      _androidCallPushChannel.setMethodCallHandler(_onAndroidCallPushMethodCall);
+      await FlutterCallkitIncoming.requestNotificationPermission(<
+        String,
+        dynamic
+      >{
+        'title': 'Уведомления',
+        'rationaleMessagePermission':
+            'Разрешите уведомления, чтобы получать входящие видеозвонки.',
+        'postNotificationMessageRequired':
+            'Разрешите уведомления в настройках, чтобы получать входящие видеозвонки.',
+      });
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        unawaited(_pollNativePendingAcceptAfterResume());
+      });
+    }
+  }
+
+  Future<void> _onAndroidCallPushMethodCall(MethodCall call) async {
+    if (call.method == 'onCallKitLaunchIntent') {
+      log(
+        'VideoCallCallKitCoordinator: received onCallKitLaunchIntent push from native',
+        name: 'VideoCallCallKit',
+      );
+      await _handleAndroidCallKitLaunchIntent(call.arguments);
+    }
+  }
+
+  void _onAndroidAppResumed() {
+    unawaited(_pollNativePendingAcceptAfterResume());
+  }
+
+  Future<void> _pollNativePendingAcceptAfterResume() async {
+    for (var attempt = 0; attempt < 16; attempt++) {
+      await _processNativePendingAndroidCallAccept();
+      if (_pendingIncomingAccept == null) {
+        if (VideoCallNotificationNavigator.isOnCallRoute()) {
+          return;
+        }
+        final hasNativePending = await _hasNativePendingAndroidCallAccept();
+        if (!hasNativePending && attempt >= 3) {
+          break;
+        }
+      }
+      await Future<void>.delayed(const Duration(milliseconds: 300));
+    }
+    unawaited(_drainPendingIncomingAcceptWithRetries());
+  }
+
+  Future<bool> _hasNativePendingAndroidCallAccept() async {
+    try {
+      final pending = await _androidCallPushChannel.invokeMethod<Object?>(
+        'peekPendingCallKitAccept',
+      );
+      return pending != null;
+    } catch (_) {
+      return false;
+    }
+  }
+
+  Future<void> _processNativePendingAndroidCallAccept() async {
+    try {
+      final pending = await _androidCallPushChannel.invokeMethod<Object?>(
+        'peekPendingCallKitAccept',
+      );
+      if (pending == null) return;
+
+      log(
+        'VideoCallCallKitCoordinator: processing native pending accept',
+        name: 'VideoCallCallKit',
+      );
+      await _handleAndroidCallKitLaunchIntent(pending);
+    } on PlatformException catch (e, stackTrace) {
+      log(
+        'VideoCallCallKitCoordinator: failed to peek native pending accept: $e',
+        name: 'VideoCallCallKit',
+        stackTrace: stackTrace,
+      );
+    } catch (e, stackTrace) {
+      log(
+        'VideoCallCallKitCoordinator: failed to process native pending accept: $e',
+        name: 'VideoCallCallKit',
+        stackTrace: stackTrace,
+      );
+    }
+  }
+
+  Future<void> _handleAndroidCallKitLaunchIntent(Object? arguments) async {
+    final data = _stringKeyedMap(arguments);
+    final action = data['action']?.toString() ?? '';
+    if (!action.contains('ACTION_CALL_ACCEPT') &&
+        !action.contains('ACTION_CALL_CALLBACK')) {
+      return;
+    }
+
+    final extra = _stringKeyedMap(data['extra']);
+    final callKitId =
+        _parseString(data, const ['id', 'uuid']) ??
+        _parseString(extra, const ['conversationUuid', 'conversation_uuid']);
+    if (callKitId == null) return;
+
+    final conversationUuid = _parseConversationUuid(
+      extra,
+      handle: _parseString(data, const ['handle']) ?? callKitId,
+    );
+    if (conversationUuid.isEmpty) return;
+
+    await _deliverIncomingAccept(
+      callKitId: callKitId,
+      conversationUuid: conversationUuid,
+      counterpartName:
+          _parseString(extra, const [
+            'counterpartName',
+            'caller_name',
+            'callerName',
+          ]) ??
+          _parseString(data, const ['nameCaller']),
+      counterpartAvatarUrl:
+          _parseString(extra, const [
+            'counterpartAvatarUrl',
+            'avatar',
+            'avatarUrl',
+            'caller_avatar',
+          ]) ??
+          _parseString(data, const ['avatar']),
+      localParticipantName: _parseString(extra, const [
+        'localParticipantName',
+        'local_participant_name',
+      ]),
+      counterpartIsConsultant: _parseBool(extra, const [
+        'counterpartIsConsultant',
+        'counterpart_is_consultant',
+        'is_consultant',
+        'isConsultant',
+      ]),
+    );
+  }
+
+  void dispose() {
+    final observer = _androidResumeObserver;
+    if (observer != null) {
+      WidgetsBinding.instance.removeObserver(observer);
+      _androidResumeObserver = null;
+    }
+    unawaited(_eventSubscription?.cancel());
+    _eventSubscription = null;
+    _callKitParamsById.clear();
+    _pendingIncomingAccept = null;
+    _initialized = false;
+  }
+
+  VideoCallManager get _manager => _videoCallManager ?? sl<VideoCallManager>();
+
+  VideoCallSessionCubit get _cubit =>
+      _videoCallSessionCubit ?? sl<VideoCallSessionCubit>();
+
+  void _scheduleNativeVoipDiagnosticsDrain() {
+    if (_nativeDiagnosticsDrainScheduled) return;
+    _nativeDiagnosticsDrainScheduled = true;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _nativeDiagnosticsDrainScheduled = false;
+      unawaited(_drainNativeVoipDiagnosticsToSentry());
+    });
+  }
+
+  Future<void> _drainNativeVoipDiagnosticsToSentry() async {
+    if (!Platform.isIOS) return;
+    try {
+      final events = await _voipDiagnosticsChannel.invokeListMethod<dynamic>(
+        'drainVoipDiagnostics',
+      );
+      if (events == null || events.isEmpty) return;
+
+      for (final rawEvent in events) {
+        final event = _stringKeyedMap(rawEvent);
+        final name = event['name']?.toString() ?? 'unknown';
+        await Sentry.captureMessage(
+          'iOS VoIP diagnostic: $name',
+          level: SentryLevel.info,
+          withScope: (scope) {
+            scope.setTag('origin', 'iOS VoIP');
+            scope.setTag('voip_diagnostic', 'true');
+            scope.setTag('voip_event', name);
+            scope.setContexts('voip_diagnostic', _stringifyMapValues(event));
+          },
+        );
+      }
+    } on PlatformException catch (e, st) {
+      log(
+        'VideoCallCallKitCoordinator: failed to drain native VoIP diagnostics: $e',
+        name: 'VideoCallCallKit',
+        stackTrace: st,
+      );
+    } catch (e, st) {
+      log(
+        'VideoCallCallKitCoordinator: failed to send native VoIP diagnostics: $e',
+        name: 'VideoCallCallKit',
+        stackTrace: st,
+      );
+    }
+  }
+
+  Future<void> _drainPendingNativeAcceptedVoipCall() async {
+    if (!Platform.isIOS) return;
+    try {
+      final pending = await _voipDiagnosticsChannel.invokeMethod(
+        'drainPendingAcceptedVoipCall',
+      );
+      if (pending == null) return;
+      await _handleNativeAcceptedVoipCall(pending);
+    } on PlatformException catch (e, st) {
+      log(
+        'VideoCallCallKitCoordinator: failed to drain pending native accept: $e',
+        name: 'VideoCallCallKit',
+        stackTrace: st,
+      );
+    } catch (e, st) {
+      log(
+        'VideoCallCallKitCoordinator: failed to process pending native accept: $e',
+        name: 'VideoCallCallKit',
+        stackTrace: st,
+      );
+    }
+  }
+
+  Future<void> _onCallKitEvent(CallEvent? event) async {
+    if (event == null) return;
+
+    try {
+      unawaited(_captureCallKitEventToSentry(event));
+
+      switch (event) {
+        case CallEventActionDidUpdateDevicePushTokenVoip():
+          await _firebaseApi.registerPushToken();
+        case CallEventActionCallIncoming(:final callKitParams):
+          _cacheCallKitParams(callKitParams);
+        case CallEventActionCallAccept():
+          await _handleAcceptEvent(event);
+        case CallEventActionCallCallback():
+          await _handleAcceptEvent(event);
+        case CallEventActionCallDecline():
+          await _handleDeclineEvent(event);
+        case CallEventActionCallEnded():
+          await _handleEndedEvent(event);
+        case CallEventActionCallTimeout():
+          await _handleDeclineEvent(event);
+        default:
+          break;
+      }
+    } catch (error, stackTrace) {
+      log(
+        'VideoCallCallKitCoordinator: failed to handle CallKit event $event: $error',
+        name: 'VideoCallCallKit',
+        stackTrace: stackTrace,
+      );
+    }
+  }
+
+  Future<void> _handleAcceptEvent(CallEvent event) async {
+    final id = _callKitEventId(event);
+    if (id == null) {
+      log(
+        'VideoCallCallKitCoordinator: accept event without callKit id, event=$event',
+        name: 'VideoCallCallKit',
+      );
+      return;
+    }
+    await _handleAccept(id);
+  }
+
+  Future<void> _handleDeclineEvent(CallEvent event) async {
+    final id = _callKitEventId(event);
+    if (id == null) {
+      log(
+        'VideoCallCallKitCoordinator: decline/end event without callKit id, event=$event',
+        name: 'VideoCallCallKit',
+      );
+      return;
+    }
+    await _handleDecline(id);
+  }
+
+  Future<void> _handleEndedEvent(CallEvent event) async {
+    final id = _callKitEventId(event);
+    if (id == null) {
+      log(
+        'VideoCallCallKitCoordinator: ended event without callKit id, event=$event',
+        name: 'VideoCallCallKit',
+      );
+      return;
+    }
+    await _handleEnded(id);
+  }
+
+  Future<void> _captureCallKitEventToSentry(CallEvent event) async {
+    if (!Platform.isIOS) return;
+    final context = <String, Object?>{
+      'eventName': event.eventName,
+      'eventType': event.runtimeType.toString(),
+    };
+    if (event is CallEventActionCallIncoming) {
+      final callKitParams = event.callKitParams;
+      context.addAll({
+        'id': callKitParams.id,
+        'handle': callKitParams.handle,
+        'nameCaller': callKitParams.nameCaller,
+        'isAccepted': callKitParams.isAccepted,
+        'extra': callKitParams.extra?.toString(),
+      });
+    } else if (event is CallEventActionCallAccept) {
+      _addCallKitEventDetails(context, event);
+    } else if (event is CallEventActionCallCallback) {
+      _addCallKitEventDetails(context, event);
+    } else if (event is CallEventActionCallDecline) {
+      _addCallKitEventDetails(context, event);
+    } else if (event is CallEventActionCallEnded) {
+      _addCallKitEventDetails(context, event);
+    } else if (event is CallEventActionCallTimeout) {
+      _addCallKitEventDetails(context, event);
+    }
+
+    await Sentry.captureMessage(
+      'iOS CallKit event: ${event.runtimeType}',
+      level: SentryLevel.info,
+      withScope: (scope) {
+        scope.setTag('origin', 'iOS CallKit');
+        scope.setTag('callkit_event', event.runtimeType.toString());
+        scope.setContexts('callkit_event', context);
+      },
+    );
+  }
+
+  void _addCallKitEventDetails(Map<String, Object?> context, CallEvent event) {
+    final params = _callKitEventParams(event);
+    if (params != null) {
+      context.addAll({
+        'id': params.id,
+        'handle': params.handle,
+        'nameCaller': params.nameCaller,
+        'isAccepted': params.isAccepted,
+        'extra': params.extra?.toString(),
+      });
+      return;
+    }
+
+    final id = _callKitEventId(event);
+    if (id != null) {
+      context['id'] = id;
+    }
+  }
+
+  void _cacheCallKitParams(CallKitParams params) {
+    _callKitParamsById[params.id] = params;
+    _activeCallKitId = params.id;
+  }
+
+  CallKitParams? _callKitEventParams(CallEvent event) {
+    try {
+      final params = (event as dynamic).callKitParams;
+      if (params is CallKitParams) return params;
+    } catch (_) {
+      return null;
+    }
+    return null;
+  }
+
+  String? _callKitEventId(CallEvent event) {
+    final params = _callKitEventParams(event);
+    final paramsId = params?.id.trim();
+    if (paramsId != null && paramsId.isNotEmpty) return paramsId;
+
+    try {
+      final id = (event as dynamic).id;
+      if (id is String && id.trim().isNotEmpty) return id.trim();
+    } catch (_) {
+      return null;
+    }
+    return null;
+  }
+
+  CallKitParams? _paramsForCallId(String id) => _callKitParamsById[id];
+
+  Future<CallKitParams?> _paramsForCallIdOrActiveCall(String id) async {
+    final cached = _paramsForCallId(id);
+    if (cached != null) return cached;
+
+    final activeCalls = await FlutterCallkitIncoming.activeCalls();
+    for (final params in activeCalls) {
+      _cacheCallKitParams(params);
+    }
+
+    return _paramsForCallId(id);
+  }
+
+  Future<void> _onNativeAcceptCallHandle(Map<dynamic, dynamic> body) async {
+    final extra = Map<String, dynamic>.from(body);
+    final conversationUuid = _parseConversationUuid(extra);
+    if (conversationUuid.isEmpty) {
+      log(
+        'VideoCallCallKitCoordinator: native accept without conversationUuid, extra=$extra',
+        name: 'VideoCallCallKit',
+      );
+      return;
+    }
+
+    await _deliverIncomingAccept(
+      callKitId: conversationUuid,
+      conversationUuid: conversationUuid,
+      counterpartName: _parseString(extra, const [
+        'counterpartName',
+        'caller_name',
+        'callerName',
+      ]),
+      counterpartAvatarUrl: _parseString(extra, const [
+        'counterpartAvatarUrl',
+        'avatar',
+        'avatarUrl',
+        'caller_avatar',
+      ]),
+      localParticipantName: _parseString(extra, const [
+        'localParticipantName',
+        'local_participant_name',
+      ]),
+      counterpartIsConsultant: _parseBool(extra, const [
+        'counterpartIsConsultant',
+        'counterpart_is_consultant',
+        'is_consultant',
+        'isConsultant',
+      ]),
+    );
+  }
+
+  Future<void> _handleNativeAcceptedVoipCall(Object? arguments) async {
+    if (!Platform.isIOS) return;
+
+    final data = _stringKeyedMap(arguments);
+    final extra = _stringKeyedMap(data['extra']);
+    final callKitId = _parseString(data, const ['id', 'uuid']);
+    if (callKitId == null) {
+      log(
+        'VideoCallCallKitCoordinator: native acceptedVoipCall without callKitId, data=$data',
+        name: 'VideoCallCallKit',
+      );
+      return;
+    }
+
+    final conversationUuid = _parseConversationUuid(
+      extra,
+      handle: _parseString(data, const ['handle']),
+    );
+    if (conversationUuid.isEmpty) {
+      log(
+        'VideoCallCallKitCoordinator: native acceptedVoipCall without conversationUuid, data=$data',
+        name: 'VideoCallCallKit',
+      );
+      return;
+    }
+
+    await _deliverIncomingAccept(
+      callKitId: callKitId,
+      conversationUuid: conversationUuid,
+      counterpartName:
+          _parseString(extra, const [
+            'counterpartName',
+            'caller_name',
+            'callerName',
+          ]) ??
+          _parseString(data, const ['nameCaller']),
+      counterpartAvatarUrl:
+          _parseString(extra, const [
+            'counterpartAvatarUrl',
+            'avatar',
+            'avatarUrl',
+            'caller_avatar',
+          ]) ??
+          _parseString(data, const ['avatar']),
+      localParticipantName: _parseString(extra, const [
+        'localParticipantName',
+        'local_participant_name',
+      ]),
+      counterpartIsConsultant: _parseBool(extra, const [
+        'counterpartIsConsultant',
+        'counterpart_is_consultant',
+        'is_consultant',
+        'isConsultant',
+      ]),
+    );
+  }
+
+  Future<void> _handleAccept(String callKitId) async {
+    if (_acceptNavigationCompletedIds.contains(callKitId)) return;
+
+    _activeCallKitId = callKitId;
+    final params = await _paramsForCallIdOrActiveCall(callKitId);
+    final extra = params?.extra ?? <String, dynamic>{};
+
+    final conversationUuid = _parseConversationUuid(
+      extra,
+      handle: params?.handle ?? callKitId,
+    );
+    if (conversationUuid.isEmpty) {
+      log(
+        'VideoCallCallKitCoordinator: accept without conversationUuid, callKitId=$callKitId',
+        name: 'VideoCallCallKit',
+      );
+      return;
+    }
+
+    await _deliverIncomingAccept(
+      callKitId: callKitId,
+      conversationUuid: conversationUuid,
+      counterpartName:
+          _parseString(extra, const [
+            'counterpartName',
+            'caller_name',
+            'callerName',
+          ]) ??
+          params?.nameCaller,
+      counterpartAvatarUrl:
+          _parseString(extra, const [
+            'counterpartAvatarUrl',
+            'avatar',
+            'avatarUrl',
+            'caller_avatar',
+          ]) ??
+          params?.avatar,
+      localParticipantName: _parseString(extra, const [
+        'localParticipantName',
+        'local_participant_name',
+      ]),
+      counterpartIsConsultant: _parseBool(extra, const [
+        'counterpartIsConsultant',
+        'counterpart_is_consultant',
+        'is_consultant',
+        'isConsultant',
+      ]),
+    );
+  }
+
+  void _rememberPendingIncomingAccept({
+    required String callKitId,
+    required String conversationUuid,
+    String? counterpartName,
+    String? counterpartAvatarUrl,
+    String? localParticipantName,
+    bool? counterpartIsConsultant,
+  }) {
+    _pendingIncomingAccept = _PendingIncomingAccept(
+      callKitId: callKitId,
+      conversationUuid: conversationUuid,
+      counterpartName: counterpartName,
+      counterpartAvatarUrl: counterpartAvatarUrl,
+      localParticipantName: localParticipantName,
+      counterpartIsConsultant: counterpartIsConsultant,
+    );
+  }
+
+  Future<void> _deliverIncomingAccept({
+    required String callKitId,
+    required String conversationUuid,
+    String? counterpartName,
+    String? counterpartAvatarUrl,
+    String? localParticipantName,
+    bool? counterpartIsConsultant,
+  }) async {
+    log(
+      'VideoCallCallKitCoordinator: deliverIncomingAccept callKitId=$callKitId',
+      name: 'VideoCallCallKit',
+    );
+
+    _rememberPendingIncomingAccept(
+      callKitId: callKitId,
+      conversationUuid: conversationUuid,
+      counterpartName: counterpartName,
+      counterpartAvatarUrl: counterpartAvatarUrl,
+      localParticipantName: localParticipantName,
+      counterpartIsConsultant: counterpartIsConsultant,
+    );
+
+    if (_acceptNavigationCompletedIds.contains(callKitId)) return;
+
+    final inFlight = _acceptDeliveriesInFlight[callKitId];
+    if (inFlight != null) {
+      await inFlight;
+      if (_acceptNavigationCompletedIds.contains(callKitId)) return;
+    }
+
+    final delivery = _runIncomingAcceptDelivery(
+      callKitId: callKitId,
+      conversationUuid: conversationUuid,
+      counterpartName: counterpartName,
+      counterpartAvatarUrl: counterpartAvatarUrl,
+      localParticipantName: localParticipantName,
+      counterpartIsConsultant: counterpartIsConsultant,
+    );
+    _acceptDeliveriesInFlight[callKitId] = delivery;
+    try {
+      await delivery;
+    } finally {
+      if (identical(_acceptDeliveriesInFlight[callKitId], delivery)) {
+        _acceptDeliveriesInFlight.remove(callKitId);
+      }
+    }
+  }
+
+  Future<void> _runIncomingAcceptDelivery({
+    required String callKitId,
+    required String conversationUuid,
+    String? counterpartName,
+    String? counterpartAvatarUrl,
+    String? localParticipantName,
+    bool? counterpartIsConsultant,
+  }) async {
+    if (_acceptNavigationCompletedIds.contains(callKitId)) return;
+
+    _suppressedEndCallKitIds.add(callKitId);
+    unawaited(_manager.notifyIncomingCallAccepted(conversationUuid));
+
+    try {
+      await _waitForAcceptNavigationReady();
+
+      final navigated = await _openConnectingScreenAfterAccept(
+        conversationUuid: conversationUuid,
+        counterpartName: counterpartName,
+        counterpartAvatarUrl: counterpartAvatarUrl,
+        localParticipantName: localParticipantName,
+        counterpartIsConsultant: counterpartIsConsultant,
+      );
+
+      if (navigated) {
+        _acceptNavigationCompletedIds.add(callKitId);
+        _pendingIncomingAccept = null;
+        if (Platform.isAndroid) {
+          try {
+            await _androidCallPushChannel.invokeMethod<Object?>(
+              'drainPendingCallKitAccept',
+            );
+          } catch (_) {}
+        }
+      } else {
+        _pendingIncomingAccept = _PendingIncomingAccept(
+          callKitId: callKitId,
+          conversationUuid: conversationUuid,
+          counterpartName: counterpartName,
+          counterpartAvatarUrl: counterpartAvatarUrl,
+          localParticipantName: localParticipantName,
+          counterpartIsConsultant: counterpartIsConsultant,
+        );
+        log(
+          'VideoCallCallKitCoordinator: accept navigation deferred until UI is ready, callKitId=$callKitId',
+          name: 'VideoCallCallKit',
+        );
+        unawaited(_drainPendingIncomingAcceptWithRetries());
+      }
+
+      await FlutterCallkitIncoming.endCall(callKitId);
+    } catch (error, stackTrace) {
+      log(
+        'VideoCallCallKitCoordinator: accept delivery failed, callKitId=$callKitId: $error',
+        name: 'VideoCallCallKit',
+        stackTrace: stackTrace,
+      );
+    } finally {
+      unawaited(
+        Future<void>.delayed(const Duration(seconds: 2), () {
+          _suppressedEndCallKitIds.remove(callKitId);
+          _acceptNavigationCompletedIds.remove(callKitId);
+        }),
+      );
+    }
+  }
+
+  Future<void> _drainPendingIncomingAcceptWithRetries() async {
+    if (_pendingIncomingAccept == null) return;
+    if (_pendingAcceptDrainScheduled) return;
+
+    _pendingAcceptDrainScheduled = true;
+    try {
+      const retryDelaysMs = <int>[0, 250, 600, 1200, 2000, 3200];
+      for (final delayMs in retryDelaysMs) {
+        if (_pendingIncomingAccept == null) return;
+        if (delayMs > 0) {
+          await Future<void>.delayed(Duration(milliseconds: delayMs));
+        }
+        await _drainPendingIncomingAccept();
+        if (_pendingIncomingAccept == null) return;
+      }
+    } finally {
+      _pendingAcceptDrainScheduled = false;
+    }
+  }
+
+  Future<void> _drainPendingIncomingAccept() async {
+    final pending = _pendingIncomingAccept;
+    if (pending == null) return;
+    if (_acceptNavigationCompletedIds.contains(pending.callKitId)) {
+      _pendingIncomingAccept = null;
+      return;
+    }
+
+    await _waitForAcceptNavigationReady();
+    await _settleUiAfterResume();
+
+    final navigated = await _openConnectingScreenAfterAccept(
+      conversationUuid: pending.conversationUuid,
+      counterpartName: pending.counterpartName,
+      counterpartAvatarUrl: pending.counterpartAvatarUrl,
+      localParticipantName: pending.localParticipantName,
+      counterpartIsConsultant: pending.counterpartIsConsultant,
+    );
+
+    if (!navigated) return;
+
+    _acceptNavigationCompletedIds.add(pending.callKitId);
+    _pendingIncomingAccept = null;
+    if (Platform.isAndroid) {
+      try {
+        await _androidCallPushChannel.invokeMethod<Object?>(
+          'drainPendingCallKitAccept',
+        );
+      } catch (_) {}
+    }
+    try {
+      await FlutterCallkitIncoming.endCall(pending.callKitId);
+    } catch (_) {}
+  }
+
+  Future<void> _settleUiAfterResume() async {
+    final binding = WidgetsBinding.instance;
+    for (var frame = 0; frame < 3; frame++) {
+      await binding.endOfFrame;
+    }
+    await Future<void>.delayed(const Duration(milliseconds: 80));
+  }
+
+  Future<void> _waitForAcceptNavigationReady({
+    Duration timeout = const Duration(seconds: 10),
+  }) async {
+    final deadline = DateTime.now().add(timeout);
+    while (DateTime.now().isBefore(deadline)) {
+      final lifecycle = WidgetsBinding.instance.lifecycleState;
+      if (lifecycle == AppLifecycleState.resumed) {
+        for (var frame = 0; frame < 2; frame++) {
+          await WidgetsBinding.instance.endOfFrame;
+        }
+        return;
+      }
+      await Future<void>.delayed(const Duration(milliseconds: 50));
+    }
+  }
+
+  Future<bool> _openConnectingScreenAfterAccept({
+    required String conversationUuid,
+    String? counterpartName,
+    String? counterpartAvatarUrl,
+    String? localParticipantName,
+    bool? counterpartIsConsultant,
+  }) async {
+    FlutterNativeSplash.remove();
+
+    return VideoCallNotificationNavigator.openIncomingCall(
+      conversationUuid: conversationUuid,
+      counterpartName: counterpartName,
+      counterpartAvatarUrl: counterpartAvatarUrl,
+      localParticipantName: localParticipantName,
+      counterpartIsConsultant: counterpartIsConsultant,
+      entryMode: VideoCallEntryMode.incomingAccepted,
+    );
+  }
+
+  Future<void> _handleDecline(String callKitId) async {
+    if (_suppressedEndCallKitIds.contains(callKitId)) {
+      log(
+        'VideoCallCallKitCoordinator: ignore spurious end/decline during accept, callKitId=$callKitId',
+        name: 'VideoCallCallKit',
+      );
+      return;
+    }
+
+    final params = _paramsForCallId(callKitId);
+    final extra = params?.extra ?? <String, dynamic>{};
+    final conversationUuid = _parseConversationUuid(
+      extra,
+      handle: params?.handle ?? callKitId,
+    );
+
+    _suppressedEndCallKitIds.add(callKitId);
+    try {
+      await FlutterCallkitIncoming.endCall(callKitId);
+    } finally {
+      unawaited(
+        Future<void>.delayed(const Duration(seconds: 1), () {
+          _suppressedEndCallKitIds.remove(callKitId);
+        }),
+      );
+    }
+    _callKitParamsById.remove(callKitId);
+    if (_activeCallKitId == callKitId) {
+      _activeCallKitId = null;
+    }
+
+    if (_manager.isActiveCall ||
+        _cubit.state.connectPhase != VideoCallConnectPhase.idle) {
+      await _cubit.endCall();
+      return;
+    }
+
+    await _manager.declineIncomingCall(conversationUuid);
+    if (_cubit.state.connectPhase != VideoCallConnectPhase.idle) {
+      await _cubit.onCallEndedExternally();
+    }
+  }
+
+  Future<void> _handleEnded(String callKitId) async {
+    if (_suppressedEndCallKitIds.contains(callKitId)) {
+      log(
+        'VideoCallCallKitCoordinator: ignore spurious ended during accept, callKitId=$callKitId',
+        name: 'VideoCallCallKit',
+      );
+      return;
+    }
+
+    _callKitParamsById.remove(callKitId);
+    if (_activeCallKitId == callKitId) {
+      _activeCallKitId = null;
+    }
+
+    try {
+      await FlutterCallkitIncoming.endCall(callKitId);
+    } catch (_) {}
+  }
+
+  static String _parseConversationUuid(
+    Map<String, Object?> extra, {
+    String? handle,
+  }) {
+    final fromExtra = _parseString(extra, const [
+      'conversationUuid',
+      'conversation_uuid',
+    ]);
+    if (fromExtra != null && fromExtra.isNotEmpty) return fromExtra;
+
+    final trimmedHandle = handle?.trim();
+    if (trimmedHandle != null && trimmedHandle.isNotEmpty) {
+      return trimmedHandle;
+    }
+
+    return '';
+  }
+
+  static String? _parseString(Map<String, Object?> map, List<String> keys) {
+    for (final key in keys) {
+      final value = map[key];
+      if (value is String && value.trim().isNotEmpty) {
+        return value.trim();
+      }
+    }
+    return null;
+  }
+
+  static bool? _parseBool(Map<String, Object?> map, List<String> keys) {
+    for (final key in keys) {
+      if (!map.containsKey(key)) continue;
+      final value = map[key];
+      if (value is bool) return value;
+      if (value is num) return value != 0;
+      if (value is String) {
+        final normalized = value.trim().toLowerCase();
+        if (normalized == '1' || normalized == 'true' || normalized == 'yes') {
+          return true;
+        }
+        if (normalized == '0' || normalized == 'false' || normalized == 'no') {
+          return false;
+        }
+      }
+    }
+    return null;
+  }
+
+  static Map<String, Object?> _stringKeyedMap(Object? value) {
+    if (value is! Map) return <String, Object?>{};
+    return value.map((key, value) => MapEntry(key.toString(), value));
+  }
+
+  static Map<String, Object?> _stringifyMapValues(Map<String, Object?> map) {
+    return map.map((key, value) {
+      if (value is Map) {
+        return MapEntry(key, _stringifyMapValues(_stringKeyedMap(value)));
+      }
+      if (value is Iterable) {
+        return MapEntry(key, value.map((item) => item?.toString()).toList());
+      }
+      return MapEntry(key, value?.toString());
+    });
+  }
+}
+
+class _PendingIncomingAccept {
+  const _PendingIncomingAccept({
+    required this.callKitId,
+    required this.conversationUuid,
+    this.counterpartName,
+    this.counterpartAvatarUrl,
+    this.localParticipantName,
+    this.counterpartIsConsultant,
+  });
+
+  final String callKitId;
+  final String conversationUuid;
+  final String? counterpartName;
+  final String? counterpartAvatarUrl;
+  final String? localParticipantName;
+  final bool? counterpartIsConsultant;
+}
+
+class _AndroidAcceptResumeObserver with WidgetsBindingObserver {
+  _AndroidAcceptResumeObserver({required this.onResumed});
+
+  final VoidCallback onResumed;
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    if (state == AppLifecycleState.resumed) {
+      onResumed();
+    }
+  }
+}
diff --git a/lib/features/video_calls/services/video_call_ended_push_handler.dart b/lib/features/video_calls/services/video_call_ended_push_handler.dart
new file mode 100644
index 00000000..5ff7ec6e
--- /dev/null
+++ b/lib/features/video_calls/services/video_call_ended_push_handler.dart
@@ -0,0 +1,37 @@
+import 'dart:io';
+
+import 'package:flutter/services.dart';
+import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart';
+
+/// Dismisses incoming call UI after a remote `video_call_ended` push.
+abstract final class VideoCallEndedPushHandler {
+  static const MethodChannel _androidPushChannel = MethodChannel(
+    'com.eatvioapp/video_call_push',
+  );
+
+  static Future<void> dismissIncomingCallUi() async {
+    if (Platform.isAndroid) {
+      try {
+        await _androidPushChannel.invokeMethod<void>('dismissIncomingCalls');
+        return;
+      } catch (_) {}
+    }
+
+    await _dismissViaCallKit();
+  }
+
+  static Future<void> _dismissViaCallKit() async {
+    try {
+      final activeCalls = await FlutterCallkitIncoming.activeCalls();
+      for (final call in activeCalls) {
+        try {
+          await FlutterCallkitIncoming.endCall(call.id);
+        } catch (_) {}
+      }
+    } catch (_) {}
+
+    try {
+      await FlutterCallkitIncoming.endAllCalls();
+    } catch (_) {}
+  }
+}
diff --git a/lib/features/video_calls/services/video_call_ended_push_payload.dart b/lib/features/video_calls/services/video_call_ended_push_payload.dart
new file mode 100644
index 00000000..4defe8fe
--- /dev/null
+++ b/lib/features/video_calls/services/video_call_ended_push_payload.dart
@@ -0,0 +1,11 @@
+import 'package:eatvio_app/features/video_calls/services/video_call_push_payload.dart';
+
+/// Marker for a data-only `video_call_ended` push (no conversation uuid required).
+class VideoCallEndedPushPayload {
+  const VideoCallEndedPushPayload._();
+
+  static VideoCallEndedPushPayload? tryParse(Map<String, dynamic> data) {
+    if (!VideoCallPushPayload.isEndedVideoCall(data)) return null;
+    return const VideoCallEndedPushPayload._();
+  }
+}
diff --git a/lib/features/video_calls/services/video_call_fcm_handler.dart b/lib/features/video_calls/services/video_call_fcm_handler.dart
new file mode 100644
index 00000000..941da2f9
--- /dev/null
+++ b/lib/features/video_calls/services/video_call_fcm_handler.dart
@@ -0,0 +1,111 @@
+import 'dart:developer';
+import 'dart:io';
+
+import 'package:eatvio_app/features/video_calls/services/video_call_ended_push_handler.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_ended_push_payload.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:eatvio_app/firebase_options.dart';
+import 'package:firebase_core/firebase_core.dart';
+import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter/widgets.dart';
+
+/// Top-level FCM background handler (separate isolate).
+@pragma('vm:entry-point')
+Future<void> videoCallFirebaseMessagingBackgroundHandler(
+  RemoteMessage message,
+) async {
+  WidgetsFlutterBinding.ensureInitialized();
+  await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
+  await VideoCallFcmHandler.handleRemoteMessage(
+    message,
+    source: 'background',
+  );
+}
+
+abstract final class VideoCallFcmHandler {
+  static bool _foregroundListenerRegistered = false;
+
+  static void registerBackgroundHandler() {
+    FirebaseMessaging.onBackgroundMessage(
+      videoCallFirebaseMessagingBackgroundHandler,
+    );
+  }
+
+  static void registerForegroundListener() {
+    if (_foregroundListenerRegistered) return;
+    _foregroundListenerRegistered = true;
+
+    FirebaseMessaging.onMessage.listen((message) {
+      handleRemoteMessage(message, source: 'foreground');
+    });
+  }
+
+  static Future<void> handleRemoteMessage(
+    RemoteMessage message, {
+    required String source,
+  }) async {
+    final data = Map<String, dynamic>.from(message.data);
+
+    final endedPayload = VideoCallEndedPushPayload.tryParse(data);
+    if (endedPayload != null) {
+      if (Platform.isAndroid && source == 'background') {
+        log(
+          'VideoCallFcmHandler: skip background ended call, handled by native FCM service',
+          name: 'VideoCallFcm',
+        );
+        return;
+      }
+
+      log(
+        'VideoCallFcmHandler: dismiss incoming call UI, source=$source',
+        name: 'VideoCallFcm',
+      );
+      try {
+        await VideoCallEndedPushHandler.dismissIncomingCallUi();
+      } catch (e, st) {
+        log(
+          'VideoCallFcmHandler: failed to dismiss incoming call UI: $e',
+          name: 'VideoCallFcm',
+          stackTrace: st,
+        );
+      }
+      return;
+    }
+
+    if (!Platform.isAndroid) return;
+    if (data.isEmpty) return;
+
+    final payload = VideoCallPushPayload.tryParse(data);
+    if (payload == null) {
+      log(
+        'VideoCallFcmHandler: skip non-video-call push, source=$source, data=$data',
+        name: 'VideoCallFcm',
+      );
+      return;
+    }
+
+    if (source == 'background') {
+      log(
+        'VideoCallFcmHandler: skip background video call, handled by native FCM service, conversation=${payload.conversationUuid}',
+        name: 'VideoCallFcm',
+      );
+      return;
+    }
+
+    log(
+      'VideoCallFcmHandler: show incoming call UI, source=$source, conversation=${payload.conversationUuid}',
+      name: 'VideoCallFcm',
+    );
+
+    try {
+      await VideoCallIncomingPushPresenter.showIncomingCall(payload);
+    } catch (e, st) {
+      log(
+        'VideoCallFcmHandler: failed to show incoming call UI: $e',
+        name: 'VideoCallFcm',
+        stackTrace: st,
+      );
+    }
+  }
+}
diff --git a/lib/features/video_calls/services/video_call_foreground_bootstrap.dart b/lib/features/video_calls/services/video_call_foreground_bootstrap.dart
new file mode 100644
index 00000000..b8740498
--- /dev/null
+++ b/lib/features/video_calls/services/video_call_foreground_bootstrap.dart
@@ -0,0 +1,35 @@
+import 'package:flutter_foreground_task/flutter_foreground_task.dart';
+
+abstract final class VideoCallForegroundBootstrap {
+  static const int _serviceId = 1001;
+
+  static bool _initialized = false;
+
+  static void ensureInitialized() {
+    if (_initialized) return;
+    FlutterForegroundTask.init(
+      androidNotificationOptions: AndroidNotificationOptions(
+        channelId: 'video_call_ongoing',
+        channelName: 'Video call',
+        channelDescription: 'Ongoing video call notifications',
+        channelImportance: NotificationChannelImportance.LOW,
+        priority: NotificationPriority.LOW,
+        onlyAlertOnce: true,
+      ),
+      iosNotificationOptions: const IOSNotificationOptions(
+        showNotification: true,
+        playSound: false,
+      ),
+      foregroundTaskOptions: ForegroundTaskOptions(
+        eventAction: ForegroundTaskEventAction.nothing(),
+        autoRunOnBoot: false,
+        autoRunOnMyPackageReplaced: false,
+        allowWakeLock: true,
+        allowWifiLock: true,
+      ),
+    );
+    _initialized = true;
+  }
+
+  static int get serviceId => _serviceId;
+}
diff --git a/lib/features/video_calls/services/video_call_foreground_coordinator.dart b/lib/features/video_calls/services/video_call_foreground_coordinator.dart
new file mode 100644
index 00000000..57fedebf
--- /dev/null
+++ b/lib/features/video_calls/services/video_call_foreground_coordinator.dart
@@ -0,0 +1,79 @@
+import 'dart:io';
+
+import 'package:eatvio_app/features/video_calls/services/video_call_foreground_bootstrap.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_task_handler.dart';
+import 'package:flutter_foreground_task/flutter_foreground_task.dart';
+import 'package:permission_handler/permission_handler.dart';
+
+class VideoCallForegroundCoordinator {
+  Future<void> ensureNotificationPermission() async {
+    final permission = await FlutterForegroundTask.checkNotificationPermission();
+    if (permission == NotificationPermission.granted) return;
+    await FlutterForegroundTask.requestNotificationPermission();
+  }
+
+  Future<void> startOngoingCall({
+    required String conversationUuid,
+    required String notificationTitle,
+    required String notificationBody,
+    required String endCallButtonLabel,
+  }) async {
+    VideoCallForegroundBootstrap.ensureInitialized();
+    await ensureNotificationPermission();
+
+    await FlutterForegroundTask.saveData(
+      key: videoCallActiveConversationStorageKey,
+      value: conversationUuid,
+    );
+
+    if (await FlutterForegroundTask.isRunningService) {
+      await FlutterForegroundTask.updateService(
+        notificationTitle: notificationTitle,
+        notificationText: notificationBody,
+        notificationButtons: [
+          NotificationButton(
+            id: videoCallForegroundEndCallButtonId,
+            text: endCallButtonLabel,
+          ),
+        ],
+      );
+      return;
+    }
+
+    if (Platform.isAndroid) {
+      final micStatus = await Permission.microphone.status;
+      if (!micStatus.isGranted) {
+        await Permission.microphone.request();
+      }
+    }
+
+    await FlutterForegroundTask.startService(
+      serviceId: VideoCallForegroundBootstrap.serviceId,
+      serviceTypes: const [ForegroundServiceTypes.microphone],
+      notificationTitle: notificationTitle,
+      notificationText: notificationBody,
+      notificationInitialRoute: '/video-call-screen',
+      notificationButtons: [
+        NotificationButton(
+          id: videoCallForegroundEndCallButtonId,
+          text: endCallButtonLabel,
+        ),
+      ],
+      callback: videoCallForegroundTaskStartCallback,
+    );
+  }
+
+  Future<void> stopOngoingCall() async {
+    if (!await FlutterForegroundTask.isRunningService) return;
+    await FlutterForegroundTask.stopService();
+    await FlutterForegroundTask.removeData(
+      key: videoCallActiveConversationStorageKey,
+    );
+  }
+
+  Future<String?> readActiveConversationUuid() {
+    return FlutterForegroundTask.getData<String>(
+      key: videoCallActiveConversationStorageKey,
+    );
+  }
+}
diff --git a/lib/features/video_calls/services/video_call_incoming_push_presenter.dart b/lib/features/video_calls/services/video_call_incoming_push_presenter.dart
new file mode 100644
index 00000000..9136a26d
--- /dev/null
+++ b/lib/features/video_calls/services/video_call_incoming_push_presenter.dart
@@ -0,0 +1,56 @@
+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';
+
+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 params = CallKitParams(
+      id: payload.conversationUuid,
+      nameCaller: callerName,
+      appName: 'Итвио',
+      avatar: payload.counterpartAvatarUrl,
+      handle: payload.conversationUuid,
+      type: 0,
+      duration: 45000,
+      extra: <String, dynamic>{
+        'conversationUuid': payload.conversationUuid,
+        if (payload.counterpartName != null)
+          'counterpartName': payload.counterpartName,
+        if (payload.counterpartAvatarUrl != null)
+          'counterpartAvatarUrl': payload.counterpartAvatarUrl,
+        if (payload.localParticipantName != null)
+          'localParticipantName': payload.localParticipantName,
+        if (payload.counterpartIsConsultant != null)
+          'counterpartIsConsultant': payload.counterpartIsConsultant,
+      },
+      callingNotification: const NotificationParams(showNotification: false),
+      android: const AndroidParams(
+        isCustomNotification: true,
+        isShowLogo: false,
+        isShowFullLockedScreen: false,
+        isFullScreen: false,
+        ringtonePath: 'system_ringtone_default',
+        backgroundColor: _androidAccentColor,
+        actionColor: _androidAccentColor,
+        textColor: '#ffffff',
+        textAccept: 'Answer',
+        textDecline: 'Decline',
+        isShowCallID: false,
+      ),
+      ios: const IOSParams(
+        handleType: 'generic',
+        supportsVideo: true,
+        ringtonePath: 'system_ringtone_default',
+      ),
+    );
+
+    await FlutterCallkitIncoming.showCallkitIncoming(params);
+  }
+}
diff --git a/lib/features/video_calls/services/video_call_lifecycle_binding.dart b/lib/features/video_calls/services/video_call_lifecycle_binding.dart
new file mode 100644
index 00000000..359a32a2
--- /dev/null
+++ b/lib/features/video_calls/services/video_call_lifecycle_binding.dart
@@ -0,0 +1,29 @@
+import 'package:flutter/widgets.dart';
+
+typedef VideoCallLifecycleCallback = void Function(AppLifecycleState state);
+
+class VideoCallLifecycleBinding {
+  AppLifecycleListener? _listener;
+  VideoCallLifecycleCallback? _callback;
+
+  @visibleForTesting
+  void simulateLifecycle(AppLifecycleState state) => _callback?.call(state);
+
+  void attach(VideoCallLifecycleCallback onStateChanged) {
+    _callback = onStateChanged;
+    _listener?.dispose();
+    _listener = AppLifecycleListener(
+      onResume: () => onStateChanged(AppLifecycleState.resumed),
+      onInactive: () => onStateChanged(AppLifecycleState.inactive),
+      onHide: () => onStateChanged(AppLifecycleState.hidden),
+      onPause: () => onStateChanged(AppLifecycleState.paused),
+      onDetach: () => onStateChanged(AppLifecycleState.detached),
+    );
+  }
+
+  void detach() {
+    _listener?.dispose();
+    _listener = null;
+    _callback = null;
+  }
+}
diff --git a/lib/features/video_calls/services/video_call_notification_navigator.dart b/lib/features/video_calls/services/video_call_notification_navigator.dart
new file mode 100644
index 00000000..8462baf0
--- /dev/null
+++ b/lib/features/video_calls/services/video_call_notification_navigator.dart
@@ -0,0 +1,196 @@
+import 'dart:async';
+import 'dart:developer';
+
+import 'package:eatvio_app/core/app_router.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/routing/route_constants.dart';
+import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+import 'package:eatvio_app/features/video_calls/presentation/pages/video_call_screen.dart';
+import 'package:flutter/scheduler.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_native_splash/flutter_native_splash.dart';
+
+class VideoCallNotificationNavigator {
+  static bool _pushInFlight = false;
+
+  static Future<void> openActiveCall({String? conversationUuid}) async {
+    final manager = sl<VideoCallManager>();
+    final uuid = conversationUuid ?? manager.conversationUuid;
+    if (uuid.isEmpty) return;
+
+    await _pushCallScreen(
+      conversationUuid: uuid,
+      counterpartName: manager.counterpartName,
+      localParticipantName: manager.localParticipantName,
+    );
+
+    await manager.onCallScreenVisible(
+      conversationUuid: uuid,
+      counterpartName: manager.counterpartName,
+      localParticipantName: manager.localParticipantName,
+    );
+  }
+
+  /// Returns `true` when the call UI is visible or navigation succeeded.
+  static Future<bool> openIncomingCall({
+    required String conversationUuid,
+    String? counterpartName,
+    String? counterpartAvatarUrl,
+    String? localParticipantName,
+    bool? counterpartIsConsultant,
+    VideoCallEntryMode entryMode = VideoCallEntryMode.outgoing,
+  }) async {
+    if (conversationUuid.isEmpty) return false;
+
+    FlutterNativeSplash.remove();
+    final readySince = DateTime.now();
+    await _waitUntilNavigationReady(since: readySince);
+
+    for (var attempt = 0; attempt < 8; attempt++) {
+      if (attempt > 0) {
+        await Future<void>.delayed(Duration(milliseconds: 200 * attempt));
+        await _waitUntilNavigationReady(since: readySince);
+      }
+
+      if (isOnCallRoute()) {
+        return true;
+      }
+
+      final pushed = await _pushCallScreen(
+        conversationUuid: conversationUuid,
+        counterpartName: counterpartName,
+        counterpartAvatarUrl: counterpartAvatarUrl,
+        localParticipantName: localParticipantName,
+        counterpartIsConsultant: counterpartIsConsultant,
+        entryMode: entryMode,
+      );
+
+      if (pushed) {
+        return true;
+      }
+    }
+
+    return isOnCallRoute();
+  }
+
+  static bool isOnCallRoute() {
+    final matches =
+        AppRouter.appRouter.routerDelegate.currentConfiguration.matches;
+    if (matches.isEmpty) return false;
+    return matches.last.matchedLocation.contains(VideoCallScreen.path);
+  }
+
+  static Future<void> _waitUntilNavigationReady({
+    required DateTime since,
+    Duration timeout = const Duration(seconds: 12),
+  }) async {
+    final deadline = DateTime.now().add(timeout);
+    while (DateTime.now().isBefore(deadline)) {
+      final lifecycle = WidgetsBinding.instance.lifecycleState;
+      final context = AppRouter.navigatorKey.currentContext;
+      final routerReady = _isRouterReadyForCallNavigation(since: since);
+
+      if (lifecycle == AppLifecycleState.resumed &&
+          context != null &&
+          context.mounted &&
+          routerReady) {
+        for (var frame = 0; frame < 2; frame++) {
+          await SchedulerBinding.instance.endOfFrame;
+        }
+        return;
+      }
+      await Future<void>.delayed(const Duration(milliseconds: 50));
+    }
+  }
+
+  static bool _isRouterReadyForCallNavigation({required DateTime since}) {
+    final matches =
+        AppRouter.appRouter.routerDelegate.currentConfiguration.matches;
+    if (matches.isEmpty) return false;
+
+    final topLocation = matches.last.matchedLocation;
+    if (topLocation == RouteConstants.updateScreen) {
+      // Cold start: wait for version-check redirect unless it is taking too long.
+      return DateTime.now().difference(since) >
+          const Duration(seconds: 6);
+    }
+    return true;
+  }
+
+  static Future<void> _waitForRouteToSettle() async {
+    for (var frame = 0; frame < 4; frame++) {
+      await SchedulerBinding.instance.endOfFrame;
+    }
+    await Future<void>.delayed(const Duration(milliseconds: 80));
+  }
+
+  static Future<bool> _waitForCallRouteVisible({
+    Duration timeout = const Duration(seconds: 3),
+  }) async {
+    final deadline = DateTime.now().add(timeout);
+    while (DateTime.now().isBefore(deadline)) {
+      if (isOnCallRoute()) {
+        await _waitForRouteToSettle();
+        return isOnCallRoute();
+      }
+      await SchedulerBinding.instance.endOfFrame;
+      await Future<void>.delayed(const Duration(milliseconds: 30));
+    }
+    return isOnCallRoute();
+  }
+
+  static Future<bool> _pushCallScreen({
+    required String conversationUuid,
+    String? counterpartName,
+    String? counterpartAvatarUrl,
+    String? localParticipantName,
+    bool? counterpartIsConsultant,
+    VideoCallEntryMode entryMode = VideoCallEntryMode.outgoing,
+  }) async {
+    if (isOnCallRoute()) {
+      return true;
+    }
+    if (_pushInFlight) {
+      return false;
+    }
+
+    final context = AppRouter.navigatorKey.currentContext;
+    if (context == null || !context.mounted) {
+      return false;
+    }
+
+    final extra = <String, dynamic>{
+      'conversationUuid': conversationUuid,
+      'counterpartName': counterpartName,
+      'counterpartAvatarUrl': counterpartAvatarUrl,
+      'localParticipantName': localParticipantName,
+      'counterpartIsConsultant': ?counterpartIsConsultant,
+      'entryMode': entryMode.name,
+    };
+
+    _pushInFlight = true;
+    try {
+      try {
+        // pushNamed completes when the route is popped, not when it opens.
+        unawaited(
+          AppRouter.appRouter.pushNamed(
+            VideoCallScreen.name,
+            extra: extra,
+          ),
+        );
+      } catch (error, stackTrace) {
+        log(
+          'VideoCallNotificationNavigator: pushNamed failed: $error',
+          name: 'VideoCallCallKit',
+          stackTrace: stackTrace,
+        );
+        return false;
+      }
+
+      return _waitForCallRouteVisible();
+    } finally {
+      _pushInFlight = false;
+    }
+  }
+}
diff --git a/lib/features/video_calls/services/video_call_push_payload.dart b/lib/features/video_calls/services/video_call_push_payload.dart
new file mode 100644
index 00000000..4b1f578d
--- /dev/null
+++ b/lib/features/video_calls/services/video_call_push_payload.dart
@@ -0,0 +1,187 @@
+class VideoCallPushPayload {
+  const VideoCallPushPayload({
+    required this.conversationUuid,
+    this.counterpartName,
+    this.counterpartAvatarUrl,
+    this.localParticipantName,
+    this.counterpartIsConsultant,
+  });
+
+  final String conversationUuid;
+  final String? counterpartName;
+  final String? counterpartAvatarUrl;
+  final String? localParticipantName;
+  final bool? counterpartIsConsultant;
+
+  static VideoCallPushPayload? tryParse(Map<String, dynamic> data) {
+    if (!isIncomingVideoCall(data)) return null;
+
+    final conversationUuid = _conversationUuid(data);
+    if (conversationUuid == null || conversationUuid.isEmpty) return null;
+
+    return VideoCallPushPayload(
+      conversationUuid: conversationUuid,
+      counterpartName: _string(data, const [
+        'counterpartName',
+        'counterpart_name',
+        'caller_name',
+        'callerName',
+        'nameCaller',
+        'caller',
+      ]),
+      counterpartAvatarUrl: _resolveAvatarUrl(
+        _string(data, const [
+          'counterpartAvatarUrl',
+          'counterpart_avatar_url',
+          'avatar',
+          'avatarUrl',
+          'avatar_url',
+          'caller_avatar',
+        ]),
+      ),
+      localParticipantName: _string(data, const [
+        'localParticipantName',
+        'local_participant_name',
+      ]),
+      counterpartIsConsultant: _bool(data, const [
+        'counterpartIsConsultant',
+        'counterpart_is_consultant',
+        'is_consultant',
+        'isConsultant',
+      ]),
+    );
+  }
+
+  static bool isEndedVideoCall(Map<String, dynamic> data) {
+    final type = _string(data, const [
+      'type',
+      'notification_type',
+      'event',
+      'action',
+      'push_type',
+      'call_type',
+    ]);
+    if (type != null) {
+      final normalized = type.toLowerCase().replaceAll('-', '_');
+      if (normalized == 'video_call_ended' || normalized == 'video_call_end') {
+        return true;
+      }
+      if (normalized.contains('video_call') &&
+          (normalized.contains('ended') || normalized.endsWith('_end'))) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  static bool isIncomingVideoCall(Map<String, dynamic> data) {
+    final type = _string(data, const [
+      'type',
+      'notification_type',
+      'event',
+      'action',
+      'push_type',
+      'call_type',
+    ]);
+    if (type != null) {
+      final normalized = type.toLowerCase().replaceAll('-', '_');
+      if (normalized.contains('video_call')) {
+        if (normalized.contains('end') || normalized.contains('ended')) {
+          return false;
+        }
+        return true;
+      }
+      if (normalized == 'incoming_call' ||
+          normalized == 'video_call_incoming' ||
+          normalized == 'incoming_video_call') {
+        return true;
+      }
+    }
+
+    if (_isTruthy(data['is_video_call']) ||
+        _isTruthy(data['incoming_call']) ||
+        _isTruthy(data['is_incoming_call'])) {
+      return _conversationUuid(data) != null;
+    }
+
+    final actionUrl = _string(data, const ['action_url']);
+    if (actionUrl != null &&
+        (actionUrl.contains('video-call') || actionUrl.contains('videoCall'))) {
+      return true;
+    }
+
+    return false;
+  }
+
+  static String? conversationUuidFromData(Map<String, dynamic> data) =>
+      _conversationUuid(data);
+
+  static String? _conversationUuid(Map<String, dynamic> data) {
+    final fromData = _string(data, const [
+      'conversationUuid',
+      'conversation_uuid',
+      'conversation_id',
+      'chat_uuid',
+      'uuid',
+    ]);
+    if (fromData != null && fromData.isNotEmpty) return fromData;
+
+    final actionUrl = _string(data, const ['action_url']);
+    if (actionUrl == null) return null;
+
+    final uri = Uri.tryParse(actionUrl);
+    if (uri == null) return null;
+
+    final fromQuery = uri.queryParameters['uuid'] ??
+        uri.queryParameters['conversationUuid'] ??
+        uri.queryParameters['conversation_uuid'];
+    if (fromQuery != null && fromQuery.trim().isNotEmpty) {
+      return fromQuery.trim();
+    }
+
+    final segments = uri.pathSegments;
+    for (var i = 0; i < segments.length - 1; i++) {
+      if (segments[i] == 'video-call' && segments[i + 1].isNotEmpty) {
+        return segments[i + 1];
+      }
+    }
+
+    return null;
+  }
+
+  static String? _string(Map<String, dynamic> map, List<String> keys) {
+    for (final key in keys) {
+      final value = map[key];
+      if (value is String && value.trim().isNotEmpty) {
+        return value.trim();
+      }
+    }
+    return null;
+  }
+
+  static bool? _bool(Map<String, dynamic> map, List<String> keys) {
+    for (final key in keys) {
+      if (!map.containsKey(key)) continue;
+      return _isTruthy(map[key]);
+    }
+    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';
+  }
+
+  static String? _resolveAvatarUrl(String? raw) {
+    if (raw == null || raw.isEmpty) return null;
+    if (raw.startsWith('http://') || raw.startsWith('https://')) {
+      return raw;
+    }
+    return raw;
+  }
+}
diff --git a/lib/features/video_calls/services/video_call_screen_wake_lock_coordinator.dart b/lib/features/video_calls/services/video_call_screen_wake_lock_coordinator.dart
new file mode 100644
index 00000000..522177de
--- /dev/null
+++ b/lib/features/video_calls/services/video_call_screen_wake_lock_coordinator.dart
@@ -0,0 +1,28 @@
+import 'package:wakelock_plus/wakelock_plus.dart';
+
+
+class VideoCallScreenWakeLockCoordinator {
+  bool _held = false;
+
+  bool get isHeld => _held;
+
+  Future<void> acquire() async {
+    if (_held) return;
+
+    try {
+      await WakelockPlus.enable();
+      _held = true;
+    } catch (_) {
+      _held = false;
+    }
+  }
+
+  Future<void> release() async {
+    if (!_held) return;
+
+    _held = false;
+    try {
+      await WakelockPlus.disable();
+    } catch (_) {}
+  }
+}
diff --git a/lib/features/video_calls/services/video_call_service.dart b/lib/features/video_calls/services/video_call_service.dart
index e46b0194..eff4e99b 100644
--- a/lib/features/video_calls/services/video_call_service.dart
+++ b/lib/features/video_calls/services/video_call_service.dart
@@ -23,4 +23,10 @@ abstract class VideoCallService {
     @Path('conversation') required String conversationUuid,
     @Body() required Map<String, dynamic> body,
   });
+
+  @POST('/api/v2/chat/{conversation}/video-call/accept')
+  Future<VideoCallAcceptResponse> notifyCallAccepted({
+    @Path('conversation') required String conversationUuid,
+    @Body() required Map<String, dynamic> body,
+  });
 }
diff --git a/lib/features/video_calls/services/video_call_system_pip_coordinator.dart b/lib/features/video_calls/services/video_call_system_pip_coordinator.dart
new file mode 100644
index 00000000..ca7c9c4d
--- /dev/null
+++ b/lib/features/video_calls/services/video_call_system_pip_coordinator.dart
@@ -0,0 +1,63 @@
+import 'dart:io';
+
+import 'package:floating/floating.dart';
+import 'package:flutter/services.dart';
+
+/// Android system Picture-in-Picture via the [floating] package.
+class VideoCallSystemPipCoordinator {
+  VideoCallSystemPipCoordinator({Floating? floating})
+    : _floating = floating ?? Floating();
+
+  static const MethodChannel _nativePipChannel = MethodChannel(
+    'com.eatvioapp/video_call_pip',
+  );
+
+  final Floating _floating;
+
+  /// Portrait ratio close to the in-call mini preview (142×201).
+  static const Rational callAspectRatio = Rational(2, 3);
+
+  bool get isPlatformSupported => Platform.isAndroid;
+
+  Future<bool> get isAvailable async {
+    if (!isPlatformSupported) return false;
+    return _floating.isPipAvailable;
+  }
+
+  Stream<PiPStatus> get statusStream => _floating.pipStatusStream;
+
+  /// Enter PiP when the user leaves the app (Home / recent apps).
+  ///
+  /// Requires Android 12+ (API 31); on older versions this is a no-op.
+  Future<void> armAutoPipOnLeave() async {
+    if (!await isAvailable) return;
+    await _setNativeUserLeaveHintPipEnabled(true);
+    try {
+      await _floating.enable(
+        const OnLeavePiP(aspectRatio: callAspectRatio),
+      );
+    } on PlatformException {
+      // OnLeavePiP is unavailable below Android 12; native onUserLeaveHint
+      // still handles Home / recent apps on Android 8+.
+    }
+  }
+
+  Future<void> disarm() async {
+    if (!isPlatformSupported) return;
+    await _setNativeUserLeaveHintPipEnabled(false);
+    try {
+      await _floating.cancelOnLeavePiP();
+    } on PlatformException {
+      // The activity may already be detached while the call is being torn down.
+    }
+  }
+
+  Future<void> _setNativeUserLeaveHintPipEnabled(bool enabled) async {
+    if (!isPlatformSupported) return;
+    try {
+      await _nativePipChannel.invokeMethod<void>('setPipEnabled', enabled);
+    } on PlatformException {
+      // Native channel may be unavailable during startup/teardown.
+    }
+  }
+}
diff --git a/lib/features/video_calls/services/video_call_task_handler.dart b/lib/features/video_calls/services/video_call_task_handler.dart
new file mode 100644
index 00000000..f8be2924
--- /dev/null
+++ b/lib/features/video_calls/services/video_call_task_handler.dart
@@ -0,0 +1,45 @@
+import 'package:flutter_foreground_task/flutter_foreground_task.dart';
+
+const String videoCallForegroundTaskActionKey = 'action';
+const String videoCallForegroundOpenAction = 'open';
+const String videoCallForegroundEndCallAction = 'end_call';
+const String videoCallForegroundEndCallButtonId = 'end_call';
+const String videoCallActiveConversationStorageKey = 'video_call_active_conversation_uuid';
+
+@pragma('vm:entry-point')
+void videoCallForegroundTaskStartCallback() {
+  FlutterForegroundTask.setTaskHandler(VideoCallTaskHandler());
+}
+
+class VideoCallTaskHandler extends TaskHandler {
+  @override
+  Future<void> onStart(DateTime timestamp, TaskStarter starter) async {}
+
+  @override
+  void onRepeatEvent(DateTime timestamp) {}
+
+  @override
+  Future<void> onDestroy(DateTime timestamp, bool isTimeout) async {}
+
+  @override
+  void onReceiveData(Object data) {}
+
+  @override
+  void onNotificationButtonPressed(String id) {
+    if (id == videoCallForegroundEndCallButtonId) {
+      FlutterForegroundTask.sendDataToMain(<String, String>{
+        videoCallForegroundTaskActionKey: videoCallForegroundEndCallAction,
+      });
+    }
+  }
+
+  @override
+  void onNotificationPressed() {
+    FlutterForegroundTask.sendDataToMain(<String, String>{
+      videoCallForegroundTaskActionKey: videoCallForegroundOpenAction,
+    });
+  }
+
+  @override
+  void onNotificationDismissed() {}
+}
diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
index 58eb63e6..81d5acf0 100644
--- a/lib/generated/intl/messages_en.dart
+++ b/lib/generated/intl/messages_en.dart
@@ -27,24 +27,27 @@ class MessageLookup extends MessageLookupByLibrary {
   static String m2(planName, name) =>
       "План «${planName}» с пользователем ${name} начался";
 
-  static String m3(step) => "шаг ${step} из 2";
+  static String m3(percent, amount) =>
+      "Discount ${percent}% — you save ${amount} ₽";
 
-  static String m4(planName, name) =>
+  static String m4(step) => "шаг ${step} из 2";
+
+  static String m5(planName, name) =>
       "Завтра начинается план «${planName}» с пользователем ${name}";
 
-  static String m5(planName) =>
+  static String m6(planName) =>
       "Завтра начнется прохождение плана «${planName}»";
 
-  static String m6(name, planName) =>
+  static String m7(name, planName) =>
       "Пользователь ${name} отменил подписку на план «${planName}»";
 
-  static String m7(name, planName) =>
+  static String m8(name, planName) =>
       "Пользователь ${name} оплатил план «${planName}»";
 
-  static String m8(name, planName) =>
+  static String m9(name, planName) =>
       "Пользователь ${name} подписался на план «${planName}»";
 
-  static String m9(planName) => "Вы отменили подписку на план «${planName}»";
+  static String m10(planName) => "Вы отменили подписку на план «${planName}»";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
@@ -715,10 +718,21 @@ class MessageLookup extends MessageLookupByLibrary {
       "Разница в ценах, это комиссия Итвио",
     ),
     "profile": MessageLookupByLibrary.simpleMessage("Профиль"),
+    "promo_applied_subtitle": MessageLookupByLibrary.simpleMessage(
+      "The discount will be applied at checkout",
+    ),
+    "promo_applied_title": MessageLookupByLibrary.simpleMessage(
+      "Promo code applied!",
+    ),
     "promo_code": MessageLookupByLibrary.simpleMessage("Promo code"),
+    "promo_discount_hint": m3,
     "promo_invalid": MessageLookupByLibrary.simpleMessage(
       "Promo code not found or expired",
     ),
+    "promo_remove": MessageLookupByLibrary.simpleMessage("Remove promo code"),
+    "promo_remove_failed": MessageLookupByLibrary.simpleMessage(
+      "Could not remove the promo code. Try again later",
+    ),
     "prostitution": MessageLookupByLibrary.simpleMessage("Проституция"),
     "proteins": MessageLookupByLibrary.simpleMessage("Белки"),
     "public_diet_state": MessageLookupByLibrary.simpleMessage("Публичная"),
@@ -809,7 +823,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "step_by_step_photo_recipe": MessageLookupByLibrary.simpleMessage(
       "Пошаговый фоторецепт",
     ),
-    "step_widget": m3,
+    "step_widget": m4,
     "successfully_published": MessageLookupByLibrary.simpleMessage(
       "успешно опубликован",
     ),
@@ -834,8 +848,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "toOffer": MessageLookupByLibrary.simpleMessage("Предложить"),
     "to_draft": MessageLookupByLibrary.simpleMessage("В черновик"),
     "to_order": MessageLookupByLibrary.simpleMessage("Заказать"),
-    "tommorowPlanWithUserWillStart": m4,
-    "tomorrowYourPlanWillStart": m5,
+    "tommorowPlanWithUserWillStart": m5,
+    "tomorrowYourPlanWillStart": m6,
     "try_again": MessageLookupByLibrary.simpleMessage("Попробовать снова"),
     "try_again_2": MessageLookupByLibrary.simpleMessage("Попробуйте ещё раз"),
     "typeAmoutOfReturn": MessageLookupByLibrary.simpleMessage(
@@ -869,7 +883,7 @@ class MessageLookup extends MessageLookupByLibrary {
       "Верхние показатели давления:",
     ),
     "upper": MessageLookupByLibrary.simpleMessage("Верхнее"),
-    "userCanceldThePlanSubscription": m6,
+    "userCanceldThePlanSubscription": m7,
     "userConfirmedPlanCompletion": MessageLookupByLibrary.simpleMessage(
       "Пользователь подтвердил прохождения плана. В ближайшее время Вы получите",
     ),
@@ -877,8 +891,8 @@ class MessageLookup extends MessageLookupByLibrary {
         MessageLookupByLibrary.simpleMessage(
           "Пользователь подтвердил прохождения плана.",
         ),
-    "userPaidThePlan": m7,
-    "userSubscribedToPlan": m8,
+    "userPaidThePlan": m8,
+    "userSubscribedToPlan": m9,
     "user_authorization": MessageLookupByLibrary.simpleMessage(
       "Аутентификация",
     ),
@@ -898,13 +912,33 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "video_call": MessageLookupByLibrary.simpleMessage("Video call"),
     "video_call_chat": MessageLookupByLibrary.simpleMessage("Chat"),
+    "video_call_close": MessageLookupByLibrary.simpleMessage("Close"),
+    "video_call_connection_lost_message": MessageLookupByLibrary.simpleMessage(
+      "It looks like there is an internet issue. Tap Retry to reconnect.",
+    ),
+    "video_call_connection_lost_title": MessageLookupByLibrary.simpleMessage(
+      "Connection lost",
+    ),
     "video_call_counterpart_default": MessageLookupByLibrary.simpleMessage(
       "Participant",
     ),
+    "video_call_enter": MessageLookupByLibrary.simpleMessage("Enter"),
     "video_call_leave": MessageLookupByLibrary.simpleMessage("Leave"),
+    "video_call_mic_muted_phone_call": MessageLookupByLibrary.simpleMessage(
+      "Microphone is muted during the phone call",
+    ),
     "video_call_muted_mic_warning": MessageLookupByLibrary.simpleMessage(
       "Attention!\nYour microphone is muted",
     ),
+    "video_call_notification_end": MessageLookupByLibrary.simpleMessage(
+      "End call",
+    ),
+    "video_call_notification_in_progress": MessageLookupByLibrary.simpleMessage(
+      "Call in progress",
+    ),
+    "video_call_notification_return": MessageLookupByLibrary.simpleMessage(
+      "Return to call",
+    ),
     "video_call_permission_camera_description":
         MessageLookupByLibrary.simpleMessage(
           "Allow camera access so others can see you during the video call. If you declined, you can enable it in system settings.",
@@ -927,7 +961,24 @@ class MessageLookup extends MessageLookupByLibrary {
     "video_call_role_consultant": MessageLookupByLibrary.simpleMessage(
       "Eatvio consultant",
     ),
+    "video_call_screen_connecting_subtitle":
+        MessageLookupByLibrary.simpleMessage("This may take a few seconds"),
+    "video_call_screen_connecting_title": MessageLookupByLibrary.simpleMessage(
+      "Connecting to\nthe consultation",
+    ),
+    "video_call_screen_loading_title": MessageLookupByLibrary.simpleMessage(
+      "Loading…",
+    ),
+    "video_call_screen_reconnecting_subtitle":
+        MessageLookupByLibrary.simpleMessage("Check your internet and wait"),
+    "video_call_screen_reconnecting_title":
+        MessageLookupByLibrary.simpleMessage("Reconnecting"),
     "video_call_sound": MessageLookupByLibrary.simpleMessage("Sound"),
+    "video_call_status_online": MessageLookupByLibrary.simpleMessage("Online"),
+    "video_call_system_interruption": MessageLookupByLibrary.simpleMessage(
+      "Another call or app is using audio.\nYour consultation is paused until it ends.",
+    ),
+    "video_call_try_again": MessageLookupByLibrary.simpleMessage("Retry"),
     "video_call_unknown_initial": MessageLookupByLibrary.simpleMessage("?"),
     "video_call_video": MessageLookupByLibrary.simpleMessage("Video"),
     "video_call_you": MessageLookupByLibrary.simpleMessage("You"),
@@ -971,7 +1022,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "youCanComplain": MessageLookupByLibrary.simpleMessage(
       "Если вас что-то не устроило, вы можете подать жалобу",
     ),
-    "youCanceledSubscriptionToPlan": m9,
+    "youCanceledSubscriptionToPlan": m10,
     "youShureYouWantToCancelOrder": MessageLookupByLibrary.simpleMessage(
       "Вы уверены, что хотите отменить заказ?",
     ),
diff --git a/lib/generated/intl/messages_ru.dart b/lib/generated/intl/messages_ru.dart
index 884317a4..a1c9f2c3 100644
--- a/lib/generated/intl/messages_ru.dart
+++ b/lib/generated/intl/messages_ru.dart
@@ -20,6 +20,9 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
 class MessageLookup extends MessageLookupByLibrary {
   String get localeName => 'ru';
 
+  static String m3(percent, amount) =>
+      "Скидка ${percent}% — вы экономите ${amount} ₽";
+
   final messages = _notInlinedMessages(_notInlinedMessages);
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
     "Moscow": MessageLookupByLibrary.simpleMessage("Москва"),
@@ -322,10 +325,21 @@ class MessageLookup extends MessageLookupByLibrary {
       "Разница в ценах, это комиссия Итвио",
     ),
     "profile": MessageLookupByLibrary.simpleMessage("Профиль"),
+    "promo_applied_subtitle": MessageLookupByLibrary.simpleMessage(
+      "Скидка учтётся при оплате",
+    ),
+    "promo_applied_title": MessageLookupByLibrary.simpleMessage(
+      "Промокод применён!",
+    ),
     "promo_code": MessageLookupByLibrary.simpleMessage("Промокод"),
+    "promo_discount_hint": m3,
     "promo_invalid": MessageLookupByLibrary.simpleMessage(
       "Промокод не найден или истёк",
     ),
+    "promo_remove": MessageLookupByLibrary.simpleMessage("Убрать промокод"),
+    "promo_remove_failed": MessageLookupByLibrary.simpleMessage(
+      "Не удалось убрать промокод. Попробуйте позже",
+    ),
     "proteins": MessageLookupByLibrary.simpleMessage("Белки"),
     "public_diet_state": MessageLookupByLibrary.simpleMessage("Публичная"),
     "publish": MessageLookupByLibrary.simpleMessage("Опубликовать"),
@@ -378,13 +392,33 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "video_call": MessageLookupByLibrary.simpleMessage("Видеозвонок"),
     "video_call_chat": MessageLookupByLibrary.simpleMessage("Чат"),
+    "video_call_close": MessageLookupByLibrary.simpleMessage("Закрыть"),
+    "video_call_connection_lost_message": MessageLookupByLibrary.simpleMessage(
+      "Похоже, возникли проблемы с интернетом. Нажмите «Повторить», чтобы переподключиться.",
+    ),
+    "video_call_connection_lost_title": MessageLookupByLibrary.simpleMessage(
+      "Связь прервалась",
+    ),
     "video_call_counterpart_default": MessageLookupByLibrary.simpleMessage(
       "Собеседник",
     ),
+    "video_call_enter": MessageLookupByLibrary.simpleMessage("Войти"),
     "video_call_leave": MessageLookupByLibrary.simpleMessage("Выйти"),
+    "video_call_mic_muted_phone_call": MessageLookupByLibrary.simpleMessage(
+      "Микрофон выключен на время телефонного звонка",
+    ),
     "video_call_muted_mic_warning": MessageLookupByLibrary.simpleMessage(
       "Внимание!\nУ вас выключен микрофон",
     ),
+    "video_call_notification_end": MessageLookupByLibrary.simpleMessage(
+      "Завершить звонок",
+    ),
+    "video_call_notification_in_progress": MessageLookupByLibrary.simpleMessage(
+      "Звонок идёт",
+    ),
+    "video_call_notification_return": MessageLookupByLibrary.simpleMessage(
+      "Вернуться к звонку",
+    ),
     "video_call_permission_camera_description":
         MessageLookupByLibrary.simpleMessage(
           "Чтобы вас видели во время видеозвонка, разрешите доступ к камере. При отказе можно включить доступ в настройках устройства.",
@@ -407,7 +441,24 @@ class MessageLookup extends MessageLookupByLibrary {
     "video_call_role_consultant": MessageLookupByLibrary.simpleMessage(
       "Консультант Итвио",
     ),
+    "video_call_screen_connecting_subtitle":
+        MessageLookupByLibrary.simpleMessage("Это займёт несколько секунд"),
+    "video_call_screen_connecting_title": MessageLookupByLibrary.simpleMessage(
+      "Подключение\nк консультации",
+    ),
+    "video_call_screen_loading_title": MessageLookupByLibrary.simpleMessage(
+      "Загрузка…",
+    ),
+    "video_call_screen_reconnecting_subtitle":
+        MessageLookupByLibrary.simpleMessage("Проверьте интернет и подождите"),
+    "video_call_screen_reconnecting_title":
+        MessageLookupByLibrary.simpleMessage("Восстанавливаем соединение"),
     "video_call_sound": MessageLookupByLibrary.simpleMessage("Звук"),
+    "video_call_status_online": MessageLookupByLibrary.simpleMessage("Онлайн"),
+    "video_call_system_interruption": MessageLookupByLibrary.simpleMessage(
+      "Другой звонок или приложение использует аудио.\nКонсультация приостановлена до его завершения.",
+    ),
+    "video_call_try_again": MessageLookupByLibrary.simpleMessage("Повторить"),
     "video_call_unknown_initial": MessageLookupByLibrary.simpleMessage("?"),
     "video_call_video": MessageLookupByLibrary.simpleMessage("Видео"),
     "video_call_you": MessageLookupByLibrary.simpleMessage("Вы"),
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
index cf3507df..d5c739d2 100644
--- a/lib/generated/l10n.dart
+++ b/lib/generated/l10n.dart
@@ -4109,6 +4109,36 @@ class S {
     );
   }
 
+  /// `Another call or app is using audio.\nYour consultation is paused until it ends.`
+  String get video_call_system_interruption {
+    return Intl.message(
+      'Another call or app is using audio.\nYour consultation is paused until it ends.',
+      name: 'video_call_system_interruption',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Microphone is muted during the phone call`
+  String get video_call_mic_muted_phone_call {
+    return Intl.message(
+      'Microphone is muted during the phone call',
+      name: 'video_call_mic_muted_phone_call',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Online`
+  String get video_call_status_online {
+    return Intl.message(
+      'Online',
+      name: 'video_call_status_online',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `Chat`
   String get video_call_chat {
     return Intl.message('Chat', name: 'video_call_chat', desc: '', args: []);
@@ -4233,6 +4263,176 @@ class S {
       args: [],
     );
   }
+
+  /// `Promo code applied!`
+  String get promo_applied_title {
+    return Intl.message(
+      'Promo code applied!',
+      name: 'promo_applied_title',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `The discount will be applied at checkout`
+  String get promo_applied_subtitle {
+    return Intl.message(
+      'The discount will be applied at checkout',
+      name: 'promo_applied_subtitle',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Remove promo code`
+  String get promo_remove {
+    return Intl.message(
+      'Remove promo code',
+      name: 'promo_remove',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Discount {percent}% — you save {amount} ₽`
+  String promo_discount_hint(int percent, String amount) {
+    return Intl.message(
+      'Discount $percent% — you save $amount ₽',
+      name: 'promo_discount_hint',
+      desc: '',
+      args: [percent, amount],
+    );
+  }
+
+  /// `Could not remove the promo code. Try again later`
+  String get promo_remove_failed {
+    return Intl.message(
+      'Could not remove the promo code. Try again later',
+      name: 'promo_remove_failed',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Loading…`
+  String get video_call_screen_loading_title {
+    return Intl.message(
+      'Loading…',
+      name: 'video_call_screen_loading_title',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Connecting to\nthe consultation`
+  String get video_call_screen_connecting_title {
+    return Intl.message(
+      'Connecting to\nthe consultation',
+      name: 'video_call_screen_connecting_title',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `This may take a few seconds`
+  String get video_call_screen_connecting_subtitle {
+    return Intl.message(
+      'This may take a few seconds',
+      name: 'video_call_screen_connecting_subtitle',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Reconnecting`
+  String get video_call_screen_reconnecting_title {
+    return Intl.message(
+      'Reconnecting',
+      name: 'video_call_screen_reconnecting_title',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Check your internet and wait`
+  String get video_call_screen_reconnecting_subtitle {
+    return Intl.message(
+      'Check your internet and wait',
+      name: 'video_call_screen_reconnecting_subtitle',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Connection lost`
+  String get video_call_connection_lost_title {
+    return Intl.message(
+      'Connection lost',
+      name: 'video_call_connection_lost_title',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `It looks like there is an internet issue. Tap Retry to reconnect.`
+  String get video_call_connection_lost_message {
+    return Intl.message(
+      'It looks like there is an internet issue. Tap Retry to reconnect.',
+      name: 'video_call_connection_lost_message',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Retry`
+  String get video_call_try_again {
+    return Intl.message(
+      'Retry',
+      name: 'video_call_try_again',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Enter`
+  String get video_call_enter {
+    return Intl.message('Enter', name: 'video_call_enter', desc: '', args: []);
+  }
+
+  /// `Close`
+  String get video_call_close {
+    return Intl.message('Close', name: 'video_call_close', desc: '', args: []);
+  }
+
+  /// `Call in progress`
+  String get video_call_notification_in_progress {
+    return Intl.message(
+      'Call in progress',
+      name: 'video_call_notification_in_progress',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Return to call`
+  String get video_call_notification_return {
+    return Intl.message(
+      'Return to call',
+      name: 'video_call_notification_return',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `End call`
+  String get video_call_notification_end {
+    return Intl.message(
+      'End call',
+      name: 'video_call_notification_end',
+      desc: '',
+      args: [],
+    );
+  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<S> {
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index 9bb90bec..2c971d99 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -483,6 +483,9 @@
   "video_call_poor_connection": "You have a poor internet connection",
   "video_call_recording_notice": "The video call will be recorded.\nThe consultation may be reviewed by Eatvio staff for quality assurance.",
   "video_call_muted_mic_warning": "Attention!\nYour microphone is muted",
+  "video_call_system_interruption": "Another call or app is using audio.\nYour consultation is paused until it ends.",
+  "video_call_mic_muted_phone_call": "Microphone is muted during the phone call",
+  "video_call_status_online": "Online",
   "video_call_chat": "Chat",
   "video_call_sound": "Sound",
   "video_call_video": "Video",
@@ -498,6 +501,30 @@
   "have_promo_code_form": "Have a promo code?",
   "promo_code": "Promo code",
   "enter_promo_code": "Enter promo code",
-  "promo_invalid": "Promo code not found or expired"
+  "promo_invalid": "Promo code not found or expired",
+  "promo_applied_title": "Promo code applied!",
+  "promo_applied_subtitle": "The discount will be applied at checkout",
+  "promo_remove": "Remove promo code",
+  "promo_discount_hint": "Discount {percent}% — you save {amount} ₽",
+  "@promo_discount_hint": {
+    "placeholders": {
+      "percent": {"type": "int"},
+      "amount": {"type": "String"}
+    }
+  },
+  "promo_remove_failed": "Could not remove the promo code. Try again later",
+  "video_call_screen_loading_title": "Loading…",
+  "video_call_screen_connecting_title": "Connecting to\nthe consultation",
+  "video_call_screen_connecting_subtitle": "This may take a few seconds",
+  "video_call_screen_reconnecting_title": "Reconnecting",
+  "video_call_screen_reconnecting_subtitle": "Check your internet and wait",
+  "video_call_connection_lost_title": "Connection lost",
+  "video_call_connection_lost_message": "It looks like there is an internet issue. Tap Retry to reconnect.",
+  "video_call_try_again": "Retry",
+  "video_call_enter": "Enter",
+  "video_call_close": "Close",
+  "video_call_notification_in_progress": "Call in progress",
+  "video_call_notification_return": "Return to call",
+  "video_call_notification_end": "End call"
 }
 
diff --git a/lib/l10n/intl_ru.arb b/lib/l10n/intl_ru.arb
index bae97144..738bac08 100644
--- a/lib/l10n/intl_ru.arb
+++ b/lib/l10n/intl_ru.arb
@@ -225,6 +225,9 @@
   "video_call_poor_connection": "У вас плохое интернет соединение",
   "video_call_recording_notice": "Видеозвонок будет записан.\nКонсультация может быть проверена сотрудниками Итвио, на предмет качества оказания услуг.",
   "video_call_muted_mic_warning": "Внимание!\nУ вас выключен микрофон",
+  "video_call_system_interruption": "Другой звонок или приложение использует аудио.\nКонсультация приостановлена до его завершения.",
+  "video_call_mic_muted_phone_call": "Микрофон выключен на время телефонного звонка",
+  "video_call_status_online": "Онлайн",
   "video_call_chat": "Чат",
   "video_call_sound": "Звук",
   "video_call_video": "Видео",
@@ -233,7 +236,6 @@
   "video_call_permission_camera_title": "Доступ к камере",
   "video_call_permission_camera_description": "Чтобы вас видели во время видеозвонка, разрешите доступ к камере. При отказе можно включить доступ в настройках устройства.",
   "video_call_permission_microphone_title": "Доступ к микрофону",
-  "video_call_permission_microphone_description": "Чтобы вас слышали во время видеозвонка, разрешите доступ к микрофону. При отказе можно включить доступ в настройках устройства.",
   "choose_bank_for_payment": "Выберите банк",
   "no_installed_banks": "Нет установленных банков",
   "sbp_payment_error": "Не удалось начать оплату. Попробуйте позже",
@@ -243,5 +245,30 @@
   "have_promo_code_form": "Есть промокод?",
   "promo_code": "Промокод",
   "enter_promo_code": "Введите промокод",
-  "promo_invalid": "Промокод не найден или истёк"
+  "promo_invalid": "Промокод не найден или истёк",
+  "promo_applied_title": "Промокод применён!",
+  "promo_applied_subtitle": "Скидка учтётся при оплате",
+  "promo_remove": "Убрать промокод",
+  "promo_discount_hint": "Скидка {percent}% — вы экономите {amount} ₽",
+  "@promo_discount_hint": {
+    "placeholders": {
+      "percent": {"type": "int"},
+      "amount": {"type": "String"}
+    }
+  },
+  "promo_remove_failed": "Не удалось убрать промокод. Попробуйте позже",
+  "video_call_permission_microphone_description": "Чтобы вас слышали во время видеозвонка, разрешите доступ к микрофону. При отказе можно включить доступ в настройках устройства.",
+  "video_call_screen_loading_title": "Загрузка…",
+  "video_call_screen_connecting_title": "Подключение\nк консультации",
+  "video_call_screen_connecting_subtitle": "Это займёт несколько секунд",
+  "video_call_screen_reconnecting_title": "Восстанавливаем соединение",
+  "video_call_screen_reconnecting_subtitle": "Проверьте интернет и подождите",
+  "video_call_connection_lost_title": "Связь прервалась",
+  "video_call_connection_lost_message": "Похоже, возникли проблемы с интернетом. Нажмите «Повторить», чтобы переподключиться.",
+  "video_call_try_again": "Повторить",
+  "video_call_enter": "Войти",
+  "video_call_close": "Закрыть",
+  "video_call_notification_in_progress": "Звонок идёт",
+  "video_call_notification_return": "Вернуться к звонку",
+  "video_call_notification_end": "Завершить звонок"
 }
diff --git a/lib/main.dart b/lib/main.dart
index 3ab5cf6e..2813a4d0 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -4,14 +4,24 @@ import 'package:eatvio_app/core/app_router.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/notifications/push_navigation_handler.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_callkit_coordinator.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_foreground_bootstrap.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_app_shell.dart';
+import 'dart:async';
+
 import 'package:flutter/material.dart';
+import 'package:flutter_foreground_task/flutter_foreground_task.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_portal/flutter_portal.dart';
 import 'package:keyboard_dismisser/keyboard_dismisser.dart';
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  FlutterForegroundTask.initCommunicationPort();
+  VideoCallForegroundBootstrap.ensureInitialized();
   await AppInitializer.initialize(buildType: AppBuildType.prod);
+  await sl<VideoCallCallKitCoordinator>().initialize();
+  await PushNavigationHandler.initialize();
   await AppInitializer.runAppWithSentry(() => runApp(const MyApp()));
 }
 
@@ -26,7 +36,6 @@ class _MyAppState extends State<MyApp> {
   @override
   void initState() {
     super.initState();
-    PushNavigationHandler.initialize();
   }
 
   @override
@@ -35,12 +44,15 @@ class _MyAppState extends State<MyApp> {
       providers: sl<AppConfig>().globalBlocProviders,
       child: Portal(
         child: KeyboardDismisser(
-          child: MaterialApp.router(
-            theme: ThemeHelper().themeData(),
-            routerConfig: AppRouter.appRouter,
-            debugShowCheckedModeBanner: false,
-            localizationsDelegates: sl<AppConfig>().localizationDelegates,
-            supportedLocales: sl<AppConfig>().supportedLocales,
+          child: WithForegroundTask(
+            child: MaterialApp.router(
+              theme: ThemeHelper().themeData(),
+              routerConfig: AppRouter.appRouter,
+              debugShowCheckedModeBanner: false,
+              localizationsDelegates: sl<AppConfig>().localizationDelegates,
+              supportedLocales: sl<AppConfig>().supportedLocales,
+              builder: (context, child) => VideoCallAppShell(child: child),
+            ),
           ),
         ),
       ),
diff --git a/pubspec.yaml b/pubspec.yaml
index e6badd50..a0d96551 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: eatvio_app
 description: A new Flutter project.
-version: 1.3.24+106
+version: 1.3.40+129
 publish_to: 'none'
 
 environment:
@@ -29,7 +29,7 @@ dependencies:
   keyboard_dismisser: ^3.0.0
   retrofit: 4.7.2
   get_it: ^9.2.0
-  dio: ^5.9.0
+  dio: ^5.10.0
   dart_pusher_channels: ^1.2.3
   photo_view: ^0.15.0
   dismissible_page: ^1.0.2
@@ -82,9 +82,15 @@ dependencies:
   rxdart: ^0.27.7
   gpassword: ^1.0.0
   webview_flutter_platform_interface: ^2.14.0
+  flutter_inappwebview: ^6.1.5
   intl_utils: ^2.8.13
   sentry_dio: ^9.10.0
   livekit_client: ^2.6.1
+  audio_session: ^0.1.25
+  flutter_foreground_task: ^9.2.1
+  flutter_callkit_incoming: ^3.1.1
+  floating: ^6.0.0
+  wakelock_plus: ^1.5.2
   sbp: 0.1.0
 
 dev_dependencies:
diff --git a/test/core/app_config_test.dart b/test/core/app_config_test.dart
index a1ef5140..0bcfc864 100644
--- a/test/core/app_config_test.dart
+++ b/test/core/app_config_test.dart
@@ -1,9 +1,14 @@
 import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/app_initializer.dart';
 import 'package:eatvio_app/core/env_config.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/mockito.dart';
+
+class _MockVideoCallSessionCubit extends Mock implements VideoCallSessionCubit {}
 
 void main() {
   setUpAll(() async {
@@ -11,6 +16,17 @@ void main() {
     dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
   });
 
+  setUp(() async {
+    await sl.reset();
+    sl.registerLazySingleton<VideoCallSessionCubit>(
+      _MockVideoCallSessionCubit.new,
+    );
+  });
+
+  tearDown(() async {
+    await sl.reset();
+  });
+
   group('AppConfig', () {
     test('creates config with prod build type', () {
       final config = AppConfig(buildType: AppBuildType.prod);
diff --git a/test/core/app_router_test.dart b/test/core/app_router_test.dart
index 648c5130..bdeef9c1 100644
--- a/test/core/app_router_test.dart
+++ b/test/core/app_router_test.dart
@@ -7,6 +7,32 @@ import 'package:go_router/go_router.dart';
 
 void main() {
   group('AppRouter', () {
+    group('resolveDeepLinkTarget - blog_post', () {
+      test('ru/blog_post/{id} → /blog-post-screen?id=', () {
+        final target = AppRouter.resolveDeepLinkTarget(
+          Uri.parse('https://eatvio.ru/ru/blog_post/123'),
+        );
+
+        expect(target, '/blog-post-screen?id=123');
+      });
+
+      test('en/blog_post/{id} → /blog-post-screen?id=', () {
+        final target = AppRouter.resolveDeepLinkTarget(
+          Uri.parse('https://eatvio.com/en/blog_post/456'),
+        );
+
+        expect(target, '/blog-post-screen?id=456');
+      });
+
+      test('eatvio.com/blog_post/{id} without locale → /blog-post-screen?id=', () {
+        final target = AppRouter.resolveDeepLinkTarget(
+          Uri.parse('https://eatvio.com/blog_post/789'),
+        );
+
+        expect(target, '/blog-post-screen?id=789');
+      });
+    });
+
     group('resolveDeepLinkTarget - finance/alfa/return', () {
       const orderId = 'alfa_c29_k15138_t1712345678_r1234';
 
diff --git a/test/core/const_test.dart b/test/core/const_test.dart
index 1adf6b1b..415dfb37 100644
--- a/test/core/const_test.dart
+++ b/test/core/const_test.dart
@@ -33,6 +33,7 @@ void main() {
       expect(newMessagesChannelName, 'private-new-chat-messages');
       expect(newNotificationsChannelName, 'private-message-events');
       expect(directChatChannelName, 'private-direct-chat');
+      expect(presenceDirectChatChannelName, 'presence-direct-chat');
     });
 
     test('thresholdForPagination has correct value', () {
diff --git a/test/core/error_reporting/error_report_policy_test.dart b/test/core/error_reporting/error_report_policy_test.dart
index d504e50a..ee84f765 100644
--- a/test/core/error_reporting/error_report_policy_test.dart
+++ b/test/core/error_reporting/error_report_policy_test.dart
@@ -32,6 +32,7 @@ void main() {
         DioExceptionType.connectionTimeout,
         DioExceptionType.sendTimeout,
         DioExceptionType.receiveTimeout,
+        DioExceptionType.transformTimeout,
       ]) {
         final e = DioException(
           requestOptions: RequestOptions(path: '/x'),
diff --git a/test/core/routing/content_routes_test.dart b/test/core/routing/content_routes_test.dart
index ff23e2a3..385485a9 100644
--- a/test/core/routing/content_routes_test.dart
+++ b/test/core/routing/content_routes_test.dart
@@ -51,8 +51,11 @@ void main() {
       final blogPostRoute = routes.firstWhere(
         (route) => route is GoRoute && route.path == '/blog-post-screen',
         orElse: () => throw Exception('Route not found'),
-      );
+      ) as GoRoute;
       expect(blogPostRoute, isA<GoRoute>());
+      expect(blogPostRoute.path, '/blog-post-screen');
+      expect(blogPostRoute.name, 'blogPostScreen');
+      expect(blogPostRoute.builder, isNotNull);
     });
 
     test('aboutPlanScreen builder обрабатывает slug из query параметров', () {
diff --git a/test/features/blog_post/presentation/cubit/blog_post_cubit_test.dart b/test/features/blog_post/presentation/cubit/blog_post_cubit_test.dart
index 082c154c..4103007c 100644
--- a/test/features/blog_post/presentation/cubit/blog_post_cubit_test.dart
+++ b/test/features/blog_post/presentation/cubit/blog_post_cubit_test.dart
@@ -6,6 +6,8 @@ import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
 
+import '../../../../fixtures/feed_fixtures.dart';
+
 class MockFeedRepository extends Mock implements FeedRepository {}
 
 void main() {
@@ -29,21 +31,7 @@ void main() {
 
     test('getBlogPost - успешная загрузка поста', () async {
       const postId = 1;
-      final mockPost = FeedBlogPostModel(
-        id: postId,
-        title: 'Test Post',
-        state: 'active',
-        image: '',
-        description: 'Test Content',
-        videoUrl: '',
-        createdAt: DateTime.now(),
-        updatedAt: DateTime.now(),
-        totalLikes: 0,
-        totalViews: 0,
-        totalComments: 0,
-        wasLikedByMe: false,
-        author: const Author(authorName: 'Test Author', authorSlug: 'test-author', authorProfileIcon: '', authorIsMe: false),
-      );
+      final mockPost = FeedFixtures.feedBlogPostModel();
 
       when(() => mockRepository.getBlogPost(id: postId)).thenAnswer((_) async => mockPost);
 
@@ -51,6 +39,8 @@ void main() {
 
       expect(cubit.state.isLoading, false);
       expect(cubit.state.blogPostModel, mockPost);
+      expect(cubit.state.blogPostModel?.images, hasLength(2));
+      expect(cubit.state.blogPostModel?.videoEmbedUrl, contains('rutube.ru/play/embed'));
       verify(() => mockRepository.getBlogPost(id: postId)).called(1);
     });
 
diff --git a/test/features/blog_post/presentation/pages/blog_post_screen_smoke_test.dart b/test/features/blog_post/presentation/pages/blog_post_screen_smoke_test.dart
index f194ea0c..f4253129 100644
--- a/test/features/blog_post/presentation/pages/blog_post_screen_smoke_test.dart
+++ b/test/features/blog_post/presentation/pages/blog_post_screen_smoke_test.dart
@@ -7,9 +7,8 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/features/blog_post/presentation/cubit/blog_post_cubit.dart';
 import 'package:eatvio_app/features/blog_post/presentation/cubit/blog_post_state.dart';
 import 'package:eatvio_app/features/blog_post/presentation/pages/blog_post_screen.dart';
-import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
-import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
+import 'package:eatvio_app/features/feed/presentation/widgets/blog_post_media_content.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -21,6 +20,7 @@ import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:network_image_mock/network_image_mock.dart';
 
+import '../../../../fixtures/feed_fixtures.dart';
 import 'blog_post_screen_smoke_test.mocks.dart';
 
 @GenerateNiceMocks([MockSpec<BlogPostCubit>(), MockSpec<FeedCubit>(), MockSpec<CommentsCubit>()])
@@ -167,21 +167,7 @@ void main() {
         final blogPostCubit = MockBlogPostCubit();
         final feedCubit = MockFeedCubit();
         final commentsCubit = MockCommentsCubit();
-        final blogPostModel = FeedBlogPostModel(
-          id: 1,
-          title: 'Test Post Title',
-          description: 'Test post description',
-          image: 'https://example.com/image.jpg',
-          state: 'published',
-          author: const Author(authorSlug: 'author-1', authorName: 'Author Name', authorProfileIcon: 'https://example.com/icon.jpg', authorIsMe: false),
-          videoUrl: '',
-          createdAt: DateTime(2024, 1, 15),
-          updatedAt: DateTime(2024, 1, 15),
-          totalLikes: 10,
-          totalViews: 100,
-          totalComments: 5,
-          wasLikedByMe: false,
-        );
+        final blogPostModel = FeedFixtures.feedBlogPostModel();
         final state = BlogPostState(isLoading: false, blogPostModel: blogPostModel, error: null);
 
         when(blogPostCubit.state).thenReturn(state);
@@ -202,7 +188,8 @@ void main() {
         await tester.pumpAndSettle();
 
         expect(find.byType(BlogPostScreen), findsOneWidget);
-        expect(find.text('Test Post Title'), findsOneWidget);
+        expect(find.text('Заголовок'), findsOneWidget);
+        expect(find.byType(BlogPostMediaContent), findsOneWidget);
       });
     });
 
@@ -211,21 +198,7 @@ void main() {
         final blogPostCubit = MockBlogPostCubit();
         final feedCubit = MockFeedCubit();
         final commentsCubit = MockCommentsCubit();
-        final blogPostModel = FeedBlogPostModel(
-          id: 1,
-          title: 'Test Post Title',
-          description: 'Test post description',
-          image: 'https://example.com/image.jpg',
-          state: 'published',
-          author: const Author(authorSlug: 'author-1', authorName: 'Author Name', authorProfileIcon: 'https://example.com/icon.jpg', authorIsMe: false),
-          videoUrl: '',
-          createdAt: DateTime(2024, 1, 15),
-          updatedAt: DateTime(2024, 1, 15),
-          totalLikes: 10,
-          totalViews: 100,
-          totalComments: 5,
-          wasLikedByMe: false,
-        );
+        final blogPostModel = FeedFixtures.feedBlogPostModel();
         final state = BlogPostState(isLoading: false, blogPostModel: blogPostModel, error: null);
 
         when(blogPostCubit.state).thenReturn(state);
@@ -248,11 +221,104 @@ void main() {
         await tester.pump();
         await tester.pumpAndSettle();
 
-        await tester.tap(find.byIcon(Icons.favorite_border_rounded));
+        final likeIcon = find.byIcon(Icons.favorite_border_rounded);
+        await tester.ensureVisible(likeIcon);
+        await tester.pumpAndSettle();
+        await tester.tap(likeIcon);
         await tester.pump();
 
         verify(blogPostCubit.toggleLike()).called(1);
       });
     });
+
+    testWidgets('renders gallery from fixture', (tester) async {
+      await mockNetworkImagesFor(() async {
+        final blogPostCubit = MockBlogPostCubit();
+        final feedCubit = MockFeedCubit();
+        final commentsCubit = MockCommentsCubit();
+        final blogPostModel = FeedFixtures.feedBlogPostWithGallery();
+        final state = BlogPostState(isLoading: false, blogPostModel: blogPostModel, error: null);
+
+        when(blogPostCubit.state).thenReturn(state);
+        when(blogPostCubit.stream).thenAnswer((_) => Stream.value(state));
+        when(blogPostCubit.close()).thenAnswer((_) async => Future<void>.value());
+        when(feedCubit.viewPost(any)).thenAnswer((_) async => Future<void>.value());
+        when(feedCubit.stream).thenAnswer((_) => const Stream.empty());
+        when(feedCubit.close()).thenAnswer((_) async => Future<void>.value());
+        when(commentsCubit.state).thenReturn(const CommentsState());
+        when(commentsCubit.stream).thenAnswer((_) => const Stream<CommentsState>.empty());
+        when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());
+        when(commentsCubit.getComments(any, any, any)).thenAnswer((_) async => Future<void>.value());
+
+        registerMocks(blogPostCubit, commentsCubit);
+
+        await tester.pumpWidget(wrap(blogPostCubit, feedCubit, commentsCubit, BlogPostScreen(id: blogPostModel.id)));
+        await tester.pump();
+        await tester.pumpAndSettle();
+
+        expect(find.byType(BlogPostMediaContent), findsOneWidget);
+        expect(find.text('Галерея'), findsOneWidget);
+      });
+    });
+
+    testWidgets('renders video-only post', (tester) async {
+      await mockNetworkImagesFor(() async {
+        final blogPostCubit = MockBlogPostCubit();
+        final feedCubit = MockFeedCubit();
+        final commentsCubit = MockCommentsCubit();
+        final blogPostModel = FeedFixtures.feedBlogPostVideoOnly();
+        final state = BlogPostState(isLoading: false, blogPostModel: blogPostModel, error: null);
+
+        when(blogPostCubit.state).thenReturn(state);
+        when(blogPostCubit.stream).thenAnswer((_) => Stream.value(state));
+        when(blogPostCubit.close()).thenAnswer((_) async => Future<void>.value());
+        when(feedCubit.viewPost(any)).thenAnswer((_) async => Future<void>.value());
+        when(feedCubit.stream).thenAnswer((_) => const Stream.empty());
+        when(feedCubit.close()).thenAnswer((_) async => Future<void>.value());
+        when(commentsCubit.state).thenReturn(const CommentsState());
+        when(commentsCubit.stream).thenAnswer((_) => const Stream<CommentsState>.empty());
+        when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());
+        when(commentsCubit.getComments(any, any, any)).thenAnswer((_) async => Future<void>.value());
+
+        registerMocks(blogPostCubit, commentsCubit);
+
+        await tester.pumpWidget(wrap(blogPostCubit, feedCubit, commentsCubit, BlogPostScreen(id: blogPostModel.id)));
+        await tester.pump();
+        await tester.pumpAndSettle();
+
+        expect(find.byType(BlogPostMediaContent), findsOneWidget);
+        expect(find.text('Видео'), findsOneWidget);
+      });
+    });
+
+    testWidgets('renders gallery and video post', (tester) async {
+      await mockNetworkImagesFor(() async {
+        final blogPostCubit = MockBlogPostCubit();
+        final feedCubit = MockFeedCubit();
+        final commentsCubit = MockCommentsCubit();
+        final blogPostModel = FeedFixtures.feedBlogPostGalleryAndVideo();
+        final state = BlogPostState(isLoading: false, blogPostModel: blogPostModel, error: null);
+
+        when(blogPostCubit.state).thenReturn(state);
+        when(blogPostCubit.stream).thenAnswer((_) => Stream.value(state));
+        when(blogPostCubit.close()).thenAnswer((_) async => Future<void>.value());
+        when(feedCubit.viewPost(any)).thenAnswer((_) async => Future<void>.value());
+        when(feedCubit.stream).thenAnswer((_) => const Stream.empty());
+        when(feedCubit.close()).thenAnswer((_) async => Future<void>.value());
+        when(commentsCubit.state).thenReturn(const CommentsState());
+        when(commentsCubit.stream).thenAnswer((_) => const Stream<CommentsState>.empty());
+        when(commentsCubit.close()).thenAnswer((_) async => Future<void>.value());
+        when(commentsCubit.getComments(any, any, any)).thenAnswer((_) async => Future<void>.value());
+
+        registerMocks(blogPostCubit, commentsCubit);
+
+        await tester.pumpWidget(wrap(blogPostCubit, feedCubit, commentsCubit, BlogPostScreen(id: blogPostModel.id)));
+        await tester.pump();
+        await tester.pumpAndSettle();
+
+        expect(find.byType(BlogPostMediaContent), findsOneWidget);
+        expect(find.text('Галерея и видео'), findsWidgets);
+      });
+    });
   });
 }
diff --git a/test/features/blog_post_create/advanced_widget_test.dart b/test/features/blog_post_create/advanced_widget_test.dart
index e052fa3c..aafb9aa8 100644
--- a/test/features/blog_post_create/advanced_widget_test.dart
+++ b/test/features/blog_post_create/advanced_widget_test.dart
@@ -21,10 +21,18 @@ void main() {
 
     setUp(() {
       blogPostRepository = FixtureBlogPostRepository();
-      blogPostCreateCubit = BlogPostCreateCubit(blogPostRepository: blogPostRepository);
-      fullCreateFixture = FixtureReader.readAsMap('blog_post_create/create_request_full.json');
-      updateFixture = FixtureReader.readAsMap('blog_post_create/update_request.json');
-      deleteFixture = FixtureReader.readAsMap('blog_post_create/delete_request.json');
+      blogPostCreateCubit = BlogPostCreateCubit(
+        blogPostRepository: blogPostRepository,
+      );
+      fullCreateFixture = FixtureReader.readAsMap(
+        'blog_post_create/create_request_full.json',
+      );
+      updateFixture = FixtureReader.readAsMap(
+        'blog_post_create/update_request.json',
+      );
+      deleteFixture = FixtureReader.readAsMap(
+        'blog_post_create/delete_request.json',
+      );
     });
 
     tearDown(() {
@@ -41,7 +49,9 @@ void main() {
       );
     }
 
-    testWidgets('should handle blog post creation with all fields', (WidgetTester tester) async {
+    testWidgets('should handle blog post creation with all fields', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       Widget formWidget = Column(
         children: [
@@ -69,7 +79,6 @@ void main() {
                 title: fullCreateFixture['title'] as String?,
                 description: fullCreateFixture['description_md'] as String?,
                 videoUrl: fullCreateFixture['video_url'] as String?,
-                image: null,
               );
             },
             child: const Text('Опубликовать'),
@@ -81,9 +90,18 @@ void main() {
       await tester.pumpWidget(createTestWidget(formWidget));
       await tester.pumpAndSettle();
 
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenTitleTextField), fullCreateFixture['title'] as String);
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenContentTextField), fullCreateFixture['description_md'] as String);
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField), fullCreateFixture['video_url'] as String);
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+        fullCreateFixture['title'] as String,
+      );
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenContentTextField),
+        fullCreateFixture['description_md'] as String,
+      );
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField),
+        fullCreateFixture['video_url'] as String,
+      );
       await tester.pump();
 
       await tester.tap(find.byKey(AppKeys.blogPostCreateScreenCreateButton));
@@ -96,7 +114,9 @@ void main() {
       );
     });
 
-    testWidgets('should handle blog post creation with image', (WidgetTester tester) async {
+    testWidgets('should handle blog post creation with image', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       final expectedPayload = Map<String, dynamic>.from(fullCreateFixture);
       expectedPayload['video_url'] = null;
@@ -129,7 +149,11 @@ void main() {
                 child: Column(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
-                    Icon(Icons.add_photo_alternate, size: 48, color: Colors.grey),
+                    Icon(
+                      Icons.add_photo_alternate,
+                      size: 48,
+                      color: Colors.grey,
+                    ),
                     SizedBox(height: 8),
                     Text('Добавить изображение'),
                   ],
@@ -145,7 +169,6 @@ void main() {
                 title: fullCreateFixture['title'] as String?,
                 description: fullCreateFixture['description_md'] as String?,
                 videoUrl: null,
-                image: null, // В реальном тесте здесь был бы XFile
               );
             },
             child: const Text('Опубликовать'),
@@ -157,15 +180,24 @@ void main() {
       await tester.pumpWidget(createTestWidget(formWidget));
       await tester.pumpAndSettle();
 
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenTitleTextField), fullCreateFixture['title'] as String);
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenContentTextField), fullCreateFixture['description_md'] as String);
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+        fullCreateFixture['title'] as String,
+      );
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenContentTextField),
+        fullCreateFixture['description_md'] as String,
+      );
       await tester.pump();
 
       await tester.tap(find.byKey(AppKeys.blogPostCreateScreenCreateButton));
       await tester.pump();
 
       // Assert
-      expect(blogPostRepository.createPayloads.single.toJson(), expectedPayload);
+      expect(
+        blogPostRepository.createPayloads.single.toJson(),
+        expectedPayload,
+      );
     });
 
     testWidgets('should handle blog post update', (WidgetTester tester) async {
@@ -175,7 +207,12 @@ void main() {
         state: 'published',
         image: 'original_image.jpg',
         description: 'Original Description',
-        author: const Author(authorSlug: 'test-author', authorName: 'Test Author', authorProfileIcon: 'avatar.jpg', authorIsMe: true),
+        author: const Author(
+          authorSlug: 'test-author',
+          authorName: 'Test Author',
+          authorProfileIcon: 'avatar.jpg',
+          authorIsMe: true,
+        ),
         videoUrl: 'https://youtube.com/watch?v=original',
         createdAt: DateTime.now(),
         updatedAt: DateTime.now(),
@@ -216,8 +253,9 @@ void main() {
                 title: updateFixture['title'] as String?,
                 description: updateFixture['description_md'] as String?,
                 videoUrl: updateFixture['video_url'] as String?,
-                image: null,
-                oldImageUrl: updateFixture['old_image_url'] as String?,
+                existingMediaIds: List<int>.from(
+                  updateFixture['existing_media_ids'] as List,
+                ),
               );
             },
             child: const Text('Обновить'),
@@ -229,9 +267,18 @@ void main() {
       await tester.pumpWidget(createTestWidget(formWidget));
       await tester.pumpAndSettle();
 
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenTitleTextField), updateFixture['title'] as String);
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenContentTextField), updateFixture['description_md'] as String);
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField), updateFixture['video_url'] as String);
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+        updateFixture['title'] as String,
+      );
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenContentTextField),
+        updateFixture['description_md'] as String,
+      );
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField),
+        updateFixture['video_url'] as String,
+      );
       await tester.pump();
 
       await tester.tap(find.byKey(AppKeys.blogPostCreateScreenCreateButton));
@@ -241,7 +288,9 @@ void main() {
       expect(blogPostRepository.updatePayloads.single.toJson(), updateFixture);
     });
 
-    testWidgets('should handle blog post deletion', (WidgetTester tester) async {
+    testWidgets('should handle blog post deletion', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       Widget deleteWidget = ElevatedButton(
         key: const Key('deleteBlogPostButton'),
@@ -262,18 +311,21 @@ void main() {
       expect(blogPostRepository.deleteCalls.single, deleteFixture['id']);
     });
 
-    testWidgets('should handle loading state during blog post creation', (WidgetTester tester) async {
+    testWidgets('should handle loading state during blog post creation', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       blogPostRepository.createDelay = const Duration(milliseconds: 50);
 
-      Widget loadingWidget = BlocBuilder<BlogPostCreateCubit, BlogPostCreateState>(
-        builder: (context, state) {
-          if (state is BlogPostCreateStateLoading) {
-            return const Center(child: CircularProgressIndicator());
-          }
-          return const Text('Not Loading');
-        },
-      );
+      Widget loadingWidget =
+          BlocBuilder<BlogPostCreateCubit, BlogPostCreateState>(
+            builder: (context, state) {
+              if (state.isLoading) {
+                return const Center(child: CircularProgressIndicator());
+              }
+              return const Text('Not Loading');
+            },
+          );
 
       // Act
       await tester.pumpWidget(createTestWidget(loadingWidget));
@@ -284,7 +336,6 @@ void main() {
         title: fullCreateFixture['title'] as String?,
         videoUrl: null,
         description: fullCreateFixture['description_md'] as String?,
-        image: null,
       );
       await tester.pump();
       await tester.pump(); // Need to pump twice to get the loading state
@@ -297,18 +348,21 @@ void main() {
       await tester.pumpAndSettle();
     });
 
-    testWidgets('should handle error state during blog post creation', (WidgetTester tester) async {
+    testWidgets('should handle error state during blog post creation', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       blogPostRepository.createError = Exception('Network error');
 
-      Widget errorWidget = BlocBuilder<BlogPostCreateCubit, BlogPostCreateState>(
-        builder: (context, state) {
-          if (state is BlogPostCreateStateError) {
-            return Center(child: Text('Error: ${state.errorMessage}'));
-          }
-          return const Text('No Error');
-        },
-      );
+      Widget errorWidget =
+          BlocBuilder<BlogPostCreateCubit, BlogPostCreateState>(
+            builder: (context, state) {
+              if (state.errorMessage != null) {
+                return Center(child: Text('Error: ${state.errorMessage}'));
+              }
+              return const Text('No Error');
+            },
+          );
 
       // Act
       await tester.pumpWidget(createTestWidget(errorWidget));
@@ -319,7 +373,6 @@ void main() {
         title: fullCreateFixture['title'] as String?,
         videoUrl: null,
         description: fullCreateFixture['description_md'] as String?,
-        image: null,
       );
       await tester.pump();
       await tester.pump(); // Need to pump twice to get the error state
@@ -328,16 +381,21 @@ void main() {
       expect(find.textContaining('Error:'), findsOneWidget);
     });
 
-    testWidgets('should handle success state after blog post creation', (WidgetTester tester) async {
+    testWidgets('should handle success state after blog post creation', (
+      WidgetTester tester,
+    ) async {
       // Arrange
-      Widget successWidget = BlocBuilder<BlogPostCreateCubit, BlogPostCreateState>(
-        builder: (context, state) {
-          if (state is BlogPostCreateStateLoaded) {
-            return const Center(child: Text('Blog post created successfully!'));
-          }
-          return const Text('Not Loaded');
-        },
-      );
+      Widget successWidget =
+          BlocBuilder<BlogPostCreateCubit, BlogPostCreateState>(
+            builder: (context, state) {
+              if (state.isSuccess) {
+                return const Center(
+                  child: Text('Blog post created successfully!'),
+                );
+              }
+              return const Text('Not Loaded');
+            },
+          );
 
       // Act
       await tester.pumpWidget(createTestWidget(successWidget));
@@ -348,7 +406,6 @@ void main() {
         title: fullCreateFixture['title'] as String?,
         videoUrl: null,
         description: fullCreateFixture['description_md'] as String?,
-        image: null,
       );
       await tester.pump();
       await tester.pump(); // Need to pump twice to get the success state
@@ -357,23 +414,35 @@ void main() {
       expect(find.text('Blog post created successfully!'), findsOneWidget);
     });
 
-    testWidgets('should validate form fields before submission', (WidgetTester tester) async {
+    testWidgets('should validate form fields before submission', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       Widget validationWidget = Column(
         children: [
           TextFormField(
             key: AppKeys.blogPostCreateScreenTitleTextField,
-            decoration: const InputDecoration(labelText: 'Заголовок', errorText: 'Заголовок не может быть пустым'),
+            decoration: const InputDecoration(
+              labelText: 'Заголовок',
+              errorText: 'Заголовок не может быть пустым',
+            ),
           ),
           const SizedBox(height: 16),
           TextFormField(
             key: AppKeys.blogPostCreateScreenContentTextField,
-            decoration: const InputDecoration(labelText: 'Описание', errorText: 'Описание не может быть пустым'),
+            decoration: const InputDecoration(
+              labelText: 'Описание',
+              errorText: 'Описание не может быть пустым',
+            ),
             maxLines: 6,
             minLines: 4,
           ),
           const SizedBox(height: 16),
-          ElevatedButton(key: AppKeys.blogPostCreateScreenCreateButton, onPressed: () {}, child: const Text('Опубликовать')),
+          ElevatedButton(
+            key: AppKeys.blogPostCreateScreenCreateButton,
+            onPressed: () {},
+            child: const Text('Опубликовать'),
+          ),
         ],
       );
 
@@ -386,7 +455,9 @@ void main() {
       expect(find.text('Описание не может быть пустым'), findsOneWidget);
     });
 
-    testWidgets('should handle image picker interaction', (WidgetTester tester) async {
+    testWidgets('should handle image picker interaction', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       bool imagePickerCalled = false;
       Widget imagePickerWidget = GestureDetector(
@@ -425,16 +496,25 @@ void main() {
       expect(imagePickerCalled, isTrue);
     });
 
-    testWidgets('should handle video URL validation', (WidgetTester tester) async {
+    testWidgets('should handle video URL validation', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       Widget videoValidationWidget = Column(
         children: [
           TextFormField(
             key: AppKeys.blogPostCreateScreenVideoLinkTextField,
-            decoration: const InputDecoration(labelText: 'Ссылка на видео', errorText: 'Введите корректную ссылку на видео'),
+            decoration: const InputDecoration(
+              labelText: 'Ссылка на видео',
+              errorText: 'Введите корректную ссылку на видео',
+            ),
           ),
           const SizedBox(height: 16),
-          ElevatedButton(key: AppKeys.blogPostCreateScreenCreateButton, onPressed: () {}, child: const Text('Опубликовать')),
+          ElevatedButton(
+            key: AppKeys.blogPostCreateScreenCreateButton,
+            onPressed: () {},
+            child: const Text('Опубликовать'),
+          ),
         ],
       );
 
@@ -446,7 +526,9 @@ void main() {
       expect(find.text('Введите корректную ссылку на видео'), findsOneWidget);
     });
 
-    testWidgets('should handle form submission with empty fields', (WidgetTester tester) async {
+    testWidgets('should handle form submission with empty fields', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       Widget emptyFormWidget = Column(
         children: [
@@ -465,7 +547,11 @@ void main() {
           ElevatedButton(
             key: AppKeys.blogPostCreateScreenCreateButton,
             onPressed: () async {
-              await blogPostCreateCubit.createBlogPost(title: '', videoUrl: '', description: '', image: null);
+              await blogPostCreateCubit.createBlogPost(
+                title: '',
+                videoUrl: '',
+                description: '',
+              );
             },
             child: const Text('Опубликовать'),
           ),
@@ -479,14 +565,14 @@ void main() {
       await tester.tap(find.byKey(AppKeys.blogPostCreateScreenCreateButton));
       await tester.pump();
 
-      // Assert
-      expect(
-        blogPostRepository.createPayloads.single.toJson(),
-        {'title': '', 'description_md': '', 'video_url': '', 'image_name': null},
-      );
+      // Assert — invalid empty payload must not reach the repository
+      expect(blogPostRepository.createPayloads, isEmpty);
+      expect(blogPostCreateCubit.state.hasValidationErrors, isTrue);
     });
 
-    testWidgets('should handle blog post creation with long content', (WidgetTester tester) async {
+    testWidgets('should handle blog post creation with long content', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       const longContent =
           'Это очень длинное описание блог поста, которое содержит много текста и должно быть правильно обработано системой. '
@@ -510,7 +596,11 @@ void main() {
           ElevatedButton(
             key: AppKeys.blogPostCreateScreenCreateButton,
             onPressed: () async {
-              await blogPostCreateCubit.createBlogPost(title: 'Test Title', videoUrl: null, description: longContent, image: null);
+              await blogPostCreateCubit.createBlogPost(
+                title: 'Test Title',
+                videoUrl: null,
+                description: longContent,
+              );
             },
             child: const Text('Опубликовать'),
           ),
@@ -521,23 +611,26 @@ void main() {
       await tester.pumpWidget(createTestWidget(longContentWidget));
       await tester.pumpAndSettle();
 
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenTitleTextField), 'Test Title');
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenContentTextField), longContent);
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+        'Test Title',
+      );
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenContentTextField),
+        longContent,
+      );
       await tester.pump();
 
       await tester.tap(find.byKey(AppKeys.blogPostCreateScreenCreateButton));
       await tester.pump();
 
       // Assert
-      expect(
-        blogPostRepository.createPayloads.single.toJson(),
-        {
-          'title': 'Test Title',
-          'description_md': longContent,
-          'video_url': null,
-          'image_name': null,
-        },
-      );
+      expect(blogPostRepository.createPayloads.single.toJson(), {
+        'title': 'Test Title',
+        'description_md': longContent,
+        'video_url': null,
+        'image_name': null,
+      });
     });
   });
 }
diff --git a/test/features/blog_post_create/basic_widget_test.dart b/test/features/blog_post_create/basic_widget_test.dart
index 1e91998f..3cd4aa38 100644
--- a/test/features/blog_post_create/basic_widget_test.dart
+++ b/test/features/blog_post_create/basic_widget_test.dart
@@ -14,7 +14,9 @@ void main() {
 
     setUp(() {
       blogPostRepository = FixtureBlogPostRepository();
-      blogPostCreateCubit = BlogPostCreateCubit(blogPostRepository: blogPostRepository);
+      blogPostCreateCubit = BlogPostCreateCubit(
+        blogPostRepository: blogPostRepository,
+      );
     });
 
     tearDown(() {
@@ -31,7 +33,9 @@ void main() {
       );
     }
 
-    testWidgets('should create BlogPostCreateCubit successfully', (WidgetTester tester) async {
+    testWidgets('should create BlogPostCreateCubit successfully', (
+      WidgetTester tester,
+    ) async {
       // Arrange & Act
       final cubit = BlogPostCreateCubit(blogPostRepository: blogPostRepository);
 
@@ -41,13 +45,18 @@ void main() {
       cubit.close();
     });
 
-    testWidgets('should display basic blog post form fields', (WidgetTester tester) async {
+    testWidgets('should display basic blog post form fields', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       Widget formWidget = Column(
         children: [
           TextFormField(
             key: AppKeys.blogPostCreateScreenTitleTextField,
-            decoration: const InputDecoration(labelText: 'Заголовок', hintText: 'Введите заголовок поста'),
+            decoration: const InputDecoration(
+              labelText: 'Заголовок',
+              hintText: 'Введите заголовок поста',
+            ),
           ),
           const SizedBox(height: 16),
           TextFormField(
@@ -62,7 +71,11 @@ void main() {
             decoration: const InputDecoration(labelText: 'Ссылка на видео'),
           ),
           const SizedBox(height: 16),
-          ElevatedButton(key: AppKeys.blogPostCreateScreenCreateButton, onPressed: () {}, child: const Text('Опубликовать')),
+          ElevatedButton(
+            key: AppKeys.blogPostCreateScreenCreateButton,
+            onPressed: () {},
+            child: const Text('Опубликовать'),
+          ),
         ],
       );
 
@@ -71,17 +84,34 @@ void main() {
       await tester.pumpAndSettle();
 
       // Assert
-      expect(find.byKey(AppKeys.blogPostCreateScreenTitleTextField), findsOneWidget);
-      expect(find.byKey(AppKeys.blogPostCreateScreenContentTextField), findsOneWidget);
-      expect(find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField), findsOneWidget);
-      expect(find.byKey(AppKeys.blogPostCreateScreenCreateButton), findsOneWidget);
+      expect(
+        find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+        findsOneWidget,
+      );
+      expect(
+        find.byKey(AppKeys.blogPostCreateScreenContentTextField),
+        findsOneWidget,
+      );
+      expect(
+        find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField),
+        findsOneWidget,
+      );
+      expect(
+        find.byKey(AppKeys.blogPostCreateScreenCreateButton),
+        findsOneWidget,
+      );
     });
 
-    testWidgets('should update title when user types in title field', (WidgetTester tester) async {
+    testWidgets('should update title when user types in title field', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       Widget formWidget = TextFormField(
         key: AppKeys.blogPostCreateScreenTitleTextField,
-        decoration: const InputDecoration(labelText: 'Заголовок', hintText: 'Введите заголовок поста'),
+        decoration: const InputDecoration(
+          labelText: 'Заголовок',
+          hintText: 'Введите заголовок поста',
+        ),
       );
 
       await tester.pumpWidget(createTestWidget(formWidget));
@@ -90,36 +120,47 @@ void main() {
       const testTitle = 'Тестовый заголовок поста';
 
       // Act
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenTitleTextField), testTitle);
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+        testTitle,
+      );
       await tester.pump();
 
       // Assert
       expect(find.text(testTitle), findsOneWidget);
     });
 
-    testWidgets('should update description when user types in description field', (WidgetTester tester) async {
-      // Arrange
-      Widget formWidget = TextFormField(
-        key: AppKeys.blogPostCreateScreenContentTextField,
-        decoration: const InputDecoration(labelText: 'Описание'),
-        maxLines: 6,
-        minLines: 4,
-      );
+    testWidgets(
+      'should update description when user types in description field',
+      (WidgetTester tester) async {
+        // Arrange
+        Widget formWidget = TextFormField(
+          key: AppKeys.blogPostCreateScreenContentTextField,
+          decoration: const InputDecoration(labelText: 'Описание'),
+          maxLines: 6,
+          minLines: 4,
+        );
 
-      await tester.pumpWidget(createTestWidget(formWidget));
-      await tester.pumpAndSettle();
+        await tester.pumpWidget(createTestWidget(formWidget));
+        await tester.pumpAndSettle();
 
-      const testDescription = 'Это тестовое описание блог поста';
+        const testDescription = 'Это тестовое описание блог поста';
 
-      // Act
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenContentTextField), testDescription);
-      await tester.pump();
+        // Act
+        await tester.enterText(
+          find.byKey(AppKeys.blogPostCreateScreenContentTextField),
+          testDescription,
+        );
+        await tester.pump();
 
-      // Assert
-      expect(find.text(testDescription), findsOneWidget);
-    });
+        // Assert
+        expect(find.text(testDescription), findsOneWidget);
+      },
+    );
 
-    testWidgets('should update video URL when user types in video field', (WidgetTester tester) async {
+    testWidgets('should update video URL when user types in video field', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       Widget formWidget = TextFormField(
         key: AppKeys.blogPostCreateScreenVideoLinkTextField,
@@ -132,16 +173,27 @@ void main() {
       const testVideoUrl = 'https://youtube.com/watch?v=example';
 
       // Act
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField), testVideoUrl);
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField),
+        testVideoUrl,
+      );
       await tester.pump();
 
       // Assert
       expect(find.text(testVideoUrl), findsOneWidget);
     });
 
-    testWidgets('should display form labels correctly', (WidgetTester tester) async {
+    testWidgets('should display form labels correctly', (
+      WidgetTester tester,
+    ) async {
       // Arrange
-      Widget formWidget = const Column(children: [Text('Заголовок'), Text('Описание'), Text('Ссылка на видео')]);
+      Widget formWidget = const Column(
+        children: [
+          Text('Заголовок'),
+          Text('Описание'),
+          Text('Ссылка на видео'),
+        ],
+      );
 
       // Act
       await tester.pumpWidget(createTestWidget(formWidget));
@@ -153,11 +205,16 @@ void main() {
       expect(find.text('Ссылка на видео'), findsOneWidget);
     });
 
-    testWidgets('should display placeholder text in title field', (WidgetTester tester) async {
+    testWidgets('should display placeholder text in title field', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       Widget formWidget = TextFormField(
         key: AppKeys.blogPostCreateScreenTitleTextField,
-        decoration: const InputDecoration(labelText: 'Заголовок', hintText: 'Введите заголовок поста'),
+        decoration: const InputDecoration(
+          labelText: 'Заголовок',
+          hintText: 'Введите заголовок поста',
+        ),
       );
 
       // Act
@@ -170,14 +227,21 @@ void main() {
 
     testWidgets('should display create button', (WidgetTester tester) async {
       // Arrange
-      Widget formWidget = ElevatedButton(key: AppKeys.blogPostCreateScreenCreateButton, onPressed: () {}, child: const Text('Опубликовать'));
+      Widget formWidget = ElevatedButton(
+        key: AppKeys.blogPostCreateScreenCreateButton,
+        onPressed: () {},
+        child: const Text('Опубликовать'),
+      );
 
       // Act
       await tester.pumpWidget(createTestWidget(formWidget));
       await tester.pumpAndSettle();
 
       // Assert
-      expect(find.byKey(AppKeys.blogPostCreateScreenCreateButton), findsOneWidget);
+      expect(
+        find.byKey(AppKeys.blogPostCreateScreenCreateButton),
+        findsOneWidget,
+      );
       expect(find.text('Опубликовать'), findsOneWidget);
     });
 
@@ -217,19 +281,26 @@ void main() {
 
     testWidgets('should display error message', (WidgetTester tester) async {
       // Arrange
-      Widget errorWidget = const Center(child: Text('Произошла ошибка при создании блог поста'));
+      Widget errorWidget = const Center(
+        child: Text('Произошла ошибка при создании блог поста'),
+      );
 
       // Act
       await tester.pumpWidget(createTestWidget(errorWidget));
       await tester.pumpAndSettle();
 
       // Assert
-      expect(find.text('Произошла ошибка при создании блог поста'), findsOneWidget);
+      expect(
+        find.text('Произошла ошибка при создании блог поста'),
+        findsOneWidget,
+      );
     });
 
     testWidgets('should display success message', (WidgetTester tester) async {
       // Arrange
-      Widget successWidget = const Center(child: Text('Блог пост успешно создан!'));
+      Widget successWidget = const Center(
+        child: Text('Блог пост успешно создан!'),
+      );
 
       // Act
       await tester.pumpWidget(createTestWidget(successWidget));
@@ -245,12 +316,18 @@ void main() {
         children: [
           TextFormField(
             key: AppKeys.blogPostCreateScreenTitleTextField,
-            decoration: const InputDecoration(labelText: 'Заголовок', errorText: 'Заголовок обязателен'),
+            decoration: const InputDecoration(
+              labelText: 'Заголовок',
+              errorText: 'Заголовок обязателен',
+            ),
           ),
           const SizedBox(height: 16),
           TextFormField(
             key: AppKeys.blogPostCreateScreenContentTextField,
-            decoration: const InputDecoration(labelText: 'Описание', errorText: 'Описание обязательно'),
+            decoration: const InputDecoration(
+              labelText: 'Описание',
+              errorText: 'Описание обязательно',
+            ),
           ),
         ],
       );
@@ -264,13 +341,18 @@ void main() {
       expect(find.text('Описание обязательно'), findsOneWidget);
     });
 
-    testWidgets('should display form with all required fields', (WidgetTester tester) async {
+    testWidgets('should display form with all required fields', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       Widget completeForm = Column(
         children: [
           TextFormField(
             key: AppKeys.blogPostCreateScreenTitleTextField,
-            decoration: const InputDecoration(labelText: 'Заголовок', hintText: 'Введите заголовок поста'),
+            decoration: const InputDecoration(
+              labelText: 'Заголовок',
+              hintText: 'Введите заголовок поста',
+            ),
           ),
           const SizedBox(height: 16),
           TextFormField(
@@ -285,7 +367,11 @@ void main() {
             decoration: const InputDecoration(labelText: 'Ссылка на видео'),
           ),
           const SizedBox(height: 32),
-          ElevatedButton(key: AppKeys.blogPostCreateScreenCreateButton, onPressed: () {}, child: const Text('Опубликовать')),
+          ElevatedButton(
+            key: AppKeys.blogPostCreateScreenCreateButton,
+            onPressed: () {},
+            child: const Text('Опубликовать'),
+          ),
         ],
       );
 
@@ -294,13 +380,27 @@ void main() {
       await tester.pumpAndSettle();
 
       // Assert
-      expect(find.byKey(AppKeys.blogPostCreateScreenTitleTextField), findsOneWidget);
-      expect(find.byKey(AppKeys.blogPostCreateScreenContentTextField), findsOneWidget);
-      expect(find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField), findsOneWidget);
-      expect(find.byKey(AppKeys.blogPostCreateScreenCreateButton), findsOneWidget);
+      expect(
+        find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+        findsOneWidget,
+      );
+      expect(
+        find.byKey(AppKeys.blogPostCreateScreenContentTextField),
+        findsOneWidget,
+      );
+      expect(
+        find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField),
+        findsOneWidget,
+      );
+      expect(
+        find.byKey(AppKeys.blogPostCreateScreenCreateButton),
+        findsOneWidget,
+      );
     });
 
-    testWidgets('should display image upload widget', (WidgetTester tester) async {
+    testWidgets('should display image upload widget', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       Widget imageWidget = GestureDetector(
         key: AppKeys.imageWidget,
@@ -373,68 +473,101 @@ void main() {
       expect(imageUploadTapped, isTrue);
     });
 
-    testWidgets('should display blog post creation form with image and video options', (WidgetTester tester) async {
-      // Arrange
-      Widget completeForm = Column(
-        children: [
-          const Text('Заголовок'),
-          const SizedBox(height: 8),
-          TextFormField(
-            key: AppKeys.blogPostCreateScreenTitleTextField,
-            decoration: const InputDecoration(hintText: 'Введите заголовок поста'),
-          ),
-          const SizedBox(height: 16),
-          const Text('Описание'),
-          const SizedBox(height: 8),
-          TextFormField(key: AppKeys.blogPostCreateScreenContentTextField, decoration: const InputDecoration(), maxLines: 6, minLines: 4),
-          const SizedBox(height: 16),
-          const Text('Изображение поста'),
-          const SizedBox(height: 8),
-          GestureDetector(
-            key: AppKeys.imageWidget,
-            onTap: () {},
-            child: Container(
-              height: 200,
-              width: double.infinity,
-              decoration: BoxDecoration(
-                border: Border.all(color: Colors.grey),
-                borderRadius: BorderRadius.circular(8),
+    testWidgets(
+      'should display blog post creation form with image and video options',
+      (WidgetTester tester) async {
+        // Arrange
+        Widget completeForm = Column(
+          children: [
+            const Text('Заголовок'),
+            const SizedBox(height: 8),
+            TextFormField(
+              key: AppKeys.blogPostCreateScreenTitleTextField,
+              decoration: const InputDecoration(
+                hintText: 'Введите заголовок поста',
               ),
-              child: const Center(
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Icon(Icons.add_photo_alternate, size: 48, color: Colors.grey),
-                    SizedBox(height: 8),
-                    Text('Добавить изображение'),
-                  ],
+            ),
+            const SizedBox(height: 16),
+            const Text('Описание'),
+            const SizedBox(height: 8),
+            TextFormField(
+              key: AppKeys.blogPostCreateScreenContentTextField,
+              decoration: const InputDecoration(),
+              maxLines: 6,
+              minLines: 4,
+            ),
+            const SizedBox(height: 16),
+            const Text('Изображение поста'),
+            const SizedBox(height: 8),
+            GestureDetector(
+              key: AppKeys.imageWidget,
+              onTap: () {},
+              child: Container(
+                height: 200,
+                width: double.infinity,
+                decoration: BoxDecoration(
+                  border: Border.all(color: Colors.grey),
+                  borderRadius: BorderRadius.circular(8),
+                ),
+                child: const Center(
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      Icon(
+                        Icons.add_photo_alternate,
+                        size: 48,
+                        color: Colors.grey,
+                      ),
+                      SizedBox(height: 8),
+                      Text('Добавить изображение'),
+                    ],
+                  ),
                 ),
               ),
             ),
-          ),
-          const SizedBox(height: 16),
-          const Text('Ссылка на видео'),
-          const SizedBox(height: 8),
-          TextFormField(key: AppKeys.blogPostCreateScreenVideoLinkTextField, decoration: const InputDecoration()),
-          const SizedBox(height: 32),
-          ElevatedButton(key: AppKeys.blogPostCreateScreenCreateButton, onPressed: () {}, child: const Text('Опубликовать')),
-        ],
-      );
+            const SizedBox(height: 16),
+            const Text('Ссылка на видео'),
+            const SizedBox(height: 8),
+            TextFormField(
+              key: AppKeys.blogPostCreateScreenVideoLinkTextField,
+              decoration: const InputDecoration(),
+            ),
+            const SizedBox(height: 32),
+            ElevatedButton(
+              key: AppKeys.blogPostCreateScreenCreateButton,
+              onPressed: () {},
+              child: const Text('Опубликовать'),
+            ),
+          ],
+        );
 
-      // Act
-      await tester.pumpWidget(createTestWidget(completeForm));
-      await tester.pumpAndSettle();
+        // Act
+        await tester.pumpWidget(createTestWidget(completeForm));
+        await tester.pumpAndSettle();
 
-      // Assert
-      expect(find.text('Заголовок'), findsOneWidget);
-      expect(find.text('Описание'), findsOneWidget);
-      expect(find.text('Изображение поста'), findsOneWidget);
-      expect(find.text('Ссылка на видео'), findsOneWidget);
-      expect(find.byKey(AppKeys.blogPostCreateScreenTitleTextField), findsOneWidget);
-      expect(find.byKey(AppKeys.blogPostCreateScreenContentTextField), findsOneWidget);
-      expect(find.byKey(AppKeys.imageWidget), findsOneWidget);
-      expect(find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField), findsOneWidget);
-      expect(find.byKey(AppKeys.blogPostCreateScreenCreateButton), findsOneWidget);
-    });
+        // Assert
+        expect(find.text('Заголовок'), findsOneWidget);
+        expect(find.text('Описание'), findsOneWidget);
+        expect(find.text('Изображение поста'), findsOneWidget);
+        expect(find.text('Ссылка на видео'), findsOneWidget);
+        expect(
+          find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+          findsOneWidget,
+        );
+        expect(
+          find.byKey(AppKeys.blogPostCreateScreenContentTextField),
+          findsOneWidget,
+        );
+        expect(find.byKey(AppKeys.imageWidget), findsOneWidget);
+        expect(
+          find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField),
+          findsOneWidget,
+        );
+        expect(
+          find.byKey(AppKeys.blogPostCreateScreenCreateButton),
+          findsOneWidget,
+        );
+      },
+    );
   });
 }
diff --git a/test/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit_test.dart b/test/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit_test.dart
index 63699ebc..ef66ebd7 100644
--- a/test/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit_test.dart
+++ b/test/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit_test.dart
@@ -1,6 +1,8 @@
 import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit.dart';
 import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_state.dart';
 import 'package:eatvio_app/features/blog_post_create/repositories/blog_post_repository.dart';
+import 'package:eatvio_app/features/blog_post_create/validation/blog_post_form_validator.dart';
+import 'package:flutter_image_compress/flutter_image_compress.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
 
@@ -14,6 +16,8 @@ void main() {
     setUp(() {
       mockRepository = MockBlogPostRepository();
       cubit = BlogPostCreateCubit(blogPostRepository: mockRepository);
+      registerFallbackValue(<XFile>[]);
+      registerFallbackValue(<int>[]);
     });
 
     tearDown(() {
@@ -21,63 +25,246 @@ void main() {
     });
 
     test('начальное состояние - BlogPostCreateState', () {
-      expect(cubit.state, isA<BlogPostCreateState>());
+      expect(cubit.state, const BlogPostCreateState());
     });
 
-    test('createBlogPost - успешное создание', () async {
-      when(() => mockRepository.createBlogPost(any(), any(), any(), any()))
-          .thenAnswer((_) async => {});
+    test('validateForm - пустая форма заполняет formError', () {
+      final isValid = cubit.validateForm(
+        title: '',
+        description: '',
+        videoUrl: '',
+        imageCount: 0,
+      );
 
-      final result = await cubit.createBlogPost();
+      expect(isValid, false);
+      expect(cubit.state.formError, BlogPostFormValidator.contentRequired);
+      verifyNever(
+        () => mockRepository.createBlogPost(
+          title: any(named: 'title'),
+          videoUrl: any(named: 'videoUrl'),
+          description: any(named: 'description'),
+          images: any(named: 'images'),
+        ),
+      );
+    });
+
+    test('validateForm - невалидное видео заполняет videoUrlError', () {
+      final isValid = cubit.validateForm(
+        title: 'Valid title',
+        description: '',
+        videoUrl: 'https://youtube.com/watch?v=abc',
+        imageCount: 0,
+      );
+
+      expect(isValid, false);
+      expect(
+        cubit.state.videoUrlError,
+        BlogPostFormValidator.videoUrlUnsupportedHost,
+      );
+      expect(cubit.state.formError, isNull);
+    });
+
+    test(
+      'createBlogPost - не вызывает репозиторий при ошибке валидации',
+      () async {
+        final result = await cubit.createBlogPost();
+
+        expect(result, false);
+        expect(cubit.state.hasValidationErrors, true);
+        verifyNever(
+          () => mockRepository.createBlogPost(
+            title: any(named: 'title'),
+            videoUrl: any(named: 'videoUrl'),
+            description: any(named: 'description'),
+            images: any(named: 'images'),
+          ),
+        );
+      },
+    );
+
+    test('createBlogPost - успешное создание', () async {
+      when(
+        () => mockRepository.createBlogPost(
+          title: any(named: 'title'),
+          videoUrl: any(named: 'videoUrl'),
+          description: any(named: 'description'),
+          images: any(named: 'images'),
+        ),
+      ).thenAnswer((_) async => {});
+
+      final result = await cubit.createBlogPost(
+        title: 'Test Title',
+        description: 'Test Description',
+      );
 
       expect(result, true);
-      expect(cubit.state, isA<BlogPostCreateStateLoaded>());
-      verify(() => mockRepository.createBlogPost(null, null, null, null)).called(1);
+      expect(cubit.state.isSuccess, true);
+      verify(
+        () => mockRepository.createBlogPost(
+          title: 'Test Title',
+          videoUrl: null,
+          description: 'Test Description',
+          images: const [],
+        ),
+      ).called(1);
     });
 
     test('createBlogPost - обработка ошибки', () async {
-      when(() => mockRepository.createBlogPost(any(), any(), any(), any()))
-          .thenThrow(Exception('Error'));
+      when(
+        () => mockRepository.createBlogPost(
+          title: any(named: 'title'),
+          videoUrl: any(named: 'videoUrl'),
+          description: any(named: 'description'),
+          images: any(named: 'images'),
+        ),
+      ).thenThrow(Exception('Error'));
 
-      final result = await cubit.createBlogPost();
+      final result = await cubit.createBlogPost(
+        title: 'Test Title',
+        description: 'Test Description',
+      );
 
       expect(result, false);
-      expect(cubit.state, isA<BlogPostCreateStateError>());
-      final errorState = cubit.state as BlogPostCreateStateError;
-      expect(errorState.errorMessage, contains('Error'));
+      expect(cubit.state.errorMessage, contains('Error'));
+      expect(cubit.state.isSuccess, false);
     });
 
+    test(
+      'updateBlogPost - не вызывает репозиторий при ошибке валидации',
+      () async {
+        final result = await cubit.updateBlogPost(id: 1);
+
+        expect(result, false);
+        expect(cubit.state.hasValidationErrors, true);
+        expect(cubit.state.formError, BlogPostFormValidator.contentRequired);
+        verifyNever(
+          () => mockRepository.updateBlogPost(
+            id: any(named: 'id'),
+            title: any(named: 'title'),
+            videoUrl: any(named: 'videoUrl'),
+            description: any(named: 'description'),
+            existingMediaIds: any(named: 'existingMediaIds'),
+            newImages: any(named: 'newImages'),
+            mediaIdsToDelete: any(named: 'mediaIdsToDelete'),
+          ),
+        );
+      },
+    );
+
+    test('updateBlogPost - невалидное видео не уходит в репозиторий', () async {
+      final result = await cubit.updateBlogPost(
+        id: 1,
+        title: 'Valid title',
+        videoUrl: 'https://youtube.com/watch?v=abc',
+        existingMediaIds: const [10],
+      );
+
+      expect(result, false);
+      expect(
+        cubit.state.videoUrlError,
+        BlogPostFormValidator.videoUrlUnsupportedHost,
+      );
+      verifyNever(
+        () => mockRepository.updateBlogPost(
+          id: any(named: 'id'),
+          title: any(named: 'title'),
+          videoUrl: any(named: 'videoUrl'),
+          description: any(named: 'description'),
+          existingMediaIds: any(named: 'existingMediaIds'),
+          newImages: any(named: 'newImages'),
+          mediaIdsToDelete: any(named: 'mediaIdsToDelete'),
+        ),
+      );
+    });
+
+    test(
+      'updateBlogPost - короткий заголовок не уходит в репозиторий',
+      () async {
+        final result = await cubit.updateBlogPost(
+          id: 1,
+          title: 'ab',
+          existingMediaIds: const [10],
+        );
+
+        expect(result, false);
+        expect(cubit.state.titleError, BlogPostFormValidator.titleTooShort);
+        verifyNever(
+          () => mockRepository.updateBlogPost(
+            id: any(named: 'id'),
+            title: any(named: 'title'),
+            videoUrl: any(named: 'videoUrl'),
+            description: any(named: 'description'),
+            existingMediaIds: any(named: 'existingMediaIds'),
+            newImages: any(named: 'newImages'),
+            mediaIdsToDelete: any(named: 'mediaIdsToDelete'),
+          ),
+        );
+      },
+    );
+
     test('updateBlogPost - успешное обновление', () async {
       const id = 1;
       const title = 'Updated Title';
 
-      when(() => mockRepository.updateBlogPost(any(), any(), any(), any(), any(), any()))
-          .thenAnswer((_) async => {});
+      when(
+        () => mockRepository.updateBlogPost(
+          id: any(named: 'id'),
+          title: any(named: 'title'),
+          videoUrl: any(named: 'videoUrl'),
+          description: any(named: 'description'),
+          existingMediaIds: any(named: 'existingMediaIds'),
+          newImages: any(named: 'newImages'),
+          mediaIdsToDelete: any(named: 'mediaIdsToDelete'),
+        ),
+      ).thenAnswer((_) async => {});
 
-      final result = await cubit.updateBlogPost(id: id, title: title);
+      final result = await cubit.updateBlogPost(
+        id: id,
+        title: title,
+        existingMediaIds: [2, 1],
+        mediaIdsToDelete: [9],
+      );
 
       expect(result, true);
-      expect(cubit.state, isA<BlogPostCreateStateLoaded>());
-      verify(() => mockRepository.updateBlogPost(id, title, null, null, null, null)).called(1);
+      expect(cubit.state.isSuccess, true);
+      verify(
+        () => mockRepository.updateBlogPost(
+          id: id,
+          title: title,
+          videoUrl: '',
+          description: '',
+          existingMediaIds: [2, 1],
+          newImages: const [],
+          mediaIdsToDelete: [9],
+        ),
+      ).called(1);
     });
 
     test('updateBlogPost - обработка ошибки', () async {
       const id = 1;
 
-      when(() => mockRepository.updateBlogPost(any(), any(), any(), any(), any(), any()))
-          .thenThrow(Exception('Error'));
+      when(
+        () => mockRepository.updateBlogPost(
+          id: any(named: 'id'),
+          title: any(named: 'title'),
+          videoUrl: any(named: 'videoUrl'),
+          description: any(named: 'description'),
+          existingMediaIds: any(named: 'existingMediaIds'),
+          newImages: any(named: 'newImages'),
+          mediaIdsToDelete: any(named: 'mediaIdsToDelete'),
+        ),
+      ).thenThrow(Exception('Error'));
 
-      final result = await cubit.updateBlogPost(id: id);
+      final result = await cubit.updateBlogPost(id: id, title: 'Valid title');
 
       expect(result, false);
-      expect(cubit.state, isA<BlogPostCreateStateError>());
+      expect(cubit.state.errorMessage, contains('Error'));
     });
 
     test('deleteBlogPost - успешное удаление', () async {
       const id = 1;
 
-      when(() => mockRepository.deleteBlogPost(id))
-          .thenAnswer((_) async => {});
+      when(() => mockRepository.deleteBlogPost(id)).thenAnswer((_) async => {});
 
       final result = await cubit.deleteBlogPost(id);
 
@@ -88,13 +275,27 @@ void main() {
     test('deleteBlogPost - обработка ошибки', () async {
       const id = 1;
 
-      when(() => mockRepository.deleteBlogPost(id))
-          .thenThrow(Exception('Error'));
+      when(
+        () => mockRepository.deleteBlogPost(id),
+      ).thenThrow(Exception('Error'));
 
       final result = await cubit.deleteBlogPost(id);
 
       expect(result, false);
     });
+
+    test('clearTitleError очищает titleError и formError', () {
+      cubit.validateForm(
+        title: '',
+        description: '',
+        videoUrl: '',
+        imageCount: 0,
+      );
+      expect(cubit.state.formError, isNotNull);
+
+      cubit.clearTitleError();
+
+      expect(cubit.state.formError, isNull);
+    });
   });
 }
-
diff --git a/test/features/blog_post_create/integration_widget_test.dart b/test/features/blog_post_create/integration_widget_test.dart
index d4fd63f8..1eaad104 100644
--- a/test/features/blog_post_create/integration_widget_test.dart
+++ b/test/features/blog_post_create/integration_widget_test.dart
@@ -21,10 +21,16 @@ void main() {
 
     setUp(() {
       blogPostRepository = FixtureBlogPostRepository();
-      blogPostCreateCubit = BlogPostCreateCubit(blogPostRepository: blogPostRepository);
+      blogPostCreateCubit = BlogPostCreateCubit(
+        blogPostRepository: blogPostRepository,
+      );
       feedProbe = FeedReloadProbe();
-      fullCreateFixture = FixtureReader.readAsMap('blog_post_create/create_request_full.json');
-      updateFixture = FixtureReader.readAsMap('blog_post_create/update_request.json');
+      fullCreateFixture = FixtureReader.readAsMap(
+        'blog_post_create/create_request_full.json',
+      );
+      updateFixture = FixtureReader.readAsMap(
+        'blog_post_create/update_request.json',
+      );
     });
 
     tearDown(() {
@@ -41,11 +47,14 @@ void main() {
       );
     }
 
-    testWidgets('should complete full blog post creation flow', (WidgetTester tester) async {
+    testWidgets('should complete full blog post creation flow', (
+      WidgetTester tester,
+    ) async {
       // Arrange
-      Widget fullFlowWidget = BlocListener<BlogPostCreateCubit, BlogPostCreateState>(
+      Widget
+      fullFlowWidget = BlocListener<BlogPostCreateCubit, BlogPostCreateState>(
         listener: (context, state) {
-          if (state is BlogPostCreateStateLoaded) {
+          if (state.isSuccess) {
             feedProbe.loadFeedBlogPostList();
           }
         },
@@ -82,7 +91,11 @@ void main() {
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
-                      Icon(Icons.add_photo_alternate, size: 48, color: Colors.grey),
+                      Icon(
+                        Icons.add_photo_alternate,
+                        size: 48,
+                        color: Colors.grey,
+                      ),
                       SizedBox(height: 8),
                       Text('Добавить изображение'),
                     ],
@@ -98,7 +111,6 @@ void main() {
                   title: fullCreateFixture['title'] as String?,
                   videoUrl: fullCreateFixture['video_url'] as String?,
                   description: fullCreateFixture['description_md'] as String?,
-                  image: null,
                 );
               },
               child: const Text('Опубликовать'),
@@ -111,27 +123,46 @@ void main() {
       await tester.pumpWidget(createTestWidget(fullFlowWidget));
       await tester.pumpAndSettle();
 
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenTitleTextField), fullCreateFixture['title'] as String);
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenContentTextField), fullCreateFixture['description_md'] as String);
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField), fullCreateFixture['video_url'] as String);
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+        fullCreateFixture['title'] as String,
+      );
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenContentTextField),
+        fullCreateFixture['description_md'] as String,
+      );
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField),
+        fullCreateFixture['video_url'] as String,
+      );
       await tester.pump();
 
       await tester.tap(find.byKey(AppKeys.blogPostCreateScreenCreateButton));
       await tester.pump();
 
       // Assert
-      expect(blogPostRepository.createPayloads.single.toJson(), fullCreateFixture);
+      expect(
+        blogPostRepository.createPayloads.single.toJson(),
+        fullCreateFixture,
+      );
       expect(feedProbe.loadRequests, 1);
     });
 
-    testWidgets('should handle blog post update flow', (WidgetTester tester) async {
+    testWidgets('should handle blog post update flow', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       final existingBlogPost = FeedBlogPostModel(
         id: 1,
         state: 'published',
         image: 'original_image.jpg',
         description: 'Original Description',
-        author: const Author(authorSlug: 'test-author', authorName: 'Test Author', authorProfileIcon: 'avatar.jpg', authorIsMe: true),
+        author: const Author(
+          authorSlug: 'test-author',
+          authorName: 'Test Author',
+          authorProfileIcon: 'avatar.jpg',
+          authorIsMe: true,
+        ),
         videoUrl: 'https://youtube.com/watch?v=original',
         createdAt: DateTime.now(),
         updatedAt: DateTime.now(),
@@ -142,9 +173,10 @@ void main() {
         wasLikedByMe: false,
       );
 
-      Widget updateFlowWidget = BlocListener<BlogPostCreateCubit, BlogPostCreateState>(
+      Widget
+      updateFlowWidget = BlocListener<BlogPostCreateCubit, BlogPostCreateState>(
         listener: (context, state) {
-          if (state is BlogPostCreateStateLoaded) {
+          if (state.isSuccess) {
             feedProbe.loadFeedBlogPostList();
           }
         },
@@ -161,13 +193,17 @@ void main() {
               decoration: const InputDecoration(labelText: 'Описание'),
               maxLines: 6,
               minLines: 4,
-              controller: TextEditingController(text: existingBlogPost.description),
+              controller: TextEditingController(
+                text: existingBlogPost.description,
+              ),
             ),
             const SizedBox(height: 16),
             TextFormField(
               key: AppKeys.blogPostCreateScreenVideoLinkTextField,
               decoration: const InputDecoration(labelText: 'Ссылка на видео'),
-              controller: TextEditingController(text: existingBlogPost.videoUrl),
+              controller: TextEditingController(
+                text: existingBlogPost.videoUrl,
+              ),
             ),
             const SizedBox(height: 16),
             ElevatedButton(
@@ -178,8 +214,9 @@ void main() {
                   title: updateFixture['title'] as String?,
                   videoUrl: updateFixture['video_url'] as String?,
                   description: updateFixture['description_md'] as String?,
-                  image: null,
-                  oldImageUrl: updateFixture['old_image_url'] as String?,
+                  existingMediaIds: List<int>.from(
+                    updateFixture['existing_media_ids'] as List,
+                  ),
                 );
               },
               child: const Text('Обновить'),
@@ -192,9 +229,18 @@ void main() {
       await tester.pumpWidget(createTestWidget(updateFlowWidget));
       await tester.pumpAndSettle();
 
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenTitleTextField), updateFixture['title'] as String);
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenContentTextField), updateFixture['description_md'] as String);
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField), updateFixture['video_url'] as String);
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+        updateFixture['title'] as String,
+      );
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenContentTextField),
+        updateFixture['description_md'] as String,
+      );
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField),
+        updateFixture['video_url'] as String,
+      );
       await tester.pump();
 
       await tester.tap(find.byKey(AppKeys.blogPostCreateScreenCreateButton));
@@ -205,7 +251,9 @@ void main() {
       expect(feedProbe.loadRequests, 1);
     });
 
-    testWidgets('should handle blog post deletion flow', (WidgetTester tester) async {
+    testWidgets('should handle blog post deletion flow', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       Widget deleteFlowWidget = Column(
         children: [
@@ -230,35 +278,44 @@ void main() {
       await tester.pump();
 
       // Assert
-      final deleteFixture = FixtureReader.readAsMap('blog_post_create/delete_request.json');
+      final deleteFixture = FixtureReader.readAsMap(
+        'blog_post_create/delete_request.json',
+      );
       expect(blogPostRepository.deleteCalls.single, deleteFixture['id']);
       expect(feedProbe.loadRequests, 1);
     });
 
-    testWidgets('should handle error flow during blog post creation', (WidgetTester tester) async {
+    testWidgets('should handle error flow during blog post creation', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       blogPostRepository.createError = Exception('Network error');
 
-      Widget errorFlowWidget = BlocBuilder<BlogPostCreateCubit, BlogPostCreateState>(
-        builder: (context, state) {
-          if (state is BlogPostCreateStateError) {
-            return Column(
-              children: [
-                Text('Error: ${state.errorMessage}'),
-                const SizedBox(height: 16),
-                ElevatedButton(
-                  key: const Key('retryButton'),
-                  onPressed: () async {
-                    await blogPostCreateCubit.createBlogPost(title: 'Retry Title', videoUrl: null, description: 'Retry Description', image: null);
-                  },
-                  child: const Text('Повторить'),
-                ),
-              ],
-            );
-          }
-          return const Text('No Error');
-        },
-      );
+      Widget errorFlowWidget =
+          BlocBuilder<BlogPostCreateCubit, BlogPostCreateState>(
+            builder: (context, state) {
+              if (state.errorMessage != null) {
+                return Column(
+                  children: [
+                    Text('Error: ${state.errorMessage}'),
+                    const SizedBox(height: 16),
+                    ElevatedButton(
+                      key: const Key('retryButton'),
+                      onPressed: () async {
+                        await blogPostCreateCubit.createBlogPost(
+                          title: 'Retry Title',
+                          videoUrl: null,
+                          description: 'Retry Description',
+                        );
+                      },
+                      child: const Text('Повторить'),
+                    ),
+                  ],
+                );
+              }
+              return const Text('No Error');
+            },
+          );
 
       // Act
       await tester.pumpWidget(createTestWidget(errorFlowWidget));
@@ -269,7 +326,6 @@ void main() {
         title: fullCreateFixture['title'] as String?,
         videoUrl: null,
         description: fullCreateFixture['description_md'] as String?,
-        image: null,
       );
       await tester.pump();
 
@@ -278,18 +334,27 @@ void main() {
       expect(find.byKey(const Key('retryButton')), findsOneWidget);
     });
 
-    testWidgets('should handle loading state during blog post creation', (WidgetTester tester) async {
+    testWidgets('should handle loading state during blog post creation', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       blogPostRepository.createDelay = const Duration(milliseconds: 50);
 
-      Widget loadingFlowWidget = BlocBuilder<BlogPostCreateCubit, BlogPostCreateState>(
-        builder: (context, state) {
-          if (state is BlogPostCreateStateLoading) {
-            return const Column(children: [CircularProgressIndicator(), SizedBox(height: 16), Text('Создание блог поста...')]);
-          }
-          return const Text('Not Loading');
-        },
-      );
+      Widget loadingFlowWidget =
+          BlocBuilder<BlogPostCreateCubit, BlogPostCreateState>(
+            builder: (context, state) {
+              if (state.isLoading) {
+                return const Column(
+                  children: [
+                    CircularProgressIndicator(),
+                    SizedBox(height: 16),
+                    Text('Создание блог поста...'),
+                  ],
+                );
+              }
+              return const Text('Not Loading');
+            },
+          );
 
       // Act
       await tester.pumpWidget(createTestWidget(loadingFlowWidget));
@@ -300,7 +365,6 @@ void main() {
         title: fullCreateFixture['title'] as String?,
         videoUrl: null,
         description: fullCreateFixture['description_md'] as String?,
-        image: null,
       );
       await tester.pump();
       await tester.pump(); // Need to pump twice to get the loading state
@@ -314,29 +378,32 @@ void main() {
       await tester.pumpAndSettle();
     });
 
-    testWidgets('should handle success state after blog post creation', (WidgetTester tester) async {
+    testWidgets('should handle success state after blog post creation', (
+      WidgetTester tester,
+    ) async {
       // Arrange
-      Widget successFlowWidget = BlocListener<BlogPostCreateCubit, BlogPostCreateState>(
-        listener: (context, state) {
-          if (state is BlogPostCreateStateLoaded) {
-            feedProbe.loadFeedBlogPostList();
-          }
-        },
-        child: BlocBuilder<BlogPostCreateCubit, BlogPostCreateState>(
-          builder: (context, state) {
-            if (state is BlogPostCreateStateLoaded) {
-              return const Column(
-                children: [
-                  Icon(Icons.check_circle, color: Colors.green, size: 48),
-                  SizedBox(height: 16),
-                  Text('Блог пост успешно создан!'),
-                ],
-              );
-            }
-            return const Text('Not Loaded');
-          },
-        ),
-      );
+      Widget successFlowWidget =
+          BlocListener<BlogPostCreateCubit, BlogPostCreateState>(
+            listener: (context, state) {
+              if (state.isSuccess) {
+                feedProbe.loadFeedBlogPostList();
+              }
+            },
+            child: BlocBuilder<BlogPostCreateCubit, BlogPostCreateState>(
+              builder: (context, state) {
+                if (state.isSuccess) {
+                  return const Column(
+                    children: [
+                      Icon(Icons.check_circle, color: Colors.green, size: 48),
+                      SizedBox(height: 16),
+                      Text('Блог пост успешно создан!'),
+                    ],
+                  );
+                }
+                return const Text('Not Loaded');
+              },
+            ),
+          );
 
       // Act
       await tester.pumpWidget(createTestWidget(successFlowWidget));
@@ -347,7 +414,6 @@ void main() {
         title: fullCreateFixture['title'] as String?,
         videoUrl: null,
         description: fullCreateFixture['description_md'] as String?,
-        image: null,
       );
       await tester.pump();
 
@@ -357,28 +423,43 @@ void main() {
       expect(feedProbe.loadRequests, 1);
     });
 
-    testWidgets('should handle form validation flow', (WidgetTester tester) async {
+    testWidgets('should handle form validation flow', (
+      WidgetTester tester,
+    ) async {
       // Arrange
       Widget validationFlowWidget = Column(
         children: [
           TextFormField(
             key: AppKeys.blogPostCreateScreenTitleTextField,
-            decoration: const InputDecoration(labelText: 'Заголовок', errorText: 'Заголовок обязателен'),
+            decoration: const InputDecoration(
+              labelText: 'Заголовок',
+              errorText: 'Заголовок обязателен',
+            ),
           ),
           const SizedBox(height: 16),
           TextFormField(
             key: AppKeys.blogPostCreateScreenContentTextField,
-            decoration: const InputDecoration(labelText: 'Описание', errorText: 'Описание обязательно'),
+            decoration: const InputDecoration(
+              labelText: 'Описание',
+              errorText: 'Описание обязательно',
+            ),
             maxLines: 6,
             minLines: 4,
           ),
           const SizedBox(height: 16),
           TextFormField(
             key: AppKeys.blogPostCreateScreenVideoLinkTextField,
-            decoration: const InputDecoration(labelText: 'Ссылка на видео', errorText: 'Введите корректную ссылку'),
+            decoration: const InputDecoration(
+              labelText: 'Ссылка на видео',
+              errorText: 'Введите корректную ссылку',
+            ),
           ),
           const SizedBox(height: 16),
-          ElevatedButton(key: AppKeys.blogPostCreateScreenCreateButton, onPressed: () {}, child: const Text('Опубликовать')),
+          ElevatedButton(
+            key: AppKeys.blogPostCreateScreenCreateButton,
+            onPressed: () {},
+            child: const Text('Опубликовать'),
+          ),
         ],
       );
 
@@ -415,7 +496,11 @@ void main() {
                 child: Column(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
-                    Icon(Icons.add_photo_alternate, size: 48, color: Colors.grey),
+                    Icon(
+                      Icons.add_photo_alternate,
+                      size: 48,
+                      color: Colors.grey,
+                    ),
                     SizedBox(height: 8),
                     Text('Добавить изображение'),
                   ],
@@ -431,7 +516,6 @@ void main() {
                 title: 'Test Title',
                 videoUrl: null,
                 description: 'Test Description',
-                image: null, // В реальном тесте здесь был бы XFile
               );
             },
             child: const Text('Опубликовать'),
@@ -450,90 +534,122 @@ void main() {
       expect(imageUploadInitiated, isTrue);
     });
 
-    testWidgets('should handle complete blog post creation with all features', (WidgetTester tester) async {
+    testWidgets('should handle complete blog post creation with all features', (
+      WidgetTester tester,
+    ) async {
       // Arrange
-      Widget completeFlowWidget = BlocListener<BlogPostCreateCubit, BlogPostCreateState>(
-        listener: (context, state) {
-          if (state is BlogPostCreateStateLoaded) {
-            feedProbe.loadFeedBlogPostList();
-          }
-        },
-        child: Column(
-          children: [
-            const Text('Заголовок'),
-            const SizedBox(height: 8),
-            TextFormField(
-              key: AppKeys.blogPostCreateScreenTitleTextField,
-              decoration: const InputDecoration(hintText: 'Введите заголовок поста'),
-            ),
-            const SizedBox(height: 16),
-            const Text('Описание'),
-            const SizedBox(height: 8),
-            TextFormField(key: AppKeys.blogPostCreateScreenContentTextField, decoration: const InputDecoration(), maxLines: 6, minLines: 4),
-            const SizedBox(height: 16),
-            const Text('Изображение поста'),
-            const SizedBox(height: 8),
-            GestureDetector(
-              key: AppKeys.imageWidget,
-              onTap: () {},
-              child: Container(
-                height: 200,
-                width: double.infinity,
-                decoration: BoxDecoration(
-                  border: Border.all(color: Colors.grey),
-                  borderRadius: BorderRadius.circular(8),
-                ),
-                child: const Center(
-                  child: Column(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      Icon(Icons.add_photo_alternate, size: 48, color: Colors.grey),
-                      SizedBox(height: 8),
-                      Text('Добавить изображение'),
-                    ],
+      Widget completeFlowWidget =
+          BlocListener<BlogPostCreateCubit, BlogPostCreateState>(
+            listener: (context, state) {
+              if (state.isSuccess) {
+                feedProbe.loadFeedBlogPostList();
+              }
+            },
+            child: Column(
+              children: [
+                const Text('Заголовок'),
+                const SizedBox(height: 8),
+                TextFormField(
+                  key: AppKeys.blogPostCreateScreenTitleTextField,
+                  decoration: const InputDecoration(
+                    hintText: 'Введите заголовок поста',
                   ),
                 ),
-              ),
+                const SizedBox(height: 16),
+                const Text('Описание'),
+                const SizedBox(height: 8),
+                TextFormField(
+                  key: AppKeys.blogPostCreateScreenContentTextField,
+                  decoration: const InputDecoration(),
+                  maxLines: 6,
+                  minLines: 4,
+                ),
+                const SizedBox(height: 16),
+                const Text('Изображение поста'),
+                const SizedBox(height: 8),
+                GestureDetector(
+                  key: AppKeys.imageWidget,
+                  onTap: () {},
+                  child: Container(
+                    height: 200,
+                    width: double.infinity,
+                    decoration: BoxDecoration(
+                      border: Border.all(color: Colors.grey),
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                    child: const Center(
+                      child: Column(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          Icon(
+                            Icons.add_photo_alternate,
+                            size: 48,
+                            color: Colors.grey,
+                          ),
+                          SizedBox(height: 8),
+                          Text('Добавить изображение'),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+                const SizedBox(height: 16),
+                const Text('Ссылка на видео'),
+                const SizedBox(height: 8),
+                TextFormField(
+                  key: AppKeys.blogPostCreateScreenVideoLinkTextField,
+                  decoration: const InputDecoration(),
+                ),
+                const SizedBox(height: 32),
+                ElevatedButton(
+                  key: AppKeys.blogPostCreateScreenCreateButton,
+                  onPressed: () async {
+                    await blogPostCreateCubit.createBlogPost(
+                      title: fullCreateFixture['title'] as String?,
+                      videoUrl: fullCreateFixture['video_url'] as String?,
+                      description:
+                          fullCreateFixture['description_md'] as String?,
+                    );
+                  },
+                  child: const Text('Опубликовать'),
+                ),
+              ],
             ),
-            const SizedBox(height: 16),
-            const Text('Ссылка на видео'),
-            const SizedBox(height: 8),
-            TextFormField(key: AppKeys.blogPostCreateScreenVideoLinkTextField, decoration: const InputDecoration()),
-            const SizedBox(height: 32),
-            ElevatedButton(
-              key: AppKeys.blogPostCreateScreenCreateButton,
-              onPressed: () async {
-                await blogPostCreateCubit.createBlogPost(
-                  title: fullCreateFixture['title'] as String?,
-                  videoUrl: fullCreateFixture['video_url'] as String?,
-                  description: fullCreateFixture['description_md'] as String?,
-                  image: null,
-                );
-              },
-              child: const Text('Опубликовать'),
-            ),
-          ],
-        ),
-      );
+          );
 
       // Act
       await tester.pumpWidget(createTestWidget(completeFlowWidget));
       await tester.pumpAndSettle();
 
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenTitleTextField), fullCreateFixture['title'] as String);
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenContentTextField), fullCreateFixture['description_md'] as String);
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField), fullCreateFixture['video_url'] as String);
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+        fullCreateFixture['title'] as String,
+      );
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenContentTextField),
+        fullCreateFixture['description_md'] as String,
+      );
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField),
+        fullCreateFixture['video_url'] as String,
+      );
       await tester.pump();
 
       // Scroll to make sure the button is visible
-      await tester.drag(find.byType(SingleChildScrollView), const Offset(0, -200));
+      await tester.drag(
+        find.byType(SingleChildScrollView),
+        const Offset(0, -200),
+      );
       await tester.pump();
 
       await tester.tap(find.byKey(AppKeys.blogPostCreateScreenCreateButton));
       await tester.pump();
 
       // Assert
-      expect(blogPostRepository.createPayloads.single.toJson(), fullCreateFixture);
+      expect(
+        blogPostRepository.createPayloads.single.toJson(),
+        fullCreateFixture,
+      );
       expect(feedProbe.loadRequests, 1);
     });
   });
diff --git a/test/features/blog_post_create/presentation/pages/blog_post_create_screen_test.dart b/test/features/blog_post_create/presentation/pages/blog_post_create_screen_test.dart
index 13b86880..f429bf80 100644
--- a/test/features/blog_post_create/presentation/pages/blog_post_create_screen_test.dart
+++ b/test/features/blog_post_create/presentation/pages/blog_post_create_screen_test.dart
@@ -11,6 +11,7 @@ import 'package:eatvio_app/features/blog_post_create/presentation/pages/blog_pos
 import 'package:eatvio_app/features/blog_post_create/repositories/blog_post_repository.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_pagination_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state.dart';
 import 'package:eatvio_app/generated/l10n.dart';
@@ -19,14 +20,15 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:go_router/go_router.dart';
-import 'package:mockito/annotations.dart';
-import 'package:mockito/mockito.dart';
+import 'package:mocktail/mocktail.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:flutter_image_compress/flutter_image_compress.dart';
 import 'package:network_image_mock/network_image_mock.dart';
 
-import 'blog_post_create_screen_test.mocks.dart';
+class MockBlogPostRepository extends Mock implements BlogPostRepository {}
+
+class MockFeedCubit extends Mock implements FeedCubit {}
 
-@GenerateMocks([BlogPostRepository, BlogPostCreateCubit, FeedCubit])
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
@@ -37,13 +39,22 @@ void main() {
 
     setUp(() async {
       await sl.reset();
-      dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
+      dotenv.loadFromString(
+        envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost',
+      );
       AppConfigRegistration.registerAppConfig(buildType: AppBuildType.tests);
+      registerFallbackValue(<XFile>[]);
+      registerFallbackValue(<int>[]);
       mockBlogPostRepository = MockBlogPostRepository();
-      blogPostCreateCubit = BlogPostCreateCubit(blogPostRepository: mockBlogPostRepository);
+      blogPostCreateCubit = BlogPostCreateCubit(
+        blogPostRepository: mockBlogPostRepository,
+      );
       mockFeedCubit = MockFeedCubit();
-      when(mockFeedCubit.state).thenReturn(const FeedState.loading());
-      when(mockFeedCubit.stream).thenAnswer((_) => Stream.value(const FeedState.loading()));
+      when(() => mockFeedCubit.state).thenReturn(const FeedState.loading());
+      when(
+        () => mockFeedCubit.stream,
+      ).thenAnswer((_) => Stream.value(const FeedState.loading()));
+      when(() => mockFeedCubit.loadFeedBlogPostList()).thenAnswer((_) async {});
       sl.registerLazySingleton<FeedCubit>(() => mockFeedCubit);
       sl.registerLazySingleton<BlogPostCreateCubit>(() => blogPostCreateCubit);
     });
@@ -52,19 +63,25 @@ void main() {
       blogPostCreateCubit.close();
     });
 
-    Widget createTestWidget({FeedBlogPostModel? feedBlogPostModel, bool canPop = false}) {
+    Widget createTestWidget({
+      FeedBlogPostModel? feedBlogPostModel,
+      bool canPop = false,
+    }) {
       final router = GoRouter(
         initialLocation: '/blog-post-create',
         routes: [
           GoRoute(
             path: '/home',
-            builder: (context, state) => const Scaffold(body: Center(child: Text('Home'))),
+            builder: (context, state) =>
+                const Scaffold(body: Center(child: Text('Home'))),
           ),
           GoRoute(
             path: '/blog-post-create',
             builder: (context, state) => MultiBlocProvider(
               providers: [
-                BlocProvider<BlogPostCreateCubit>.value(value: blogPostCreateCubit),
+                BlocProvider<BlogPostCreateCubit>.value(
+                  value: blogPostCreateCubit,
+                ),
                 BlocProvider<FeedCubit>.value(value: mockFeedCubit),
               ],
               child: BlogPostCreateScreen(feedBlogPostModel: feedBlogPostModel),
@@ -87,28 +104,46 @@ void main() {
       );
     }
 
-    testWidgets('displays all form fields when creating new blog post', (tester) async {
+    testWidgets('displays all form fields when creating new blog post', (
+      tester,
+    ) async {
       await tester.pumpWidget(createTestWidget());
       await tester.pumpAndSettle();
 
       expect(find.text('Заголовок'), findsOneWidget);
       expect(find.text('Описание'), findsOneWidget);
-      expect(find.text('Изображение поста'), findsOneWidget);
+      expect(find.textContaining('Изображения'), findsOneWidget);
       expect(find.text('Ссылка на видео'), findsOneWidget);
-      expect(find.byKey(AppKeys.blogPostCreateScreenTitleTextField), findsOneWidget);
-      expect(find.byKey(AppKeys.blogPostCreateScreenContentTextField), findsOneWidget);
-      expect(find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField), findsOneWidget);
+      expect(
+        find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+        findsOneWidget,
+      );
+      expect(
+        find.byKey(AppKeys.blogPostCreateScreenContentTextField),
+        findsOneWidget,
+      );
+      expect(
+        find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField),
+        findsOneWidget,
+      );
     });
 
-    testWidgets('pre-fills form fields when editing existing blog post', (tester) async {
+    testWidgets('pre-fills form fields when editing existing blog post', (
+      tester,
+    ) async {
       final existingPost = FeedBlogPostModel(
         id: 1,
         title: 'Test Title',
         description: 'Test Description',
-        videoUrl: 'https://youtube.com/watch?v=test',
-        image: '', // Changed: removed image so video field is visible
+        videoUrl: 'https://rutube.ru/video/12345/',
+        image: '',
         state: 'published',
-        author: const Author(authorSlug: 'test-author', authorName: 'Test Author', authorProfileIcon: 'avatar.jpg', authorIsMe: true),
+        author: const Author(
+          authorSlug: 'test-author',
+          authorName: 'Test Author',
+          authorProfileIcon: 'avatar.jpg',
+          authorIsMe: true,
+        ),
         createdAt: DateTime.now(),
         updatedAt: DateTime.now(),
         totalLikes: 0,
@@ -117,24 +152,299 @@ void main() {
         wasLikedByMe: false,
       );
 
-      await tester.pumpWidget(createTestWidget(feedBlogPostModel: existingPost));
+      await tester.pumpWidget(
+        createTestWidget(feedBlogPostModel: existingPost),
+      );
       await tester.pumpAndSettle();
 
-      final titleField = tester.widget<CustomTextFormField>(find.byKey(AppKeys.blogPostCreateScreenTitleTextField));
+      final titleField = tester.widget<CustomTextFormField>(
+        find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+      );
       expect(titleField.controller?.text, 'Test Title');
 
-      final descriptionField = tester.widget<CustomTextFormField>(find.byKey(AppKeys.blogPostCreateScreenContentTextField));
+      final descriptionField = tester.widget<CustomTextFormField>(
+        find.byKey(AppKeys.blogPostCreateScreenContentTextField),
+      );
       expect(descriptionField.controller?.text, 'Test Description');
 
-      final videoFieldFinder = find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField);
-      if (videoFieldFinder.evaluate().isNotEmpty) {
-        final videoField = tester.widget<CustomTextFormField>(videoFieldFinder);
-        expect(videoField.controller?.text, 'https://youtube.com/watch?v=test');
-      }
+      final videoField = tester.widget<CustomTextFormField>(
+        find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField),
+      );
+      expect(videoField.controller?.text, 'https://rutube.ru/video/12345/');
+      expect(find.text('Сохранить'), findsOneWidget);
     });
 
-    testWidgets('hides video field when image is present', (tester) async {
+    testWidgets('shows video and gallery fields together', (tester) async {
       await mockNetworkImagesFor(() async {
+        final existingPost = FeedBlogPostModel(
+          id: 1,
+          title: 'Test Title',
+          description: 'Test Description',
+          videoUrl: 'https://rutube.ru/video/12345/',
+          image: 'http://localhost/storage/test_image.jpg',
+          state: 'published',
+          author: const Author(
+            authorSlug: 'test-author',
+            authorName: 'Test Author',
+            authorProfileIcon: 'http://localhost/storage/avatar.jpg',
+            authorIsMe: true,
+          ),
+          createdAt: DateTime.now(),
+          updatedAt: DateTime.now(),
+          totalLikes: 0,
+          totalViews: 0,
+          totalComments: 0,
+          wasLikedByMe: false,
+          images: const [
+            FeedGalleryImage(
+              id: 10,
+              url: 'http://localhost/storage/test_image.jpg',
+            ),
+          ],
+        );
+
+        await tester.pumpWidget(
+          createTestWidget(feedBlogPostModel: existingPost),
+        );
+        await tester.pumpAndSettle();
+
+        expect(find.text('Ссылка на видео'), findsOneWidget);
+        expect(
+          find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField),
+          findsOneWidget,
+        );
+        expect(find.textContaining('Изображения'), findsOneWidget);
+      });
+    });
+
+    testWidgets('allows entering text in title field', (tester) async {
+      await tester.pumpWidget(createTestWidget());
+      await tester.pumpAndSettle();
+
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+        'New Title',
+      );
+      await tester.pump();
+
+      final titleField = tester.widget<CustomTextFormField>(
+        find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+      );
+      expect(titleField.controller?.text, 'New Title');
+    });
+
+    testWidgets('allows entering text in description field', (tester) async {
+      await tester.pumpWidget(createTestWidget());
+      await tester.pumpAndSettle();
+
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenContentTextField),
+        'New Description',
+      );
+      await tester.pump();
+
+      final descriptionField = tester.widget<CustomTextFormField>(
+        find.byKey(AppKeys.blogPostCreateScreenContentTextField),
+      );
+      expect(descriptionField.controller?.text, 'New Description');
+    });
+
+    testWidgets('allows entering text in video URL field', (tester) async {
+      await tester.pumpWidget(createTestWidget());
+      await tester.pumpAndSettle();
+
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField),
+        'https://youtube.com/watch?v=new',
+      );
+      await tester.pump();
+
+      final videoField = tester.widget<CustomTextFormField>(
+        find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField),
+      );
+      expect(videoField.controller?.text, 'https://youtube.com/watch?v=new');
+    });
+
+    testWidgets('displays create button', (tester) async {
+      await tester.pumpWidget(createTestWidget());
+      await tester.pumpAndSettle();
+
+      expect(find.text('Создать'), findsOneWidget);
+    });
+
+    testWidgets('does not submit when form is empty', (tester) async {
+      when(
+        () => mockBlogPostRepository.createBlogPost(
+          title: any(named: 'title'),
+          videoUrl: any(named: 'videoUrl'),
+          description: any(named: 'description'),
+          images: any(named: 'images'),
+        ),
+      ).thenAnswer((_) async {});
+
+      await tester.pumpWidget(createTestWidget());
+      await tester.pumpAndSettle();
+
+      final createButton = find.text('Создать');
+      await tester.ensureVisible(createButton);
+      await tester.tap(createButton);
+      await tester.pumpAndSettle();
+
+      verifyNever(
+        () => mockBlogPostRepository.createBlogPost(
+          title: any(named: 'title'),
+          videoUrl: any(named: 'videoUrl'),
+          description: any(named: 'description'),
+          images: any(named: 'images'),
+        ),
+      );
+      expect(
+        find.text(
+          'Добавьте заголовок, описание, изображение или ссылку на видео',
+        ),
+        findsOneWidget,
+      );
+    });
+
+    testWidgets('does not submit when video url is invalid', (tester) async {
+      when(
+        () => mockBlogPostRepository.createBlogPost(
+          title: any(named: 'title'),
+          videoUrl: any(named: 'videoUrl'),
+          description: any(named: 'description'),
+          images: any(named: 'images'),
+        ),
+      ).thenAnswer((_) async {});
+
+      await tester.pumpWidget(createTestWidget());
+      await tester.pumpAndSettle();
+
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+        'Test Title',
+      );
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField),
+        'https://youtube.com/watch?v=abc',
+      );
+      await tester.pump();
+
+      final createButton = find.text('Создать');
+      await tester.ensureVisible(createButton);
+      await tester.tap(createButton);
+      await tester.pumpAndSettle();
+
+      verifyNever(
+        () => mockBlogPostRepository.createBlogPost(
+          title: any(named: 'title'),
+          videoUrl: any(named: 'videoUrl'),
+          description: any(named: 'description'),
+          images: any(named: 'images'),
+        ),
+      );
+      expect(
+        find.text('Поддерживаются только Rutube, VK и OK'),
+        findsOneWidget,
+      );
+    });
+
+    testWidgets('shows loading state when creating blog post', (tester) async {
+      when(
+        () => mockBlogPostRepository.createBlogPost(
+          title: any(named: 'title'),
+          videoUrl: any(named: 'videoUrl'),
+          description: any(named: 'description'),
+          images: any(named: 'images'),
+        ),
+      ).thenAnswer((_) async {
+        await Future.delayed(const Duration(milliseconds: 100));
+        return;
+      });
+
+      await tester.pumpWidget(createTestWidget());
+      await tester.pumpAndSettle();
+
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+        'Test Title',
+      );
+      await tester.enterText(
+        find.byKey(AppKeys.blogPostCreateScreenContentTextField),
+        'Test Description',
+      );
+      await tester.pump();
+
+      final createButton = find.text('Создать');
+      await tester.ensureVisible(createButton);
+      await tester.tap(createButton);
+      await tester.pump();
+
+      expect(find.byType(Loader), findsWidgets);
+
+      await tester.pump(const Duration(milliseconds: 150));
+      await tester.pumpAndSettle();
+    });
+
+    testWidgets(
+      'calls FeedCubit.loadFeedBlogPostList when blog post is created successfully',
+      (tester) async {
+        when(
+          () => mockBlogPostRepository.createBlogPost(
+            title: any(named: 'title'),
+            videoUrl: any(named: 'videoUrl'),
+            description: any(named: 'description'),
+            images: any(named: 'images'),
+          ),
+        ).thenAnswer((_) async {
+          return;
+        });
+
+        await tester.pumpWidget(createTestWidget());
+        await tester.pumpAndSettle();
+
+        final titleField = find.byKey(
+          AppKeys.blogPostCreateScreenTitleTextField,
+        );
+        final contentField = find.byKey(
+          AppKeys.blogPostCreateScreenContentTextField,
+        );
+
+        await tester.ensureVisible(titleField);
+        await tester.ensureVisible(contentField);
+        await tester.pumpAndSettle();
+
+        await tester.enterText(titleField, 'Test Title');
+        await tester.enterText(contentField, 'Test Description');
+        await tester.pump();
+
+        final createButton = find.text('Создать');
+        await tester.ensureVisible(createButton);
+        await tester.tap(createButton, warnIfMissed: false);
+        await tester.pump();
+
+        await tester.pump(const Duration(milliseconds: 200));
+        await tester.pumpAndSettle();
+
+        verify(() => mockFeedCubit.loadFeedBlogPostList()).called(1);
+      },
+    );
+
+    testWidgets('does not submit update when video url is invalid', (
+      tester,
+    ) async {
+      await mockNetworkImagesFor(() async {
+        when(
+          () => mockBlogPostRepository.updateBlogPost(
+            id: any(named: 'id'),
+            title: any(named: 'title'),
+            videoUrl: any(named: 'videoUrl'),
+            description: any(named: 'description'),
+            existingMediaIds: any(named: 'existingMediaIds'),
+            newImages: any(named: 'newImages'),
+            mediaIdsToDelete: any(named: 'mediaIdsToDelete'),
+          ),
+        ).thenAnswer((_) async {});
+
         final existingPost = FeedBlogPostModel(
           id: 1,
           title: 'Test Title',
@@ -154,136 +464,140 @@ void main() {
           totalViews: 0,
           totalComments: 0,
           wasLikedByMe: false,
+          images: const [
+            FeedGalleryImage(
+              id: 10,
+              url: 'http://localhost/storage/test_image.jpg',
+            ),
+          ],
         );
 
-        await tester.pumpWidget(createTestWidget(feedBlogPostModel: existingPost));
+        await tester.pumpWidget(
+          createTestWidget(feedBlogPostModel: existingPost),
+        );
         await tester.pumpAndSettle();
 
-        expect(find.text('Ссылка на видео'), findsNothing);
-        expect(find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField), findsNothing);
+        await tester.enterText(
+          find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField),
+          'https://youtube.com/watch?v=abc',
+        );
+        await tester.pump();
+
+        final saveButton = find.text('Сохранить');
+        await tester.ensureVisible(saveButton);
+        await tester.tap(saveButton);
+        await tester.pumpAndSettle();
+
+        verifyNever(
+          () => mockBlogPostRepository.updateBlogPost(
+            id: any(named: 'id'),
+            title: any(named: 'title'),
+            videoUrl: any(named: 'videoUrl'),
+            description: any(named: 'description'),
+            existingMediaIds: any(named: 'existingMediaIds'),
+            newImages: any(named: 'newImages'),
+            mediaIdsToDelete: any(named: 'mediaIdsToDelete'),
+          ),
+        );
+        expect(
+          find.text('Поддерживаются только Rutube, VK и OK'),
+          findsOneWidget,
+        );
       });
     });
 
-    testWidgets('hides image field when video URL is present', (tester) async {
-      final existingPost = FeedBlogPostModel(
-        id: 1,
-        title: 'Test Title',
-        description: 'Test Description',
-        videoUrl: 'https://youtube.com/watch?v=test',
-        image: '',
-        state: 'published',
-        author: const Author(authorSlug: 'test-author', authorName: 'Test Author', authorProfileIcon: 'avatar.jpg', authorIsMe: true),
-        createdAt: DateTime.now(),
-        updatedAt: DateTime.now(),
-        totalLikes: 0,
-        totalViews: 0,
-        totalComments: 0,
-        wasLikedByMe: false,
-      );
-
-      await tester.pumpWidget(createTestWidget(feedBlogPostModel: existingPost));
-      await tester.pumpAndSettle();
-
-      expect(find.text('Изображение поста'), findsNothing);
-    });
-
-    testWidgets('allows entering text in title field', (tester) async {
-      await tester.pumpWidget(createTestWidget());
-      await tester.pumpAndSettle();
-
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenTitleTextField), 'New Title');
-      await tester.pump();
-
-      final titleField = tester.widget<CustomTextFormField>(find.byKey(AppKeys.blogPostCreateScreenTitleTextField));
-      expect(titleField.controller?.text, 'New Title');
-    });
-
-    testWidgets('allows entering text in description field', (tester) async {
-      await tester.pumpWidget(createTestWidget());
-      await tester.pumpAndSettle();
-
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenContentTextField), 'New Description');
-      await tester.pump();
-
-      final descriptionField = tester.widget<CustomTextFormField>(find.byKey(AppKeys.blogPostCreateScreenContentTextField));
-      expect(descriptionField.controller?.text, 'New Description');
-    });
-
-    testWidgets('allows entering text in video URL field', (tester) async {
-      await tester.pumpWidget(createTestWidget());
-      await tester.pumpAndSettle();
-
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField), 'https://youtube.com/watch?v=new');
-      await tester.pump();
-
-      final videoField = tester.widget<CustomTextFormField>(find.byKey(AppKeys.blogPostCreateScreenVideoLinkTextField));
-      expect(videoField.controller?.text, 'https://youtube.com/watch?v=new');
-    });
-
-    testWidgets('displays create button', (tester) async {
-      await tester.pumpWidget(createTestWidget());
-      await tester.pumpAndSettle();
-
-      expect(find.text('Создать'), findsOneWidget);
-    });
-
-    testWidgets('shows loading state when creating blog post', (tester) async {
-      when(mockBlogPostRepository.createBlogPost(any, any, any, any)).thenAnswer((_) async {
-        await Future.delayed(const Duration(milliseconds: 100));
-        return;
-      });
-
-      await tester.pumpWidget(createTestWidget());
-      await tester.pumpAndSettle();
-
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenTitleTextField), 'Test Title');
-      await tester.enterText(find.byKey(AppKeys.blogPostCreateScreenContentTextField), 'Test Description');
-      await tester.pump();
-
-      final createButton = find.text('Создать');
-      await tester.ensureVisible(createButton);
-      await tester.tap(createButton);
-      await tester.pump();
-
-      expect(find.byType(Loader), findsWidgets);
-
-      await tester.pump(const Duration(milliseconds: 150));
-      await tester.pumpAndSettle();
-    });
-
-    testWidgets('calls FeedCubit.loadFeedBlogPostList when blog post is created successfully', (tester) async {
-      when(mockBlogPostRepository.createBlogPost(any, any, any, any)).thenAnswer((_) async {
-        return;
-      });
-
-      await tester.pumpWidget(createTestWidget());
-      await tester.pumpAndSettle();
-
-      final titleField = find.byKey(AppKeys.blogPostCreateScreenTitleTextField);
-      final contentField = find.byKey(AppKeys.blogPostCreateScreenContentTextField);
-
-      await tester.ensureVisible(titleField);
-      await tester.ensureVisible(contentField);
-      await tester.pumpAndSettle();
-
-      await tester.enterText(titleField, 'Test Title');
-      await tester.enterText(contentField, 'Test Description');
-      await tester.pump();
-
-      final createButton = find.text('Создать');
-      await tester.ensureVisible(createButton);
-      await tester.tap(createButton, warnIfMissed: false);
-      await tester.pump();
-
-      await tester.pump(const Duration(milliseconds: 200));
-      await tester.pumpAndSettle();
-
-      verify(mockFeedCubit.loadFeedBlogPostList()).called(1);
-    });
-
-    testWidgets('calls updateBlogPost when editing existing post', (tester) async {
+    testWidgets('does not submit update when form content is cleared', (
+      tester,
+    ) async {
       await mockNetworkImagesFor(() async {
-        when(mockBlogPostRepository.updateBlogPost(any, any, any, any, any, any)).thenAnswer((_) async {
+        when(
+          () => mockBlogPostRepository.updateBlogPost(
+            id: any(named: 'id'),
+            title: any(named: 'title'),
+            videoUrl: any(named: 'videoUrl'),
+            description: any(named: 'description'),
+            existingMediaIds: any(named: 'existingMediaIds'),
+            newImages: any(named: 'newImages'),
+            mediaIdsToDelete: any(named: 'mediaIdsToDelete'),
+          ),
+        ).thenAnswer((_) async {});
+
+        final existingPost = FeedBlogPostModel(
+          id: 1,
+          title: 'Test Title',
+          description: 'Test Description',
+          videoUrl: '',
+          image: '',
+          state: 'published',
+          author: const Author(
+            authorSlug: 'test-author',
+            authorName: 'Test Author',
+            authorProfileIcon: 'http://localhost/storage/avatar.jpg',
+            authorIsMe: true,
+          ),
+          createdAt: DateTime.now(),
+          updatedAt: DateTime.now(),
+          totalLikes: 0,
+          totalViews: 0,
+          totalComments: 0,
+          wasLikedByMe: false,
+        );
+
+        await tester.pumpWidget(
+          createTestWidget(feedBlogPostModel: existingPost),
+        );
+        await tester.pumpAndSettle();
+
+        await tester.enterText(
+          find.byKey(AppKeys.blogPostCreateScreenTitleTextField),
+          '',
+        );
+        await tester.enterText(
+          find.byKey(AppKeys.blogPostCreateScreenContentTextField),
+          '',
+        );
+        await tester.pump();
+
+        final saveButton = find.text('Сохранить');
+        await tester.ensureVisible(saveButton);
+        await tester.tap(saveButton);
+        await tester.pumpAndSettle();
+
+        verifyNever(
+          () => mockBlogPostRepository.updateBlogPost(
+            id: any(named: 'id'),
+            title: any(named: 'title'),
+            videoUrl: any(named: 'videoUrl'),
+            description: any(named: 'description'),
+            existingMediaIds: any(named: 'existingMediaIds'),
+            newImages: any(named: 'newImages'),
+            mediaIdsToDelete: any(named: 'mediaIdsToDelete'),
+          ),
+        );
+        expect(
+          find.text(
+            'Добавьте заголовок, описание, изображение или ссылку на видео',
+          ),
+          findsOneWidget,
+        );
+      });
+    });
+
+    testWidgets('calls updateBlogPost when editing existing post', (
+      tester,
+    ) async {
+      await mockNetworkImagesFor(() async {
+        when(
+          () => mockBlogPostRepository.updateBlogPost(
+            id: any(named: 'id'),
+            title: any(named: 'title'),
+            videoUrl: any(named: 'videoUrl'),
+            description: any(named: 'description'),
+            existingMediaIds: any(named: 'existingMediaIds'),
+            newImages: any(named: 'newImages'),
+            mediaIdsToDelete: any(named: 'mediaIdsToDelete'),
+          ),
+        ).thenAnswer((_) async {
           return;
         });
 
@@ -306,26 +620,46 @@ void main() {
           totalViews: 0,
           totalComments: 0,
           wasLikedByMe: false,
+          images: const [
+            FeedGalleryImage(
+              id: 10,
+              url: 'http://localhost/storage/test_image.jpg',
+            ),
+          ],
         );
 
-        await tester.pumpWidget(createTestWidget(feedBlogPostModel: existingPost, canPop: true));
+        await tester.pumpWidget(
+          createTestWidget(feedBlogPostModel: existingPost, canPop: true),
+        );
         await tester.pumpAndSettle();
 
-        final titleField = find.byKey(AppKeys.blogPostCreateScreenTitleTextField);
+        final titleField = find.byKey(
+          AppKeys.blogPostCreateScreenTitleTextField,
+        );
         expect(titleField, findsOneWidget);
 
         await tester.enterText(titleField, 'Updated Title');
         await tester.pump();
 
-        final createButton = find.text('Создать');
-        await tester.ensureVisible(createButton);
-        await tester.tap(createButton, warnIfMissed: false);
+        final saveButton = find.text('Сохранить');
+        await tester.ensureVisible(saveButton);
+        await tester.tap(saveButton, warnIfMissed: false);
         await tester.pump();
 
         await tester.pump(const Duration(milliseconds: 200));
         await tester.pumpAndSettle();
 
-        verify(mockBlogPostRepository.updateBlogPost(any, any, any, any, any, any)).called(1);
+        verify(
+          () => mockBlogPostRepository.updateBlogPost(
+            id: any(named: 'id'),
+            title: any(named: 'title'),
+            videoUrl: any(named: 'videoUrl'),
+            description: any(named: 'description'),
+            existingMediaIds: any(named: 'existingMediaIds'),
+            newImages: any(named: 'newImages'),
+            mediaIdsToDelete: any(named: 'mediaIdsToDelete'),
+          ),
+        ).called(1);
       });
     });
 
@@ -344,8 +678,9 @@ void main() {
     });
 
     testWidgets('renders error state', (tester) async {
-
-      blogPostCreateCubit.emit(const BlogPostCreateState.error(errorMessage: 'Error creating post'));
+      blogPostCreateCubit.emit(
+        const BlogPostCreateState(errorMessage: 'Error creating post'),
+      );
 
       await tester.pumpWidget(createTestWidget());
       await tester.pumpAndSettle();
@@ -354,7 +689,7 @@ void main() {
     });
 
     testWidgets('renders loading state', (tester) async {
-      blogPostCreateCubit.emit(const BlogPostCreateState.loading());
+      blogPostCreateCubit.emit(const BlogPostCreateState(isLoading: true));
 
       await tester.pumpWidget(createTestWidget());
       await tester.pumpAndSettle();
diff --git a/test/features/blog_post_create/repositories/blog_post_repository_test.dart b/test/features/blog_post_create/repositories/blog_post_repository_test.dart
index 1c6ef9e1..252d6fed 100644
--- a/test/features/blog_post_create/repositories/blog_post_repository_test.dart
+++ b/test/features/blog_post_create/repositories/blog_post_repository_test.dart
@@ -25,204 +25,172 @@ void main() {
     test('deleteBlogPost вызывает сервис', () async {
       const id = 1;
 
-      when(() => mockService.deleteBlogPost(id: id)).thenAnswer((_) async => {});
+      when(
+        () => mockService.deleteBlogPost(id: id),
+      ).thenAnswer((_) async => {});
 
       await repository.deleteBlogPost(id);
 
       verify(() => mockService.deleteBlogPost(id: id)).called(1);
     });
 
+    test('deleteBlogPostMedia вызывает сервис', () async {
+      when(
+        () => mockService.deleteBlogPostMedia(postId: 10, mediaId: 20),
+      ).thenAnswer((_) async => {});
+
+      await repository.deleteBlogPostMedia(postId: 10, mediaId: 20);
+
+      verify(
+        () => mockService.deleteBlogPostMedia(postId: 10, mediaId: 20),
+      ).called(1);
+    });
+
     test('createBlogPost вызывает сервис с FormData', () async {
-      const title = 'Test Title';
-      const description = 'Test Description';
-
-      when(() => mockService.createBlogPost(formData: any(named: 'formData'))).thenAnswer((_) async => {});
-
-      await repository.createBlogPost(title, null, description, null);
-
-      verify(() => mockService.createBlogPost(formData: any(named: 'formData'))).called(1);
-    });
-
-    test('updateBlogPost вызывает сервис с FormData', () async {
-      const id = 1;
-      const title = 'Updated Title';
-
       when(
-        () => mockService.updateBlogPost(
-          id: id,
-          formData: any(named: 'formData'),
-        ),
+        () => mockService.createBlogPost(formData: any(named: 'formData')),
       ).thenAnswer((_) async => {});
 
-      await repository.updateBlogPost(id, title, null, null, null, null);
+      await repository.createBlogPost(
+        title: 'Test Title',
+        description: 'Test Description',
+      );
 
-      verify(
-        () => mockService.updateBlogPost(
-          id: id,
-          formData: any(named: 'formData'),
-        ),
-      ).called(1);
-    });
+      final captured =
+          verify(
+                () => mockService.createBlogPost(
+                  formData: captureAny(named: 'formData'),
+                ),
+              ).captured.single
+              as FormData;
 
-    test('createBlogPost - обрабатывает пустые поля', () async {
-      when(() => mockService.createBlogPost(formData: any(named: 'formData'))).thenAnswer((_) async => {});
-
-      await repository.createBlogPost(null, null, null, null);
-
-      verify(() => mockService.createBlogPost(formData: any(named: 'formData'))).called(1);
-    });
-
-    test('createBlogPost - обрабатывает только title', () async {
-      const title = 'Test Title';
-
-      when(() => mockService.createBlogPost(formData: any(named: 'formData'))).thenAnswer((_) async => {});
-
-      await repository.createBlogPost(title, null, null, null);
-
-      verify(() => mockService.createBlogPost(formData: any(named: 'formData'))).called(1);
+      expect(
+        captured.fields.map((e) => '${e.key}=${e.value}'),
+        containsAll(['title=Test Title', 'description_md=Test Description']),
+      );
+      expect(captured.files, isEmpty);
     });
 
     test('createBlogPost - обрабатывает только videoUrl', () async {
-      const videoUrl = 'https://example.com/video.mp4';
-
-      when(() => mockService.createBlogPost(formData: any(named: 'formData'))).thenAnswer((_) async => {});
-
-      await repository.createBlogPost(null, videoUrl, null, null);
-
-      verify(() => mockService.createBlogPost(formData: any(named: 'formData'))).called(1);
-    });
-
-    test('createBlogPost - обрабатывает только description', () async {
-      const description = 'Test Description';
-
-      when(() => mockService.createBlogPost(formData: any(named: 'formData'))).thenAnswer((_) async => {});
-
-      await repository.createBlogPost(null, null, description, null);
-
-      verify(() => mockService.createBlogPost(formData: any(named: 'formData'))).called(1);
-    });
-
-    test('updateBlogPost - обрабатывает все поля', () async {
-      const id = 1;
-      const title = 'Updated Title';
-      const videoUrl = 'https://example.com/video.mp4';
-      const description = 'Updated Description';
+      const videoUrl = 'https://rutube.ru/video/12345/';
 
       when(
-        () => mockService.updateBlogPost(
-          id: id,
-          formData: any(named: 'formData'),
-        ),
+        () => mockService.createBlogPost(formData: any(named: 'formData')),
       ).thenAnswer((_) async => {});
 
-      await repository.updateBlogPost(id, title, videoUrl, description, null, null);
+      await repository.createBlogPost(videoUrl: videoUrl);
 
-      verify(
-        () => mockService.updateBlogPost(
-          id: id,
-          formData: any(named: 'formData'),
-        ),
-      ).called(1);
+      final captured =
+          verify(
+                () => mockService.createBlogPost(
+                  formData: captureAny(named: 'formData'),
+                ),
+              ).captured.single
+              as FormData;
+
+      expect(
+        captured.fields.map((e) => '${e.key}=${e.value}'),
+        contains('video_url=$videoUrl'),
+      );
     });
 
+    test(
+      'updateBlogPost отправляет existing_media_ids и удаляет media пачкой',
+      () async {
+        when(
+          () => mockService.deleteBlogPostMedia(
+            postId: 1,
+            mediaId: any(named: 'mediaId'),
+          ),
+        ).thenAnswer((_) async => {});
+        when(
+          () => mockService.updateBlogPost(
+            id: 1,
+            formData: any(named: 'formData'),
+          ),
+        ).thenAnswer((_) async => {});
+
+        await repository.updateBlogPost(
+          id: 1,
+          title: 'Updated Title',
+          existingMediaIds: [5, 3],
+          mediaIdsToDelete: [9, 8],
+        );
+
+        verify(
+          () => mockService.deleteBlogPostMedia(postId: 1, mediaId: 9),
+        ).called(1);
+        verify(
+          () => mockService.deleteBlogPostMedia(postId: 1, mediaId: 8),
+        ).called(1);
+
+        final captured =
+            verify(
+                  () => mockService.updateBlogPost(
+                    id: 1,
+                    formData: captureAny(named: 'formData'),
+                  ),
+                ).captured.single
+                as FormData;
+
+        final fields = captured.fields
+            .map((e) => '${e.key}=${e.value}')
+            .toList();
+        expect(fields, contains('title=Updated Title'));
+        expect(fields, contains('description_md='));
+        expect(fields, contains('video_url='));
+        expect(fields, contains('existing_media_ids[]=5'));
+        expect(fields, contains('existing_media_ids[]=3'));
+      },
+    );
+
+    test(
+      'updateBlogPost отправляет пустые text fields для очистки на бэке',
+      () async {
+        when(
+          () => mockService.updateBlogPost(
+            id: 1,
+            formData: any(named: 'formData'),
+          ),
+        ).thenAnswer((_) async => {});
+
+        await repository.updateBlogPost(
+          id: 1,
+          title: '',
+          description: '',
+          videoUrl: '',
+          existingMediaIds: const [],
+        );
+
+        final captured =
+            verify(
+                  () => mockService.updateBlogPost(
+                    id: 1,
+                    formData: captureAny(named: 'formData'),
+                  ),
+                ).captured.single
+                as FormData;
+
+        final fields = captured.fields
+            .map((e) => '${e.key}=${e.value}')
+            .toList();
+        expect(fields, contains('title='));
+        expect(fields, contains('description_md='));
+        expect(fields, contains('video_url='));
+      },
+    );
+
     test('updateBlogPost - обрабатывает пустые поля', () async {
-      const id = 1;
-
       when(
-        () => mockService.updateBlogPost(
-          id: id,
-          formData: any(named: 'formData'),
-        ),
+        () =>
+            mockService.updateBlogPost(id: 1, formData: any(named: 'formData')),
       ).thenAnswer((_) async => {});
 
-      await repository.updateBlogPost(id, null, null, null, null, null);
+      await repository.updateBlogPost(id: 1);
 
       verify(
-        () => mockService.updateBlogPost(
-          id: id,
-          formData: any(named: 'formData'),
-        ),
-      ).called(1);
-    });
-
-    test('createBlogPost - обрабатывает пустые поля', () async {
-      when(() => mockService.createBlogPost(formData: any(named: 'formData'))).thenAnswer((_) async => {});
-
-      await repository.createBlogPost(null, null, null, null);
-
-      verify(() => mockService.createBlogPost(formData: any(named: 'formData'))).called(1);
-    });
-
-    test('createBlogPost - обрабатывает только title', () async {
-      const title = 'Test Title';
-
-      when(() => mockService.createBlogPost(formData: any(named: 'formData'))).thenAnswer((_) async => {});
-
-      await repository.createBlogPost(title, null, null, null);
-
-      verify(() => mockService.createBlogPost(formData: any(named: 'formData'))).called(1);
-    });
-
-    test('createBlogPost - обрабатывает только videoUrl', () async {
-      const videoUrl = 'https://example.com/video.mp4';
-
-      when(() => mockService.createBlogPost(formData: any(named: 'formData'))).thenAnswer((_) async => {});
-
-      await repository.createBlogPost(null, videoUrl, null, null);
-
-      verify(() => mockService.createBlogPost(formData: any(named: 'formData'))).called(1);
-    });
-
-    test('createBlogPost - обрабатывает только description', () async {
-      const description = 'Test Description';
-
-      when(() => mockService.createBlogPost(formData: any(named: 'formData'))).thenAnswer((_) async => {});
-
-      await repository.createBlogPost(null, null, description, null);
-
-      verify(() => mockService.createBlogPost(formData: any(named: 'formData'))).called(1);
-    });
-
-    test('updateBlogPost - обрабатывает все поля', () async {
-      const id = 1;
-      const title = 'Updated Title';
-      const videoUrl = 'https://example.com/video.mp4';
-      const description = 'Updated Description';
-
-      when(
-        () => mockService.updateBlogPost(
-          id: id,
-          formData: any(named: 'formData'),
-        ),
-      ).thenAnswer((_) async => {});
-
-      await repository.updateBlogPost(id, title, videoUrl, description, null, null);
-
-      verify(
-        () => mockService.updateBlogPost(
-          id: id,
-          formData: any(named: 'formData'),
-        ),
-      ).called(1);
-    });
-
-    test('updateBlogPost - обрабатывает пустые поля', () async {
-      const id = 1;
-
-      when(
-        () => mockService.updateBlogPost(
-          id: id,
-          formData: any(named: 'formData'),
-        ),
-      ).thenAnswer((_) async => {});
-
-      await repository.updateBlogPost(id, null, null, null, null, null);
-
-      verify(
-        () => mockService.updateBlogPost(
-          id: id,
-          formData: any(named: 'formData'),
-        ),
+        () =>
+            mockService.updateBlogPost(id: 1, formData: any(named: 'formData')),
       ).called(1);
     });
   });
diff --git a/test/features/blog_post_create/services/blog_post_service_test.dart b/test/features/blog_post_create/services/blog_post_service_test.dart
index cbfcef01..8eca643f 100644
--- a/test/features/blog_post_create/services/blog_post_service_test.dart
+++ b/test/features/blog_post_create/services/blog_post_service_test.dart
@@ -18,8 +18,9 @@ void main() {
     test('createBlogPost - создает пост блога', () async {
       final formData = FormData.fromMap({});
 
-      when(mockBlogPostService.createBlogPost(formData: formData))
-          .thenAnswer((_) async => Future.value());
+      when(
+        mockBlogPostService.createBlogPost(formData: formData),
+      ).thenAnswer((_) async => Future.value());
 
       await mockBlogPostService.createBlogPost(formData: formData);
 
@@ -30,19 +31,35 @@ void main() {
       const id = 1;
       final formData = FormData.fromMap({});
 
-      when(mockBlogPostService.updateBlogPost(id: id, formData: formData))
-          .thenAnswer((_) async => Future.value());
+      when(
+        mockBlogPostService.updateBlogPost(id: id, formData: formData),
+      ).thenAnswer((_) async => Future.value());
 
       await mockBlogPostService.updateBlogPost(id: id, formData: formData);
 
-      verify(mockBlogPostService.updateBlogPost(id: id, formData: formData)).called(1);
+      verify(
+        mockBlogPostService.updateBlogPost(id: id, formData: formData),
+      ).called(1);
+    });
+
+    test('deleteBlogPostMedia - удаляет изображение поста', () async {
+      when(
+        mockBlogPostService.deleteBlogPostMedia(postId: 1, mediaId: 2),
+      ).thenAnswer((_) async => Future.value());
+
+      await mockBlogPostService.deleteBlogPostMedia(postId: 1, mediaId: 2);
+
+      verify(
+        mockBlogPostService.deleteBlogPostMedia(postId: 1, mediaId: 2),
+      ).called(1);
     });
 
     test('deleteBlogPost - удаляет пост блога', () async {
       const id = 1;
 
-      when(mockBlogPostService.deleteBlogPost(id: id))
-          .thenAnswer((_) async => Future.value());
+      when(
+        mockBlogPostService.deleteBlogPost(id: id),
+      ).thenAnswer((_) async => Future.value());
 
       await mockBlogPostService.deleteBlogPost(id: id);
 
@@ -50,4 +67,3 @@ void main() {
     });
   });
 }
-
diff --git a/test/features/blog_post_create/validation/blog_post_form_validator_test.dart b/test/features/blog_post_create/validation/blog_post_form_validator_test.dart
new file mode 100644
index 00000000..27bfe366
--- /dev/null
+++ b/test/features/blog_post_create/validation/blog_post_form_validator_test.dart
@@ -0,0 +1,191 @@
+import 'package:eatvio_app/features/blog_post_create/validation/blog_post_form_validator.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group('BlogPostFormValidator.title', () {
+    test('allows empty', () {
+      expect(BlogPostFormValidator.title(''), isNull);
+      expect(BlogPostFormValidator.title('   '), isNull);
+      expect(BlogPostFormValidator.title(null), isNull);
+    });
+
+    test('rejects shorter than 3 chars', () {
+      expect(
+        BlogPostFormValidator.title('ab'),
+        BlogPostFormValidator.titleTooShort,
+      );
+      expect(
+        BlogPostFormValidator.title('  a  '),
+        BlogPostFormValidator.titleTooShort,
+      );
+    });
+
+    test('allows 3+ chars', () {
+      expect(BlogPostFormValidator.title('abc'), isNull);
+      expect(BlogPostFormValidator.title('  hello  '), isNull);
+    });
+  });
+
+  group('BlogPostFormValidator.description', () {
+    test('allows empty and rejects short', () {
+      expect(BlogPostFormValidator.description(''), isNull);
+      expect(
+        BlogPostFormValidator.description('xy'),
+        BlogPostFormValidator.descriptionTooShort,
+      );
+      expect(BlogPostFormValidator.description('xyz'), isNull);
+    });
+  });
+
+  group('BlogPostFormValidator.videoUrl', () {
+    test('allows empty', () {
+      expect(BlogPostFormValidator.videoUrl(''), isNull);
+      expect(BlogPostFormValidator.videoUrl('  '), isNull);
+    });
+
+    test('rejects unsupported hosts', () {
+      expect(
+        BlogPostFormValidator.videoUrl('https://youtube.com/watch?v=abc'),
+        BlogPostFormValidator.videoUrlUnsupportedHost,
+      );
+      expect(
+        BlogPostFormValidator.videoUrl('https://rutube.ru.evil.com/video/abc'),
+        BlogPostFormValidator.videoUrlUnsupportedHost,
+      );
+    });
+
+    test('accepts rutube / vk / ok formats', () {
+      expect(
+        BlogPostFormValidator.videoUrl('https://rutube.ru/video/abc123/'),
+        isNull,
+      );
+      expect(
+        BlogPostFormValidator.videoUrl('https://www.rutube.ru/shorts/abc123'),
+        isNull,
+      );
+      expect(
+        BlogPostFormValidator.videoUrl('https://vk.com/video-123_456'),
+        isNull,
+      );
+      expect(
+        BlogPostFormValidator.videoUrl('https://vkvideo.ru/video123_456/'),
+        isNull,
+      );
+      expect(
+        BlogPostFormValidator.videoUrl('https://ok.ru/video/12345'),
+        isNull,
+      );
+    });
+
+    test('rejects invalid path formats for allowed hosts', () {
+      expect(
+        BlogPostFormValidator.videoUrl('https://rutube.ru/channel/abc'),
+        BlogPostFormValidator.videoUrlRutubeFormat,
+      );
+      expect(
+        BlogPostFormValidator.videoUrl('https://vk.com/feed'),
+        BlogPostFormValidator.videoUrlVkFormat,
+      );
+      expect(
+        BlogPostFormValidator.videoUrl('https://ok.ru/profile/1'),
+        BlogPostFormValidator.videoUrlOkFormat,
+      );
+    });
+
+    test('rejects malformed urls', () {
+      expect(
+        BlogPostFormValidator.videoUrl('not-a-url'),
+        BlogPostFormValidator.videoUrlInvalid,
+      );
+      expect(
+        BlogPostFormValidator.videoUrl('ftp://rutube.ru/video/abc'),
+        BlogPostFormValidator.videoUrlInvalid,
+      );
+    });
+  });
+
+  group('BlogPostFormValidator.contentRequiredMessage', () {
+    test('requires at least one filled field', () {
+      expect(
+        BlogPostFormValidator.contentRequiredMessage(
+          title: '',
+          description: '',
+          videoUrl: '',
+          imageCount: 0,
+        ),
+        BlogPostFormValidator.contentRequired,
+      );
+    });
+
+    test('accepts any valid content source', () {
+      expect(
+        BlogPostFormValidator.contentRequiredMessage(
+          title: 'abc',
+          description: '',
+          videoUrl: '',
+          imageCount: 0,
+        ),
+        isNull,
+      );
+      expect(
+        BlogPostFormValidator.contentRequiredMessage(
+          title: '',
+          description: 'abc',
+          videoUrl: '',
+          imageCount: 0,
+        ),
+        isNull,
+      );
+      expect(
+        BlogPostFormValidator.contentRequiredMessage(
+          title: '',
+          description: '',
+          videoUrl: '',
+          imageCount: 1,
+        ),
+        isNull,
+      );
+      expect(
+        BlogPostFormValidator.contentRequiredMessage(
+          title: '',
+          description: '',
+          videoUrl: 'https://rutube.ru/video/abc123/',
+          imageCount: 0,
+        ),
+        isNull,
+      );
+    });
+
+    test('does not count short title or invalid video as content', () {
+      expect(
+        BlogPostFormValidator.contentRequiredMessage(
+          title: 'ab',
+          description: '',
+          videoUrl: 'https://youtube.com/watch?v=1',
+          imageCount: 0,
+        ),
+        BlogPostFormValidator.contentRequired,
+      );
+    });
+  });
+
+  group('BlogPostFormValidator.imagePaths', () {
+    test('allows jpg/jpeg/png', () {
+      expect(
+        BlogPostFormValidator.imagePaths(['a.jpg', 'b.JPEG', 'c.png']),
+        isNull,
+      );
+    });
+
+    test('rejects other extensions', () {
+      expect(
+        BlogPostFormValidator.imagePaths(['a.webp']),
+        BlogPostFormValidator.imageTypeInvalid,
+      );
+      expect(
+        BlogPostFormValidator.imagePaths(['noext']),
+        BlogPostFormValidator.imageTypeInvalid,
+      );
+    });
+  });
+}
diff --git a/test/features/chat/models/chat_message_model_test.dart b/test/features/chat/models/chat_message_model_test.dart
index fc23b1b4..b731b951 100644
--- a/test/features/chat/models/chat_message_model_test.dart
+++ b/test/features/chat/models/chat_message_model_test.dart
@@ -54,7 +54,7 @@ void main() {
         isRead: false,
         isCurrentUserAuthor: true,
         roomId: 'room-1',
-        type: 'text',
+        type: ChatMessageType.text,
       );
 
       final json = model.toJson();
diff --git a/test/features/chat/models/chat_messages_model_test.dart b/test/features/chat/models/chat_messages_model_test.dart
index 0eab83cf..630bcb36 100644
--- a/test/features/chat/models/chat_messages_model_test.dart
+++ b/test/features/chat/models/chat_messages_model_test.dart
@@ -48,7 +48,7 @@ void main() {
         isRead: false,
         isCurrentUserAuthor: true,
         roomId: 'room-1',
-        type: 'text',
+        type: ChatMessageType.text,
       );
 
       const meta = ChatMetaModel(lastPage: 1);
diff --git a/test/features/chat/models/chat_user_model_test.dart b/test/features/chat/models/chat_user_model_test.dart
index fb825d10..bc913e9b 100644
--- a/test/features/chat/models/chat_user_model_test.dart
+++ b/test/features/chat/models/chat_user_model_test.dart
@@ -28,12 +28,14 @@ void main() {
       expect(model.profilePhotoUrl, isNull);
     });
 
-    test('fromJson создает ChatUserModel из JSON', () {
+    test('fromJson creates ChatUserModel from JSON', () {
       final json = {
         'id': 1,
         'name': 'User Name',
         'slug': 'user-slug',
         'profile_photo_url': 'https://example.com/photo.jpg',
+        'is_online': true,
+        'last_seen_text': 'был(а) недавно',
       };
 
       final model = ChatUserModel.fromJson(json);
@@ -42,6 +44,8 @@ void main() {
       expect(model.name, 'User Name');
       expect(model.slug, 'user-slug');
       expect(model.profilePhotoUrl, 'https://example.com/photo.jpg');
+      expect(model.isOnline, isTrue);
+      expect(model.lastSeenText, 'был(а) недавно');
     });
 
     test('fromJson создает ChatUserModel из JSON без фото', () {
diff --git a/test/features/chat/presentation/bloc/chat_room_cubit_test.dart b/test/features/chat/presentation/bloc/chat_room_cubit_test.dart
index d1f14bba..38793443 100644
--- a/test/features/chat/presentation/bloc/chat_room_cubit_test.dart
+++ b/test/features/chat/presentation/bloc/chat_room_cubit_test.dart
@@ -200,7 +200,7 @@ void main() {
 
     test('markMessagesAsRead - отмечает сообщения как прочитанные', () async {
       const chatId = 'chat-id';
-      final messagesIds = [(id: 1, index: 0)];
+      final messagesIds = [1];
 
       // Сначала инициализируем чат
       when(mockChatRepository.getChatRoom(any)).thenAnswer((_) async => testChatRoom);
@@ -1443,5 +1443,218 @@ void main() {
 
       verifyNever(mockChatRepository.getChatMessages(any, any));
     });
+
+    test('addIncomingMessage - добавляет входящее сообщение в начало списка', () async {
+      const uuid = 'room-uuid';
+      when(mockChatRepository.getChatRoom(uuid)).thenAnswer((_) async => testChatRoom);
+      when(mockChatRepository.getChatMessages(uuid, 1)).thenAnswer((_) async => testChatMessages);
+      when(mockWsManager.client).thenReturn(null);
+      when(mockWsManager.initPrivateDirectChatChannel(any)).thenAnswer((_) async => Future.value());
+      when(mockWsManager.subscribeDirectChatChannel()).thenReturn(null);
+      when(mockWsManager.directChatStream).thenReturn(null);
+      when(mockWsManager.clientTypingStream).thenReturn(null);
+      when(mockChatRepository.getChosenPlan(id: anyNamed('id'))).thenAnswer((_) async => throw Exception('No plan'));
+
+      await chatRoomCubit.initChat(uuid);
+      await Future.delayed(const Duration(milliseconds: 200));
+
+      final incoming = ChatMessageModel(
+        id: 99,
+        data: 'Incoming socket message',
+        mediaData: null,
+        authorId: 2,
+        updatedAt: DateTime.now(),
+        isRead: false,
+        isCurrentUserAuthor: false,
+        roomId: 'chat-id',
+      );
+
+      chatRoomCubit.addIncomingMessage(incoming);
+
+      final state = chatRoomCubit.state as ChatRoomStateLoaded;
+      expect(state.chatMessages.first.id, 99);
+      expect(state.chatMessages.length, 2);
+    });
+
+    test('addIncomingMessage - не добавляет дубликат по id', () async {
+      const uuid = 'room-uuid';
+      when(mockChatRepository.getChatRoom(uuid)).thenAnswer((_) async => testChatRoom);
+      when(mockChatRepository.getChatMessages(uuid, 1)).thenAnswer((_) async => testChatMessages);
+      when(mockWsManager.client).thenReturn(null);
+      when(mockWsManager.initPrivateDirectChatChannel(any)).thenAnswer((_) async => Future.value());
+      when(mockWsManager.subscribeDirectChatChannel()).thenReturn(null);
+      when(mockWsManager.directChatStream).thenReturn(null);
+      when(mockWsManager.clientTypingStream).thenReturn(null);
+      when(mockChatRepository.getChosenPlan(id: anyNamed('id'))).thenAnswer((_) async => throw Exception('No plan'));
+
+      await chatRoomCubit.initChat(uuid);
+      await Future.delayed(const Duration(milliseconds: 200));
+
+      final incoming = ChatMessageModel(
+        id: 1,
+        data: 'Duplicate of existing',
+        mediaData: null,
+        authorId: 2,
+        updatedAt: DateTime.now(),
+        isRead: false,
+        isCurrentUserAuthor: false,
+        roomId: 'chat-id',
+      );
+
+      chatRoomCubit.addIncomingMessage(incoming);
+
+      final state = chatRoomCubit.state as ChatRoomStateLoaded;
+      expect(state.chatMessages.length, 1);
+      expect(state.chatMessages.first.data, 'Test message');
+    });
+
+    test('addIncomingMessage - игнорирует собственные сообщения', () async {
+      const uuid = 'room-uuid';
+      when(mockChatRepository.getChatRoom(uuid)).thenAnswer((_) async => testChatRoom);
+      when(mockChatRepository.getChatMessages(uuid, 1)).thenAnswer((_) async => testChatMessages);
+      when(mockWsManager.client).thenReturn(null);
+      when(mockWsManager.userId).thenReturn(1);
+      when(mockWsManager.initPrivateDirectChatChannel(any)).thenAnswer((_) async => Future.value());
+      when(mockWsManager.subscribeDirectChatChannel()).thenReturn(null);
+      when(mockWsManager.directChatStream).thenReturn(null);
+      when(mockWsManager.clientTypingStream).thenReturn(null);
+      when(mockChatRepository.getChosenPlan(id: anyNamed('id'))).thenAnswer((_) async => throw Exception('No plan'));
+
+      await chatRoomCubit.initChat(uuid);
+      await Future.delayed(const Duration(milliseconds: 200));
+
+      chatRoomCubit.addIncomingMessage(
+        ChatMessageModel(
+          id: 77,
+          data: 'Own echo',
+          mediaData: null,
+          authorId: 1,
+          updatedAt: DateTime.now(),
+          isRead: true,
+          isCurrentUserAuthor: true,
+          roomId: 'chat-id',
+        ),
+      );
+
+      final state = chatRoomCubit.state as ChatRoomStateLoaded;
+      expect(state.chatMessages.length, 1);
+      expect(state.chatMessages.any((message) => message.id == 77), isFalse);
+    });
+
+    test('updateChosenPlanState - не затирает сообщения, пришедшие во время запроса', () async {
+      const uuid = 'room-uuid';
+      const planId = 123;
+      final chatRoomWithPlan = testChatRoom.copyWith(chosenPlanId: planId);
+      const testPlan = PlanModel(
+        id: 1,
+        slug: 'test-plan',
+        name: 'Test Plan',
+        image: 'https://example.com/image.jpg',
+        duration: 7,
+        state: 'active',
+        type: PlanType(fit: true, slim: false, behavior: false, wellness: false),
+        details: 'Test details',
+        packetsCount: 3,
+        author: Author(authorSlug: 'author', authorName: 'Author Name', authorProfileIcon: 'https://example.com/icon.jpg', authorIsMe: false),
+        totalLikes: 10,
+        totalViews: 100,
+        totalComments: 5,
+        isFavorite: false,
+        minPriceOfOptions: 1000,
+        maxPriceOfOptions: 2000,
+        wasLikedByMe: false,
+      );
+      final chosenPlan = ChosenPlanModel(
+        id: planId,
+        optionType: 'options1',
+        startDate: DateTime.now(),
+        chosenPlanState: ChosenPlanStateEnum.stateStarted,
+        chatId: 'chat-1',
+        consultantId: 1,
+        plan: testPlan,
+      );
+      final updatedPlan = chosenPlan.copyWith(chosenPlanState: ChosenPlanStateEnum.statePaid);
+      final planCompleter = Completer<ChosenPlanModel>();
+      var getChosenPlanCalls = 0;
+
+      when(mockChatRepository.getChatRoom(uuid)).thenAnswer((_) async => chatRoomWithPlan);
+      when(mockChatRepository.getChatMessages(uuid, 1)).thenAnswer((_) async => testChatMessages);
+      when(mockChatRepository.getChosenPlan(id: planId)).thenAnswer((_) {
+        getChosenPlanCalls++;
+        if (getChosenPlanCalls == 1) {
+          return Future.value(chosenPlan);
+        }
+        return planCompleter.future;
+      });
+      when(mockWsManager.client).thenReturn(null);
+      when(mockWsManager.initPrivateDirectChatChannel(any)).thenAnswer((_) async => Future.value());
+      when(mockWsManager.subscribeDirectChatChannel()).thenReturn(null);
+      when(mockWsManager.directChatStream).thenReturn(null);
+      when(mockWsManager.clientTypingStream).thenReturn(null);
+
+      await chatRoomCubit.initChat(uuid);
+      await Future.delayed(const Duration(milliseconds: 200));
+
+      final updateFuture = chatRoomCubit.updateChosenPlanState();
+      chatRoomCubit.addIncomingMessage(
+        ChatMessageModel(
+          id: 55,
+          data: 'Arrived during plan poll',
+          mediaData: null,
+          authorId: 2,
+          updatedAt: DateTime.now(),
+          isRead: false,
+          isCurrentUserAuthor: false,
+          roomId: 'chat-id',
+        ),
+      );
+
+      planCompleter.complete(updatedPlan);
+      await updateFuture;
+
+      final state = chatRoomCubit.state as ChatRoomStateLoaded;
+      expect(state.chatMessages.any((message) => message.id == 55), isTrue);
+      expect(state.chatRoom.chosenPlan?.chosenPlanState, ChosenPlanStateEnum.statePaid);
+    });
+
+    test('markMessagesAsRead - не затирает сообщения, пришедшие во время запроса', () async {
+      const uuid = 'room-uuid';
+      const chatId = 'chat-id';
+      final markCompleter = Completer<void>();
+
+      when(mockChatRepository.getChatRoom(uuid)).thenAnswer((_) async => testChatRoom);
+      when(mockChatRepository.getChatMessages(uuid, 1)).thenAnswer((_) async => testChatMessages);
+      when(mockWsManager.client).thenReturn(null);
+      when(mockWsManager.initPrivateDirectChatChannel(any)).thenAnswer((_) async => Future.value());
+      when(mockWsManager.subscribeDirectChatChannel()).thenReturn(null);
+      when(mockWsManager.directChatStream).thenReturn(null);
+      when(mockWsManager.clientTypingStream).thenReturn(null);
+      when(mockChatRepository.getChosenPlan(id: anyNamed('id'))).thenAnswer((_) async => throw Exception('No plan'));
+      when(mockChatRepository.markMessagesAsRead(chatId, [1])).thenAnswer((_) => markCompleter.future);
+
+      await chatRoomCubit.initChat(uuid);
+      await Future.delayed(const Duration(milliseconds: 200));
+
+      final markFuture = chatRoomCubit.markMessagesAsRead(chatId, [1]);
+      chatRoomCubit.addIncomingMessage(
+        ChatMessageModel(
+          id: 88,
+          data: 'Arrived during mark as read',
+          mediaData: null,
+          authorId: 2,
+          updatedAt: DateTime.now(),
+          isRead: false,
+          isCurrentUserAuthor: false,
+          roomId: chatId,
+        ),
+      );
+
+      markCompleter.complete();
+      await markFuture;
+
+      final state = chatRoomCubit.state as ChatRoomStateLoaded;
+      expect(state.chatMessages.any((message) => message.id == 88), isTrue);
+      expect(state.chatMessages.firstWhere((message) => message.id == 1).isRead, isTrue);
+    });
   });
 }
diff --git a/test/features/chat/presentation/bloc/chats_cubit_test.dart b/test/features/chat/presentation/bloc/chats_cubit_test.dart
index 9f8dca92..c3af3197 100644
--- a/test/features/chat/presentation/bloc/chats_cubit_test.dart
+++ b/test/features/chat/presentation/bloc/chats_cubit_test.dart
@@ -336,7 +336,7 @@ void main() {
         isRead: false,
         isCurrentUserAuthor: true,
         roomId: chatId,
-        type: 'text',
+        type: ChatMessageType.text,
       );
 
       // Используем рефлексию для вызова приватного метода через тестовый доступ
@@ -390,7 +390,7 @@ void main() {
         isRead: false,
         isCurrentUserAuthor: true,
         roomId: chatId,
-        type: 'text',
+        type: ChatMessageType.text,
       );
 
       final streamController = StreamController<ChatMessageModel>();
diff --git a/test/features/chat/presentation/pages/chat_screen_loaded_smoke_test.dart b/test/features/chat/presentation/pages/chat_screen_loaded_smoke_test.dart
index 6d705f9b..d017b976 100644
--- a/test/features/chat/presentation/pages/chat_screen_loaded_smoke_test.dart
+++ b/test/features/chat/presentation/pages/chat_screen_loaded_smoke_test.dart
@@ -2,6 +2,7 @@ import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/app_initializer.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/theme_helper.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_model.dart';
 import 'package:eatvio_app/features/chat/models/chat_room_settings_model.dart';
@@ -37,6 +38,7 @@ void main() {
     setUp(() async {
       await sl.reset();
       sl.registerLazySingleton<AppConfig>(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
+      sl.registerLazySingleton<WsManager>(() => _FakeWsManager());
     });
 
     const fakeSvg = '''
@@ -175,6 +177,11 @@ void main() {
   });
 }
 
+class _FakeWsManager extends Fake implements WsManager {
+  @override
+  int? userId = 1;
+}
+
 class _FakeAssetBundle extends CachingAssetBundle {
   _FakeAssetBundle(this.assets);
   final Map<String, String> assets;
diff --git a/test/features/consultant/become_consultant/entities/diploma_entity_test.dart b/test/features/consultant/become_consultant/entities/diploma_entity_test.dart
index e0f0e80b..3604a737 100644
--- a/test/features/consultant/become_consultant/entities/diploma_entity_test.dart
+++ b/test/features/consultant/become_consultant/entities/diploma_entity_test.dart
@@ -33,4 +33,3 @@ void main() {
     });
   });
 }
-
diff --git a/test/features/consultant/become_consultant/models/consultant_cert_photo_model_test.dart b/test/features/consultant/become_consultant/models/consultant_cert_photo_model_test.dart
index 19292196..b1a832c6 100644
--- a/test/features/consultant/become_consultant/models/consultant_cert_photo_model_test.dart
+++ b/test/features/consultant/become_consultant/models/consultant_cert_photo_model_test.dart
@@ -100,4 +100,3 @@ void main() {
     });
   });
 }
-
diff --git a/test/features/consultant/become_consultant/models/consultant_profile_model_test.dart b/test/features/consultant/become_consultant/models/consultant_profile_model_test.dart
index 3b008a3f..82a2ab44 100644
--- a/test/features/consultant/become_consultant/models/consultant_profile_model_test.dart
+++ b/test/features/consultant/become_consultant/models/consultant_profile_model_test.dart
@@ -63,7 +63,10 @@ void main() {
     });
 
     test('toJson serializes all fields correctly', () {
-      const model = CertificatesModel(title: 'Certificate Title', date: '2024-01-15');
+      const model = CertificatesModel(
+        title: 'Certificate Title',
+        date: '2024-01-15',
+      );
 
       final json = model.toJson();
 
@@ -105,8 +108,21 @@ void main() {
 
     test('toJson serializes all fields correctly', () {
       const socialLinks = SocialLinksModel(vkLink: 'https://vk.com/user');
-      const certificates = CertificatesModel(title: 'Course 1', date: '2024-01-01');
-      const model = ConsultantProfileModel(hasMedicalEducation: true, socialLinks: socialLinks, photos: ['photo1.jpg'], certificates: [certificates]);
+      const certificates = CertificatesModel(
+        title: 'Course 1',
+        date: '2024-01-01',
+      );
+      const model = ConsultantProfileModel(
+        hasMedicalEducation: true,
+        socialLinks: socialLinks,
+        photos: ['photo1.jpg'],
+        certificates: [certificates],
+        legalType: 'individualPerson',
+        inn: '123456789012',
+        snils: '123-456-789 00',
+        agreementAccepted: true,
+        frdoAgreementAccepted: true,
+      );
 
       final json = model.toJson();
 
@@ -114,6 +130,38 @@ void main() {
       expect(json['social_links'], isNotNull);
       expect(json['cert_photos'], ['photo1.jpg']);
       expect(json['completed_courses'], isNotNull);
+      expect(json['legal_type'], 'individualPerson');
+      expect(json['inn'], '123456789012');
+      expect(json['snils'], '123-456-789 00');
+      expect(json['agreement_accepted'], isTrue);
+      expect(json['frdo_agreement_accepted'], isTrue);
+    });
+
+    test('hasValidPassportData validates required individualPerson fields', () {
+      const valid = ConsultantProfileModel(
+        lastName: 'Иванов',
+        firstName: 'Иван',
+        inn: '123456789012',
+        snils: '123-456-789 00',
+        passportSeries: '1234',
+        passportNumber: '567890',
+        passportIssueDate: '2020-01-15',
+        passportIssuer: 'ОВД',
+        passportIssuerCode: '772-053',
+        birthDate: '1990-05-20',
+        birthPlace: 'Москва',
+        registrationAddress: 'Адрес 1',
+        residenceAddress: 'Адрес 2',
+        citizenship: 'RU',
+      );
+
+      expect(valid.hasValidPassportData, isTrue);
+      expect(valid.copyWith(inn: '123').hasValidPassportData, isFalse);
+      expect(valid.copyWith(lastName: '').hasValidPassportData, isFalse);
+      expect(
+        valid.copyWith(birthDate: '2020-02-31').hasValidPassportData,
+        isFalse,
+      );
     });
   });
 }
diff --git a/test/features/consultant/become_consultant/models/consultation_request_model_test.dart b/test/features/consultant/become_consultant/models/consultation_request_model_test.dart
index 7dd05d98..11c95acb 100644
--- a/test/features/consultant/become_consultant/models/consultation_request_model_test.dart
+++ b/test/features/consultant/become_consultant/models/consultation_request_model_test.dart
@@ -1,3 +1,4 @@
+import 'package:eatvio_app/features/consultant/become_consultant/enums/alfa_scoring_status.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultation_request_model.dart';
 import 'package:eatvio_app/features/profile/models/profile_model.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -46,7 +47,11 @@ void main() {
     });
 
     test('fromJson handles null additional field', () {
-      final json = {'title': 'Test title', 'status': 'canceled', 'additional': null};
+      final json = {
+        'title': 'Test title',
+        'status': 'canceled',
+        'additional': null,
+      };
 
       final model = CanceledModerationModel.fromJson(json);
 
@@ -56,7 +61,11 @@ void main() {
     });
 
     test('toJson serializes all fields correctly', () {
-      const model = CanceledModerationModel(title: 'Test title', status: ModerationStatus.canceled, additional: ['reason1', 'reason2']);
+      const model = CanceledModerationModel(
+        title: 'Test title',
+        status: ModerationStatus.canceled,
+        additional: ['reason1', 'reason2'],
+      );
 
       final json = model.toJson();
 
@@ -122,10 +131,67 @@ void main() {
       expect(model.canceledModeration!.status, ModerationStatus.canceled);
     });
 
+    test('fromJson parses legal_entity_resource', () {
+      final json = {
+        'rating_place': 5,
+        'education_resource': {'request_state': 'approved'},
+        'cert_photos': [],
+        'legal_entity_resource': {
+          'id': 1,
+          'type': 'individualPerson',
+          'inn': '123456789012',
+          'snils': '123-456-789 00',
+          'state': 'created',
+          'alfa_scoring_status': 'scoring_failed',
+          'alfa_scoring_request_id': 'abc',
+          'passport_series': '1234',
+          'passport_number': '567890',
+          'passport_issue_date': '2020-01-15T00:00:00.000000Z',
+          'passport_issuer': 'ОВД',
+          'passport_issuer_code': '772-053',
+          'birth_date': '1990-05-20',
+          'birth_place': 'Москва',
+          'registration_address': 'Адрес 1',
+          'residence_address': 'Адрес 2',
+        },
+      };
+
+      final model = ConsultationRequestModel.fromJson(json);
+
+      expect(model.legalEntity, isNotNull);
+      expect(model.legalEntity!.type, 'individualPerson');
+      expect(model.legalEntity!.inn, '123456789012');
+      expect(model.legalEntity!.passportSeries, '1234');
+      expect(model.legalEntity!.normalizedPassportIssueDate, '2020-01-15');
+      expect(
+        model.legalEntity!.alfaScoringStatus,
+        AlfaScoringStatus.scoringFailed,
+      );
+    });
+
+    test('normalizeApiDate strips time from DateTime.toString format', () {
+      expect(
+        LegalEntityModel.normalizeApiDate('2023-09-22 00:00:00.000'),
+        '2023-09-22',
+      );
+      expect(LegalEntityModel.normalizeApiDate('2023-09-22'), '2023-09-22');
+      expect(LegalEntityModel.normalizeApiDate(null), isNull);
+    });
+
     test('toJson serializes ConsultationRequestModel correctly', () {
-      const educationModel = EducationModel(requestState: ModerationStatus.approved);
-      const photos = [CertPhotosModel(url: 'https://example.com/photo1.jpg'), CertPhotosModel(url: 'https://example.com/photo2.jpg')];
-      const model = ConsultationRequestModel(ratingPlace: 5, educationModel: educationModel, photos: photos, canceledModeration: null);
+      const educationModel = EducationModel(
+        requestState: ModerationStatus.approved,
+      );
+      const photos = [
+        CertPhotosModel(url: 'https://example.com/photo1.jpg'),
+        CertPhotosModel(url: 'https://example.com/photo2.jpg'),
+      ];
+      const model = ConsultationRequestModel(
+        ratingPlace: 5,
+        educationModel: educationModel,
+        photos: photos,
+        canceledModeration: null,
+      );
 
       final json = model.toJson();
 
diff --git a/test/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state_test.dart b/test/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state_test.dart
index 48a90b13..beb67773 100644
--- a/test/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state_test.dart
+++ b/test/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state_test.dart
@@ -12,7 +12,7 @@ void main() {
         acceptOffer: false,
         loading: false,
         requestModel: null,
-        isUpdating: false
+        isUpdating: false,
       );
 
       expect(state.consultant, consultant);
@@ -20,6 +20,8 @@ void main() {
       expect(state.loading, false);
       expect(state.requestModel, isNull);
       expect(state.certPhotos, isEmpty);
+      expect(state.awaitingScoringOutcome, isFalse);
+      expect(state.fieldErrors, isEmpty);
     });
 
     test('creates instance with custom values', () {
@@ -38,7 +40,7 @@ void main() {
         loading: true,
         requestModel: null,
         certPhotos: [certPhoto],
-        isUpdating: false
+        isUpdating: false,
       );
 
       expect(state.acceptOffer, true);
@@ -54,7 +56,7 @@ void main() {
         acceptOffer: false,
         loading: false,
         requestModel: null,
-        isUpdating: false
+        isUpdating: false,
       );
 
       final updatedState = originalState.copyWith(
@@ -92,7 +94,7 @@ void main() {
         loading: false,
         requestModel: null,
         certPhotos: [certPhoto1],
-        isUpdating: false
+        isUpdating: false,
       );
 
       final updatedState = originalState.copyWith(
@@ -100,9 +102,14 @@ void main() {
       );
 
       expect(updatedState.certPhotos.length, 2);
-      expect(updatedState.certPhotos.first.url, 'https://example.com/photo1.jpg');
-      expect(updatedState.certPhotos.last.url, 'https://example.com/photo2.jpg');
+      expect(
+        updatedState.certPhotos.first.url,
+        'https://example.com/photo1.jpg',
+      );
+      expect(
+        updatedState.certPhotos.last.url,
+        'https://example.com/photo2.jpg',
+      );
     });
   });
 }
-
diff --git a/test/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit_test.dart b/test/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit_test.dart
index a721050b..f9118d8f 100644
--- a/test/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit_test.dart
+++ b/test/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit_test.dart
@@ -1,6 +1,9 @@
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/enums/alfa_scoring_status.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_cert_photo_model.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_profile_model.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultation_request_model.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/models/sbp_bank_model.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/repositories/consultant_repository.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -23,16 +26,50 @@ void main() {
     late RegisterConsultantCubit cubit;
     late ConsultationRequestModel requestModel;
     late List<ConsultantCertPhotoModel> certPhotosFromFixture;
+    late List<SbpBankModel> sbpBanksFromFixture;
     late ConsultantProfileModel consultantProfile;
 
+    ConsultationRequestModel requestWithScoring(String scoringStatus) {
+      final json = FixtureReader.readAsMap(
+        'consultant/consultation_request.json',
+      );
+      final legal = Map<String, dynamic>.from(
+        json['legal_entity_resource'] as Map,
+      );
+      legal['alfa_scoring_status'] = scoringStatus;
+      json['legal_entity_resource'] = legal;
+      return ConsultationRequestModel.fromJson(json);
+    }
+
     setUp(() {
       repository = MockConsultantRepository();
-      cubit = RegisterConsultantCubit(consultantRepository: repository);
-      requestModel = ConsultationRequestModel.fromJson(FixtureReader.readAsMap('consultant/consultation_request.json'));
-      certPhotosFromFixture = FixtureReader.readAsList(
-        'consultant/consultant_cert_photos.json',
-      ).map((item) => ConsultantCertPhotoModel.fromJson(item as Map<String, dynamic>)).toList();
-      consultantProfile = ConsultantProfileModel.fromJson(FixtureReader.readAsMap('consultant/consultant_profile_request.json'));
+      cubit = RegisterConsultantCubit(
+        consultantRepository: repository,
+        scoringPollInterval: const Duration(milliseconds: 30),
+      );
+      requestModel = ConsultationRequestModel.fromJson(
+        FixtureReader.readAsMap('consultant/consultation_request.json'),
+      );
+      certPhotosFromFixture =
+          FixtureReader.readAsList('consultant/consultant_cert_photos.json')
+              .map(
+                (item) => ConsultantCertPhotoModel.fromJson(
+                  item as Map<String, dynamic>,
+                ),
+              )
+              .toList();
+      sbpBanksFromFixture =
+          FixtureReader.readAsList('consultant/sbp_banks.json')
+              .map(
+                (item) => SbpBankModel.fromJson(item as Map<String, dynamic>),
+              )
+              .toList();
+      consultantProfile = ConsultantProfileModel.fromJson(
+        FixtureReader.readAsMap('consultant/consultant_profile_request.json'),
+      );
+      when(
+        () => repository.getSbpBanks(),
+      ).thenAnswer((_) async => sbpBanksFromFixture);
     });
 
     tearDown(() async {
@@ -44,11 +81,16 @@ void main() {
       expect(cubit.state.consultant.hasMedicalEducation, isTrue);
       expect(cubit.state.acceptOffer, isFalse);
       expect(cubit.state.requestModel, isNull);
+      expect(cubit.state.alfaScoringStatus, AlfaScoringStatus.none);
     });
 
     test('getMyRequestStatus hydrates state with backend data', () async {
-      when(() => repository.getMyRequestStatus(any<String>())).thenAnswer((_) async => requestModel);
-      when(() => repository.getConsultantCertPhotos()).thenAnswer((_) async => certPhotosFromFixture);
+      when(
+        () => repository.getMyRequestStatus(any<String>()),
+      ).thenAnswer((_) async => requestModel);
+      when(
+        () => repository.getConsultantCertPhotos(),
+      ).thenAnswer((_) async => certPhotosFromFixture);
 
       await cubit.getMyRequestStatus('my-consultant-slug');
 
@@ -56,53 +98,308 @@ void main() {
       expect(state.loading, isFalse);
       expect(state.requestModel, equals(requestModel));
       expect(state.consultant.certificates, isNotNull);
-      // Certificates list is built from backend courses; we just ensure it is not empty.
       expect(state.consultant.certificates!.length, greaterThan(0));
       expect(state.consultant.certificates!.first.title, 'Нутрициология PRO');
-      expect(state.consultant.socialLinks?.instaLink, isNull, reason: 'empty links are sanitized');
+      expect(
+        state.consultant.socialLinks?.instaLink,
+        isNull,
+        reason: 'empty links are sanitized',
+      );
       expect(state.consultant.socialLinks?.vkLink, 'https://vk.com/consultant');
-      // All cert photos from backend are kept in state (visible + hidden).
+      expect(state.consultant.legalType, 'individualPerson');
+      expect(state.consultant.inn, '123456789012');
+      expect(state.consultant.passportSeries, '1234');
+      expect(state.consultant.passportIssueDate, '2020-01-15');
+      expect(state.consultant.birthPlace, 'г. Москва');
       expect(state.certPhotos, hasLength(3));
-      expect(state.certPhotos.map((e) => e.id), containsAll(<int>[101, 102, 103]));
-      verify(() => repository.getMyRequestStatus('my-consultant-slug')).called(1);
+      expect(
+        state.certPhotos.map((e) => e.id),
+        containsAll(<int>[101, 102, 103]),
+      );
+      expect(state.sbpBanks, hasLength(2));
+      expect(state.sbpBanks.first.bankName, 'Сбербанк');
+      expect(state.alfaScoringStatus, AlfaScoringStatus.scoringFailed);
+      expect(state.alfaScoringStatus.canRetry, isTrue);
+      expect(state.isScoringPolling, isFalse);
+      expect(
+        state.awaitingScoringOutcome,
+        isFalse,
+        reason: 'hydrate must not arm success sheet',
+      );
+      verify(
+        () => repository.getMyRequestStatus('my-consultant-slug'),
+      ).called(1);
       verify(() => repository.getConsultantCertPhotos()).called(1);
+      verify(() => repository.getSbpBanks()).called(1);
     });
 
+    test(
+      'getMyRequestStatus with processing status starts scoring poll',
+      () async {
+        final pending = requestWithScoring('scoring_pending');
+        final complete = requestWithScoring('scoring_complete');
+        var calls = 0;
+        when(() => repository.getMyRequestStatus(any<String>())).thenAnswer((
+          _,
+        ) async {
+          calls++;
+          return calls == 1 ? pending : complete;
+        });
+        when(
+          () => repository.getConsultantCertPhotos(),
+        ).thenAnswer((_) async => certPhotosFromFixture);
+
+        await cubit.getMyRequestStatus('my-consultant-slug');
+
+        expect(cubit.state.alfaScoringStatus, AlfaScoringStatus.scoringPending);
+        expect(cubit.state.isScoringPolling, isTrue);
+
+        await Future<void>.delayed(const Duration(milliseconds: 50));
+        expect(
+          cubit.state.alfaScoringStatus,
+          AlfaScoringStatus.scoringComplete,
+        );
+        expect(cubit.state.isScoringPolling, isFalse);
+      },
+    );
+
     test('disableLoading stops spinner and loads cert photos', () async {
-      when(() => repository.getConsultantCertPhotos()).thenAnswer((_) async => certPhotosFromFixture);
+      when(
+        () => repository.getConsultantCertPhotos(),
+      ).thenAnswer((_) async => certPhotosFromFixture);
 
+      await cubit.disableLoading(slug: 'my-consultant-slug');
+
+      expect(cubit.state.loading, isFalse);
+      expect(cubit.state.certPhotos, hasLength(3));
+      expect(cubit.state.sbpBanks, hasLength(2));
+      expect(cubit.userSlug, 'my-consultant-slug');
+      verify(() => repository.getConsultantCertPhotos()).called(1);
+      verify(() => repository.getSbpBanks()).called(1);
+    });
+
+    test('searchSbpBanks filters banks by name', () async {
+      when(
+        () => repository.getConsultantCertPhotos(),
+      ).thenAnswer((_) async => certPhotosFromFixture);
       await cubit.disableLoading();
 
-      expect(cubit.state.loading, isFalse);
-      // disableLoading now keeps all photos from repository.
-      expect(cubit.state.certPhotos, hasLength(3));
-      verify(() => repository.getConsultantCertPhotos()).called(1);
+      final results = cubit.searchSbpBanks('сбер');
+
+      expect(results, hasLength(1));
+      expect(results.first.bankMemberId, '100000000111');
     });
 
-    test('updateConsultantProfileModel replaces consultant data and offer flag', () {
-      cubit.updateConsultantProfileModel(consultantProfile, true);
-
-      expect(cubit.state.consultant, consultantProfile);
-      expect(cubit.state.acceptOffer, isTrue);
-      expect(cubit.state.loading, isFalse);
-    });
-
-    test('registerConsultant forwards payload with update=false by default', () async {
+    test('findSbpBankById returns matching bank', () async {
       when(
-        () => repository.registerConsultant(
-          consultant: any<ConsultantProfileModel>(named: 'consultant'),
-          update: any<bool>(named: 'update'),
-        ),
-      ).thenAnswer((_) async {});
+        () => repository.getConsultantCertPhotos(),
+      ).thenAnswer((_) async => certPhotosFromFixture);
+      await cubit.disableLoading();
 
-      await cubit.registerConsultant();
+      final bank = cubit.findSbpBankById('100000000004');
 
-      verify(() => repository.registerConsultant(consultant: cubit.state.consultant, update: false)).called(1);
+      expect(bank?.bankName, 'Т-Банк');
     });
 
-    test('registerConsultant sends update=true after getMyRequestStatus call', () async {
-      when(() => repository.getMyRequestStatus(any<String>())).thenAnswer((_) async => requestModel);
-      when(() => repository.getConsultantCertPhotos()).thenAnswer((_) async => certPhotosFromFixture);
+    test(
+      'updateConsultantProfileModel replaces consultant data and offer flag',
+      () {
+        cubit.updateConsultantProfileModel(consultantProfile, true);
+
+        expect(cubit.state.consultant, consultantProfile);
+        expect(cubit.state.acceptOffer, isTrue);
+        expect(cubit.state.loading, isFalse);
+      },
+    );
+
+    test(
+      'registerConsultant forwards payload with update=false by default',
+      () async {
+        when(
+          () => repository.registerConsultant(
+            consultant: any<ConsultantProfileModel>(named: 'consultant'),
+            update: any<bool>(named: 'update'),
+          ),
+        ).thenAnswer((_) async {});
+
+        cubit.updateConsultantProfileModel(consultantProfile);
+        cubit.updateAgreements(acceptOffer: true, acceptFrdoAgreement: true);
+        await cubit.registerConsultant();
+
+        final captured =
+            verify(
+                  () => repository.registerConsultant(
+                    consultant: captureAny<ConsultantProfileModel>(
+                      named: 'consultant',
+                    ),
+                    update: false,
+                  ),
+                ).captured.single
+                as ConsultantProfileModel;
+
+        expect(captured.legalType, 'individualPerson');
+        expect(captured.agreementAccepted, isTrue);
+        expect(captured.frdoAgreementAccepted, isTrue);
+        expect(captured.inn, isNotNull);
+        expect(
+          cubit.state.alfaScoringStatus,
+          AlfaScoringStatus.beneficiaryCreating,
+        );
+        expect(
+          cubit.state.isScoringPolling,
+          isFalse,
+          reason: 'no slug for poll',
+        );
+        expect(
+          cubit.state.awaitingScoringOutcome,
+          isFalse,
+          reason: 'cannot await scoring without slug',
+        );
+      },
+    );
+
+    test(
+      'getMyRequestStatus with scoring_complete does not arm awaiting flag',
+      () async {
+        when(
+          () => repository.getMyRequestStatus(any<String>()),
+        ).thenAnswer((_) async => requestWithScoring('scoring_complete'));
+        when(
+          () => repository.getConsultantCertPhotos(),
+        ).thenAnswer((_) async => certPhotosFromFixture);
+
+        await cubit.getMyRequestStatus('my-consultant-slug');
+
+        expect(
+          cubit.state.alfaScoringStatus,
+          AlfaScoringStatus.scoringComplete,
+        );
+        expect(cubit.state.awaitingScoringOutcome, isFalse);
+      },
+    );
+
+    test(
+      'registerConsultant with slug starts scoring poll after submit',
+      () async {
+        when(
+          () => repository.getConsultantCertPhotos(),
+        ).thenAnswer((_) async => certPhotosFromFixture);
+        when(
+          () => repository.getMyRequestStatus(any<String>()),
+        ).thenAnswer((_) async => requestWithScoring('scoring_complete'));
+        when(
+          () => repository.registerConsultant(
+            consultant: any<ConsultantProfileModel>(named: 'consultant'),
+            update: any<bool>(named: 'update'),
+          ),
+        ).thenAnswer((_) async {});
+
+        await cubit.disableLoading(slug: 'my-consultant-slug');
+        cubit.updateConsultantProfileModel(consultantProfile);
+        cubit.updateAgreements(acceptOffer: true, acceptFrdoAgreement: true);
+        await cubit.registerConsultant();
+
+        expect(
+          cubit.state.alfaScoringStatus,
+          AlfaScoringStatus.beneficiaryCreating,
+        );
+        expect(cubit.state.isScoringPolling, isTrue);
+        expect(cubit.state.awaitingScoringOutcome, isTrue);
+
+        await Future<void>.delayed(const Duration(milliseconds: 50));
+        expect(
+          cubit.state.alfaScoringStatus,
+          AlfaScoringStatus.scoringComplete,
+        );
+        expect(cubit.state.isScoringPolling, isFalse);
+        expect(
+          cubit.state.awaitingScoringOutcome,
+          isFalse,
+          reason: 'flag clears on terminal scoring for one-shot success sheet',
+        );
+      },
+    );
+
+    test(
+      'scoring poll failed clears awaiting flag without leaving processing',
+      () async {
+        when(
+          () => repository.getConsultantCertPhotos(),
+        ).thenAnswer((_) async => certPhotosFromFixture);
+        when(
+          () => repository.getMyRequestStatus(any<String>()),
+        ).thenAnswer((_) async => requestWithScoring('scoring_failed'));
+        when(
+          () => repository.registerConsultant(
+            consultant: any<ConsultantProfileModel>(named: 'consultant'),
+            update: any<bool>(named: 'update'),
+          ),
+        ).thenAnswer((_) async {});
+
+        await cubit.disableLoading(slug: 'my-consultant-slug');
+        cubit.updateConsultantProfileModel(consultantProfile);
+        cubit.updateAgreements(acceptOffer: true, acceptFrdoAgreement: true);
+        await cubit.registerConsultant();
+
+        await Future<void>.delayed(const Duration(milliseconds: 50));
+        expect(cubit.state.alfaScoringStatus, AlfaScoringStatus.scoringFailed);
+        expect(cubit.state.isScoringPolling, isFalse);
+        expect(cubit.state.awaitingScoringOutcome, isFalse);
+        expect(cubit.state.alfaScoringStatus.canRetry, isTrue);
+      },
+    );
+
+    test(
+      'scoring poll keeps processing UI while API still returns none',
+      () async {
+        when(
+          () => repository.getConsultantCertPhotos(),
+        ).thenAnswer((_) async => certPhotosFromFixture);
+        var calls = 0;
+        when(() => repository.getMyRequestStatus(any<String>())).thenAnswer((
+          _,
+        ) async {
+          calls++;
+          if (calls <= 2) {
+            return requestWithScoring('none');
+          }
+          return requestWithScoring('scoring_complete');
+        });
+        when(
+          () => repository.registerConsultant(
+            consultant: any<ConsultantProfileModel>(named: 'consultant'),
+            update: any<bool>(named: 'update'),
+          ),
+        ).thenAnswer((_) async {});
+
+        await cubit.disableLoading(slug: 'my-consultant-slug');
+        cubit.updateConsultantProfileModel(consultantProfile);
+        cubit.updateAgreements(acceptOffer: true, acceptFrdoAgreement: true);
+        await cubit.registerConsultant();
+
+        await Future<void>.delayed(const Duration(milliseconds: 50));
+        expect(
+          cubit.state.alfaScoringStatus,
+          AlfaScoringStatus.beneficiaryCreating,
+        );
+        expect(cubit.state.isScoringPolling, isTrue);
+
+        await Future<void>.delayed(const Duration(milliseconds: 80));
+        expect(
+          cubit.state.alfaScoringStatus,
+          AlfaScoringStatus.scoringComplete,
+        );
+        expect(cubit.state.isScoringPolling, isFalse);
+      },
+    );
+
+    test('registerConsultant sends legal payload with update=true', () async {
+      when(
+        () => repository.getMyRequestStatus(any<String>()),
+      ).thenAnswer((_) async => requestModel);
+      when(
+        () => repository.getConsultantCertPhotos(),
+      ).thenAnswer((_) async => certPhotosFromFixture);
       when(
         () => repository.registerConsultant(
           consultant: any<ConsultantProfileModel>(named: 'consultant'),
@@ -113,21 +410,170 @@ void main() {
       await cubit.getMyRequestStatus('my-consultant-slug');
       await cubit.registerConsultant();
 
-      verify(() => repository.registerConsultant(consultant: cubit.state.consultant, update: true)).called(1);
+      final captured =
+          verify(
+                () => repository.registerConsultant(
+                  consultant: captureAny<ConsultantProfileModel>(
+                    named: 'consultant',
+                  ),
+                  update: true,
+                ),
+              ).captured.single
+              as ConsultantProfileModel;
+
+      final json = captured.toJson();
+      expect(json['legal_type'], 'individualPerson');
+      expect(json['inn'], '123456789012');
+      expect(json['passport_series'], '1234');
+      expect(json.containsKey('agreement_accepted'), isFalse);
+      expect(json.containsKey('frdo_agreement_accepted'), isFalse);
+    });
+
+    test('retryScoring calls update and restarts poll', () async {
+      when(
+        () => repository.getMyRequestStatus(any<String>()),
+      ).thenAnswer((_) async => requestModel);
+      when(
+        () => repository.getConsultantCertPhotos(),
+      ).thenAnswer((_) async => certPhotosFromFixture);
+      when(
+        () => repository.registerConsultant(
+          consultant: any<ConsultantProfileModel>(named: 'consultant'),
+          update: any<bool>(named: 'update'),
+        ),
+      ).thenAnswer((_) async {});
+
+      await cubit.getMyRequestStatus('my-consultant-slug');
+      expect(cubit.state.alfaScoringStatus, AlfaScoringStatus.scoringFailed);
+
+      when(
+        () => repository.getMyRequestStatus(any<String>()),
+      ).thenAnswer((_) async => requestWithScoring('scoring_complete'));
+      await cubit.retryScoring();
+
+      verify(
+        () => repository.registerConsultant(
+          consultant: any<ConsultantProfileModel>(named: 'consultant'),
+          update: true,
+        ),
+      ).called(1);
+
+      await Future<void>.delayed(const Duration(milliseconds: 50));
+      expect(cubit.state.alfaScoringStatus, AlfaScoringStatus.scoringComplete);
+      expect(cubit.state.isScoringPolling, isFalse);
+    });
+
+    test(
+      'retryScoring writes fieldErrors when passport data is invalid',
+      () async {
+        cubit.emit(
+          cubit.state.copyWith(
+            alfaScoringStatus: AlfaScoringStatus.scoringFailed,
+            loading: false,
+          ),
+        );
+
+        await cubit.retryScoring();
+
+        expect(cubit.state.fieldErrors['inn'], 'Укажите ИНН');
+        expect(cubit.state.alfaScoringStatus, AlfaScoringStatus.scoringFailed);
+        verifyNever(
+          () => repository.registerConsultant(
+            consultant: any<ConsultantProfileModel>(named: 'consultant'),
+            update: any<bool>(named: 'update'),
+          ),
+        );
+      },
+    );
+
+    test('registerConsultant writes fieldErrors without calling API', () async {
+      when(
+        () => repository.registerConsultant(
+          consultant: any<ConsultantProfileModel>(named: 'consultant'),
+          update: any<bool>(named: 'update'),
+        ),
+      ).thenAnswer((_) async {});
+
+      await cubit.registerConsultant();
+
+      expect(cubit.state.fieldErrors['last_name'], 'Укажите фамилию');
+      expect(cubit.state.fieldErrors['inn'], 'Укажите ИНН');
+      expect(cubit.state.fieldErrors['birth_date'], 'Укажите дату рождения');
+      expect(cubit.state.error, isNull);
+      verifyNever(
+        () => repository.registerConsultant(
+          consultant: any<ConsultantProfileModel>(named: 'consultant'),
+          update: any<bool>(named: 'update'),
+        ),
+      );
+    });
+
+    test('editing a field clears only that field error', () async {
+      await cubit.registerConsultant();
+      expect(cubit.state.fieldErrors.containsKey('last_name'), isTrue);
+      expect(cubit.state.fieldErrors.containsKey('inn'), isTrue);
+
+      cubit.updateConsultantProfileModel(
+        cubit.state.consultant.copyWith(lastName: 'Иванов'),
+      );
+
+      expect(cubit.state.fieldErrors.containsKey('last_name'), isFalse);
+      expect(cubit.state.fieldErrors['inn'], 'Укажите ИНН');
+    });
+
+    test('registerConsultant maps Laravel 422 into fieldErrors', () async {
+      when(
+        () => repository.registerConsultant(
+          consultant: any<ConsultantProfileModel>(named: 'consultant'),
+          update: any<bool>(named: 'update'),
+        ),
+      ).thenThrow(
+        DioException(
+          requestOptions: RequestOptions(
+            path: '/api/v2/consultant_request/registration',
+          ),
+          response: Response(
+            requestOptions: RequestOptions(
+              path: '/api/v2/consultant_request/registration',
+            ),
+            statusCode: 422,
+            data: {
+              'message': 'The given data was invalid.',
+              'errors': {
+                'inn': ['The inn format is invalid.'],
+              },
+            },
+          ),
+          type: DioExceptionType.badResponse,
+        ),
+      );
+
+      cubit.updateConsultantProfileModel(consultantProfile);
+      cubit.updateAgreements(acceptOffer: true, acceptFrdoAgreement: true);
+      await cubit.registerConsultant();
+
+      expect(cubit.state.fieldErrors['inn'], 'Некорректный ИНН');
+      expect(cubit.state.error, contains('Некорректный ИНН'));
+      expect(cubit.state.awaitingScoringOutcome, isFalse);
+      expect(cubit.state.isScoringPolling, isFalse);
     });
 
     test('removeCertPhoto marks cert as deleted locally', () async {
-      when(() => repository.getMyRequestStatus(any<String>())).thenAnswer((_) async => requestModel);
-      when(() => repository.getConsultantCertPhotos()).thenAnswer((_) async => certPhotosFromFixture);
-      when(() => repository.hideConsultantCertPhoto(any<int>())).thenAnswer((_) async {});
+      when(
+        () => repository.getMyRequestStatus(any<String>()),
+      ).thenAnswer((_) async => requestModel);
+      when(
+        () => repository.getConsultantCertPhotos(),
+      ).thenAnswer((_) async => certPhotosFromFixture);
+      when(
+        () => repository.hideConsultantCertPhoto(any<int>()),
+      ).thenAnswer((_) async {});
 
       await cubit.getMyRequestStatus('my-consultant-slug');
-      // All photos from backend are present in state.
       expect(cubit.state.certPhotos, hasLength(3));
 
       await cubit.removeCertPhoto(101, null);
 
-      // Current implementation only tracks deleted IDs; photos list remains unchanged here.
       verifyNever(() => repository.hideConsultantCertPhoto(any<int>()));
       expect(cubit.state.deletedPhotoIds, contains(101));
       expect(cubit.state.certPhotos, hasLength(3));
@@ -136,7 +582,9 @@ void main() {
     test('uploadCertPhotos - не загружает если список пуст', () async {
       await cubit.addCertPhotos([]);
 
-      verifyNever(() => repository.storeConsultantCertPhotos(files: any(named: 'files')));
+      verifyNever(
+        () => repository.storeConsultantCertPhotos(files: any(named: 'files')),
+      );
     });
 
     test('updateConsultantProfileModel - обновляет без acceptOffer', () {
@@ -147,4 +595,38 @@ void main() {
       expect(cubit.state.loading, isFalse);
     });
   });
+
+  group('AlfaScoringStatus', () {
+    test('fromString maps known values', () {
+      expect(
+        AlfaScoringStatus.fromString('beneficiary_creating'),
+        AlfaScoringStatus.beneficiaryCreating,
+      );
+      expect(
+        AlfaScoringStatus.fromString('scoring_pending'),
+        AlfaScoringStatus.scoringPending,
+      );
+      expect(
+        AlfaScoringStatus.fromString('scoring_complete'),
+        AlfaScoringStatus.scoringComplete,
+      );
+      expect(
+        AlfaScoringStatus.fromString('scoring_failed'),
+        AlfaScoringStatus.scoringFailed,
+      );
+      expect(
+        AlfaScoringStatus.fromString('beneficiary_failed'),
+        AlfaScoringStatus.beneficiaryFailed,
+      );
+      expect(AlfaScoringStatus.fromString(null), AlfaScoringStatus.none);
+      expect(AlfaScoringStatus.fromString('unknown'), AlfaScoringStatus.none);
+    });
+
+    test('helpers', () {
+      expect(AlfaScoringStatus.scoringPending.isProcessing, isTrue);
+      expect(AlfaScoringStatus.scoringFailed.canRetry, isTrue);
+      expect(AlfaScoringStatus.scoringComplete.isComplete, isTrue);
+      expect(AlfaScoringStatus.scoringComplete.isTerminal, isTrue);
+    });
+  });
 }
diff --git a/test/features/consultant/become_consultant/presentation/pages/additional_settings_screen_test.dart b/test/features/consultant/become_consultant/presentation/pages/additional_settings_screen_test.dart
index 79425f7f..c4fc2eb9 100644
--- a/test/features/consultant/become_consultant/presentation/pages/additional_settings_screen_test.dart
+++ b/test/features/consultant/become_consultant/presentation/pages/additional_settings_screen_test.dart
@@ -18,15 +18,28 @@ void main() {
       return MaterialApp(
         theme: ThemeHelper().themeData(),
         home: Scaffold(
-          body: BlocProvider<RegisterConsultantCubit>.value(value: cubit, child: child),
+          body: BlocProvider<RegisterConsultantCubit>.value(
+            value: cubit,
+            child: child,
+          ),
         ),
       );
     }
 
     testWidgets('renders additional settings screen', (tester) async {
       final cubit = MockRegisterConsultantCubit();
-      const consultant = ConsultantProfileModel(hasMedicalEducation: null, socialLinks: null, photos: null, certificates: null);
-      const state = RegisterConsultantState(consultant: consultant, acceptOffer: false, loading: false, isUpdating: false);
+      const consultant = ConsultantProfileModel(
+        hasMedicalEducation: null,
+        socialLinks: null,
+        photos: null,
+        certificates: null,
+      );
+      const state = RegisterConsultantState(
+        consultant: consultant,
+        acceptOffer: false,
+        loading: false,
+        isUpdating: false,
+      );
 
       when(cubit.state).thenReturn(state);
       when(cubit.stream).thenAnswer((_) => Stream.value(state));
diff --git a/test/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen_smoke_test.dart b/test/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen_smoke_test.dart
index 8101e5eb..5288e170 100644
--- a/test/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen_smoke_test.dart
+++ b/test/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen_smoke_test.dart
@@ -21,12 +21,18 @@ import 'certificates_and_diplomas_screen_smoke_test.mocks.dart';
 void main() {
   group('CertificatesAndDiplomasScreen 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) {
@@ -45,15 +51,30 @@ void main() {
 
     testWidgets('renders certificates and diplomas screen', (tester) async {
       final cubit = MockRegisterConsultantCubit();
-      const consultant = ConsultantProfileModel(hasMedicalEducation: null, socialLinks: null, photos: null, certificates: null);
-      const state = RegisterConsultantState(consultant: consultant, acceptOffer: false, loading: false, isUpdating: false);
+      const consultant = ConsultantProfileModel(
+        hasMedicalEducation: null,
+        socialLinks: null,
+        photos: null,
+        certificates: null,
+      );
+      const state = RegisterConsultantState(
+        consultant: consultant,
+        acceptOffer: false,
+        loading: false,
+        isUpdating: false,
+      );
 
       when(cubit.state).thenReturn(state);
       when(cubit.stream).thenAnswer((_) => Stream.value(state));
       when(cubit.close()).thenAnswer((_) async => Future<void>.value());
       when(cubit.updateConsultantProfileModel(any)).thenReturn(null);
 
-      await tester.pumpWidget(BlocProvider<RegisterConsultantCubit>.value(value: cubit, child: wrap(const CertificatesAndDiplomasScreen())));
+      await tester.pumpWidget(
+        BlocProvider<RegisterConsultantCubit>.value(
+          value: cubit,
+          child: wrap(const CertificatesAndDiplomasScreen()),
+        ),
+      );
       await tester.pump();
       await tester.pump(const Duration(milliseconds: 100));
 
@@ -67,16 +88,28 @@ void main() {
         hasMedicalEducation: null,
         socialLinks: null,
         photos: null,
-        certificates: [CertificatesModel(title: 'Test Certificate', date: '2025-01-01')],
+        certificates: [
+          CertificatesModel(title: 'Test Certificate', date: '2025-01-01'),
+        ],
+      );
+      const state = RegisterConsultantState(
+        consultant: consultant,
+        acceptOffer: false,
+        loading: false,
+        isUpdating: false,
       );
-      const state = RegisterConsultantState(consultant: consultant, acceptOffer: false, loading: false, isUpdating: false);
 
       when(cubit.state).thenReturn(state);
       when(cubit.stream).thenAnswer((_) => Stream.value(state));
       when(cubit.close()).thenAnswer((_) async => Future<void>.value());
       when(cubit.updateConsultantProfileModel(any)).thenReturn(null);
 
-      await tester.pumpWidget(BlocProvider<RegisterConsultantCubit>.value(value: cubit, child: wrap(const CertificatesAndDiplomasScreen())));
+      await tester.pumpWidget(
+        BlocProvider<RegisterConsultantCubit>.value(
+          value: cubit,
+          child: wrap(const CertificatesAndDiplomasScreen()),
+        ),
+      );
       await tester.pump();
       await tester.pump(const Duration(milliseconds: 100));
 
diff --git a/test/features/consultant/become_consultant/presentation/pages/last_step_screen_test.dart b/test/features/consultant/become_consultant/presentation/pages/last_step_screen_test.dart
index cff449e8..800f7430 100644
--- a/test/features/consultant/become_consultant/presentation/pages/last_step_screen_test.dart
+++ b/test/features/consultant/become_consultant/presentation/pages/last_step_screen_test.dart
@@ -19,43 +19,88 @@ import 'last_step_screen_test.mocks.dart';
 void main() {
   group('LastStepScreen 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, RegisterConsultantCubit cubit) {
       return MaterialApp(
         theme: ThemeHelper().themeData(),
         home: Scaffold(
-          body: BlocProvider<RegisterConsultantCubit>.value(value: cubit, child: child),
+          body: BlocProvider<RegisterConsultantCubit>.value(
+            value: cubit,
+            child: child,
+          ),
         ),
       );
     }
 
-    testWidgets('renders last step screen', (tester) async {
+    testWidgets(
+      'renders last step screen with both agreements for new registration',
+      (tester) async {
+        final cubit = MockRegisterConsultantCubit();
+        const consultant = ConsultantProfileModel(
+          hasMedicalEducation: null,
+          socialLinks: SocialLinksModel(
+            vkLink: null,
+            tgLink: null,
+            fbLink: null,
+            instaLink: null,
+            personalSiteLink: null,
+          ),
+          photos: null,
+          certificates: null,
+        );
+        const state = RegisterConsultantState(
+          consultant: consultant,
+          acceptOffer: false,
+          loading: false,
+          isUpdating: false,
+        );
+
+        when(cubit.state).thenReturn(state);
+        when(cubit.stream).thenAnswer((_) => Stream.value(state));
+        when(cubit.close()).thenAnswer((_) async => Future<void>.value());
+
+        await tester.pumpWidget(wrap(const LastStepScreen(), cubit));
+        await tester.pump();
+
+        expect(find.byType(LastStepScreen), findsOneWidget);
+        expect(find.text('Последний шаг'), findsOneWidget);
+        expect(find.byType(CheckboxListTile), findsNWidgets(2));
+        expect(find.textContaining('ФРДО'), findsOneWidget);
+      },
+    );
+
+    testWidgets('hides FRDO checkbox in update mode', (tester) async {
       final cubit = MockRegisterConsultantCubit();
-      const consultant = ConsultantProfileModel(
-        hasMedicalEducation: null,
-        socialLinks: SocialLinksModel(vkLink: null, tgLink: null, fbLink: null, instaLink: null, personalSiteLink: null),
-        photos: null,
-        certificates: null,
+      const consultant = ConsultantProfileModel();
+      const state = RegisterConsultantState(
+        consultant: consultant,
+        acceptOffer: false,
+        loading: false,
+        isUpdating: true,
       );
-      const state = RegisterConsultantState(consultant: consultant, acceptOffer: false, loading: false, isUpdating: false);
 
       when(cubit.state).thenReturn(state);
       when(cubit.stream).thenAnswer((_) => Stream.value(state));
       when(cubit.close()).thenAnswer((_) async => Future<void>.value());
-      when(cubit.updateConsultantProfileModel(any, any)).thenReturn(null);
 
       await tester.pumpWidget(wrap(const LastStepScreen(), cubit));
       await tester.pump();
 
-      expect(find.byType(LastStepScreen), findsOneWidget);
-      expect(find.text('Последний шаг'), findsOneWidget);
+      expect(find.byType(CheckboxListTile), findsOneWidget);
+      expect(find.textContaining('ФРДО'), findsNothing);
     });
   });
 }
diff --git a/test/features/consultant/become_consultant/presentation/pages/passport_data_screen_test.dart b/test/features/consultant/become_consultant/presentation/pages/passport_data_screen_test.dart
new file mode 100644
index 00000000..1385a5a7
--- /dev/null
+++ b/test/features/consultant/become_consultant/presentation/pages/passport_data_screen_test.dart
@@ -0,0 +1,79 @@
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_profile_model.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/passport_data_screen.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/repositories/consultant_repository.dart';
+import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mocktail/mocktail.dart';
+
+class MockConsultantRepository extends Mock implements ConsultantRepository {}
+
+void main() {
+  group('PassportDataScreen smoke', () {
+    late RegisterConsultantCubit cubit;
+
+    setUp(() {
+      cubit = RegisterConsultantCubit(
+        consultantRepository: MockConsultantRepository(),
+      );
+      cubit.emit(
+        const RegisterConsultantState(
+          consultant: ConsultantProfileModel(socialLinks: SocialLinksModel()),
+          acceptOffer: false,
+          loading: false,
+          isUpdating: false,
+        ),
+      );
+    });
+
+    tearDown(() async {
+      await cubit.close();
+    });
+
+    Widget wrap(Widget child) {
+      return MaterialApp(
+        theme: ThemeHelper().themeData(),
+        home: Scaffold(
+          body: BlocProvider<RegisterConsultantCubit>.value(
+            value: cubit,
+            child: child,
+          ),
+        ),
+      );
+    }
+
+    testWidgets('renders passport data fields', (tester) async {
+      await tester.pumpWidget(wrap(const PassportDataScreen()));
+      await tester.pump();
+
+      expect(find.byType(PassportDataScreen), findsOneWidget);
+      expect(find.text('Паспортные данные'), findsOneWidget);
+      expect(find.text('Фамилия'), findsOneWidget);
+      expect(find.text('Имя'), findsOneWidget);
+      expect(find.text('ИНН (12 цифр)'), findsOneWidget);
+      expect(find.text('СНИЛС'), findsOneWidget);
+      expect(find.text('Гражданство (ISO, например RU)'), findsOneWidget);
+      expect(find.text('Телефон для выплат через СБП'), findsOneWidget);
+      expect(find.text('Банк получатель (поиск)'), findsOneWidget);
+      expect(find.text('Я являюсь налоговым резидентом США'), findsOneWidget);
+    });
+
+    testWidgets('shows ValidationErrorWidget for invalid field', (
+      tester,
+    ) async {
+      cubit.emit(
+        cubit.state.copyWith(fieldErrors: const {'inn': 'Некорректный ИНН'}),
+      );
+
+      await tester.pumpWidget(wrap(const PassportDataScreen()));
+      await tester.pump();
+
+      expect(find.byType(ValidationErrorWidget), findsOneWidget);
+      expect(find.text('Некорректный ИНН'), findsOneWidget);
+    });
+  });
+}
diff --git a/test/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen_smoke_test.dart b/test/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen_smoke_test.dart
index 94bdfe3b..5086cf86 100644
--- a/test/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen_smoke_test.dart
+++ b/test/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen_smoke_test.dart
@@ -19,12 +19,18 @@ import 'stepper_become_consultant_screen_smoke_test.mocks.dart';
 void main() {
   group('PhotoOrScansScreen 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, RegisterConsultantCubit cubit) {
@@ -38,7 +44,10 @@ void main() {
         ],
         supportedLocales: const [Locale('ru')],
         home: Scaffold(
-          body: BlocProvider<RegisterConsultantCubit>.value(value: cubit, child: child),
+          body: BlocProvider<RegisterConsultantCubit>.value(
+            value: cubit,
+            child: child,
+          ),
         ),
       );
     }
@@ -49,11 +58,22 @@ void main() {
         final cubit = RegisterConsultantCubit(consultantRepository: repository);
         const consultant = ConsultantProfileModel(
           hasMedicalEducation: null,
-          socialLinks: SocialLinksModel(vkLink: null, tgLink: null, fbLink: null, instaLink: null, personalSiteLink: null),
+          socialLinks: SocialLinksModel(
+            vkLink: null,
+            tgLink: null,
+            fbLink: null,
+            instaLink: null,
+            personalSiteLink: null,
+          ),
           photos: null,
           certificates: null,
         );
-        const state = RegisterConsultantState(consultant: consultant, acceptOffer: false, loading: false, isUpdating: false);
+        const state = RegisterConsultantState(
+          consultant: consultant,
+          acceptOffer: false,
+          loading: false,
+          isUpdating: false,
+        );
 
         cubit.emit(state);
 
@@ -61,7 +81,10 @@ void main() {
         await tester.pumpAndSettle();
 
         expect(find.byType(PhotoOrScansScreen), findsOneWidget);
-        expect(find.text('Загрузите фото или сканы дипломов и сертификатов'), findsOneWidget);
+        expect(
+          find.text('Загрузите фото или сканы дипломов и сертификатов'),
+          findsOneWidget,
+        );
       });
     });
 
@@ -71,11 +94,22 @@ void main() {
         final cubit = RegisterConsultantCubit(consultantRepository: repository);
         const consultant = ConsultantProfileModel(
           hasMedicalEducation: null,
-          socialLinks: SocialLinksModel(vkLink: null, tgLink: null, fbLink: null, instaLink: null, personalSiteLink: null),
+          socialLinks: SocialLinksModel(
+            vkLink: null,
+            tgLink: null,
+            fbLink: null,
+            instaLink: null,
+            personalSiteLink: null,
+          ),
           photos: null,
           certificates: null,
         );
-        const state = RegisterConsultantState(consultant: consultant, acceptOffer: false, loading: false, isUpdating: false);
+        const state = RegisterConsultantState(
+          consultant: consultant,
+          acceptOffer: false,
+          loading: false,
+          isUpdating: false,
+        );
 
         cubit.emit(state);
 
diff --git a/test/features/consultant/become_consultant/presentation/pages/registration_as_screen_test.dart b/test/features/consultant/become_consultant/presentation/pages/registration_as_screen_test.dart
index df170daa..28d432f6 100644
--- a/test/features/consultant/become_consultant/presentation/pages/registration_as_screen_test.dart
+++ b/test/features/consultant/become_consultant/presentation/pages/registration_as_screen_test.dart
@@ -1,24 +1,59 @@
 import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_profile_model.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/repositories/consultant_repository.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:mocktail/mocktail.dart';
+
+class MockConsultantRepository extends Mock implements ConsultantRepository {}
 
 void main() {
   group('RegistrationAsScreen smoke', () {
+    late RegisterConsultantCubit cubit;
+
+    setUp(() {
+      cubit = RegisterConsultantCubit(
+        consultantRepository: MockConsultantRepository(),
+      );
+      cubit.emit(
+        const RegisterConsultantState(
+          consultant: ConsultantProfileModel(socialLinks: SocialLinksModel()),
+          acceptOffer: false,
+          loading: false,
+          isUpdating: false,
+        ),
+      );
+    });
+
+    tearDown(() async {
+      await cubit.close();
+    });
+
     Widget wrap(Widget child) {
       return MaterialApp(
         theme: ThemeHelper().themeData(),
-        home: Scaffold(body: child),
+        home: Scaffold(
+          body: BlocProvider<RegisterConsultantCubit>.value(
+            value: cubit,
+            child: child,
+          ),
+        ),
       );
     }
 
     testWidgets('renders registration as screen', (tester) async {
       await tester.pumpWidget(wrap(const RegistrationAsScreen()));
       await tester.pump();
+      await tester.pump();
 
       expect(find.byType(RegistrationAsScreen), findsOneWidget);
       expect(find.text('Регистрация в качестве'), findsOneWidget);
       expect(find.text('Физического лица'), findsOneWidget);
+      expect(cubit.state.consultant.legalType, 'individualPerson');
     });
   });
 }
diff --git a/test/features/consultant/become_consultant/presentation/pages/social_networks_screen_smoke_test.dart b/test/features/consultant/become_consultant/presentation/pages/social_networks_screen_smoke_test.dart
index adddd454..7db759e2 100644
--- a/test/features/consultant/become_consultant/presentation/pages/social_networks_screen_smoke_test.dart
+++ b/test/features/consultant/become_consultant/presentation/pages/social_networks_screen_smoke_test.dart
@@ -21,12 +21,18 @@ import 'social_networks_screen_smoke_test.mocks.dart';
 void main() {
   group('SocialNetworksScreen 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) {
@@ -47,18 +53,34 @@ void main() {
       final cubit = MockRegisterConsultantCubit();
       const consultant = ConsultantProfileModel(
         hasMedicalEducation: null,
-        socialLinks: SocialLinksModel(vkLink: null, tgLink: null, fbLink: null, instaLink: null, personalSiteLink: null),
+        socialLinks: SocialLinksModel(
+          vkLink: null,
+          tgLink: null,
+          fbLink: null,
+          instaLink: null,
+          personalSiteLink: null,
+        ),
         photos: null,
         certificates: null,
       );
-      const state = RegisterConsultantState(consultant: consultant, acceptOffer: false, loading: false, isUpdating: false);
+      const state = RegisterConsultantState(
+        consultant: consultant,
+        acceptOffer: false,
+        loading: false,
+        isUpdating: false,
+      );
 
       when(cubit.state).thenReturn(state);
       when(cubit.stream).thenAnswer((_) => Stream.value(state));
       when(cubit.close()).thenAnswer((_) async => Future<void>.value());
       when(cubit.updateConsultantProfileModel(any)).thenReturn(null);
 
-      await tester.pumpWidget(BlocProvider<RegisterConsultantCubit>.value(value: cubit, child: wrap(const SocialNetworksScreen())));
+      await tester.pumpWidget(
+        BlocProvider<RegisterConsultantCubit>.value(
+          value: cubit,
+          child: wrap(const SocialNetworksScreen()),
+        ),
+      );
       await tester.pump();
       await tester.pump(const Duration(milliseconds: 100));
 
@@ -69,18 +91,34 @@ void main() {
       final cubit = MockRegisterConsultantCubit();
       const consultant = ConsultantProfileModel(
         hasMedicalEducation: null,
-        socialLinks: SocialLinksModel(vkLink: 'https://vk.com/test', tgLink: 'https://t.me/test', fbLink: null, instaLink: null, personalSiteLink: null),
+        socialLinks: SocialLinksModel(
+          vkLink: 'https://vk.com/test',
+          tgLink: 'https://t.me/test',
+          fbLink: null,
+          instaLink: null,
+          personalSiteLink: null,
+        ),
         photos: null,
         certificates: null,
       );
-      const state = RegisterConsultantState(consultant: consultant, acceptOffer: false, loading: false, isUpdating: false);
+      const state = RegisterConsultantState(
+        consultant: consultant,
+        acceptOffer: false,
+        loading: false,
+        isUpdating: false,
+      );
 
       when(cubit.state).thenReturn(state);
       when(cubit.stream).thenAnswer((_) => Stream.value(state));
       when(cubit.close()).thenAnswer((_) async => Future<void>.value());
       when(cubit.updateConsultantProfileModel(any)).thenReturn(null);
 
-      await tester.pumpWidget(BlocProvider<RegisterConsultantCubit>.value(value: cubit, child: wrap(const SocialNetworksScreen())));
+      await tester.pumpWidget(
+        BlocProvider<RegisterConsultantCubit>.value(
+          value: cubit,
+          child: wrap(const SocialNetworksScreen()),
+        ),
+      );
       await tester.pump();
       await tester.pump(const Duration(milliseconds: 100));
 
diff --git a/test/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen_smoke_test.dart b/test/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen_smoke_test.dart
index 34c2db42..d663ea7e 100644
--- a/test/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen_smoke_test.dart
+++ b/test/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen_smoke_test.dart
@@ -21,12 +21,18 @@ import 'stepper_become_consultant_screen_smoke_test.mocks.dart';
 void main() {
   group('StepperBecomeConsultantScreen 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) {
@@ -48,11 +54,22 @@ void main() {
       final cubit = RegisterConsultantCubit(consultantRepository: repository);
       const consultant = ConsultantProfileModel(
         hasMedicalEducation: null,
-        socialLinks: SocialLinksModel(vkLink: null, tgLink: null, fbLink: null, instaLink: null, personalSiteLink: null),
+        socialLinks: SocialLinksModel(
+          vkLink: null,
+          tgLink: null,
+          fbLink: null,
+          instaLink: null,
+          personalSiteLink: null,
+        ),
         photos: null,
         certificates: null,
       );
-      const state = RegisterConsultantState(consultant: consultant, acceptOffer: false, loading: false, isUpdating: false);
+      const state = RegisterConsultantState(
+        consultant: consultant,
+        acceptOffer: false,
+        loading: false,
+        isUpdating: false,
+      );
 
       cubit.emit(state);
 
@@ -71,11 +88,22 @@ void main() {
       final cubit = RegisterConsultantCubit(consultantRepository: repository);
       const consultant = ConsultantProfileModel(
         hasMedicalEducation: null,
-        socialLinks: SocialLinksModel(vkLink: null, tgLink: null, fbLink: null, instaLink: null, personalSiteLink: null),
+        socialLinks: SocialLinksModel(
+          vkLink: null,
+          tgLink: null,
+          fbLink: null,
+          instaLink: null,
+          personalSiteLink: null,
+        ),
         photos: null,
         certificates: null,
       );
-      const state = RegisterConsultantState(consultant: consultant, acceptOffer: false, loading: false, isUpdating: false);
+      const state = RegisterConsultantState(
+        consultant: consultant,
+        acceptOffer: false,
+        loading: false,
+        isUpdating: false,
+      );
 
       cubit.emit(state);
 
@@ -86,7 +114,7 @@ void main() {
       await tester.pump();
       await tester.pump(const Duration(milliseconds: 100));
 
-      expect(find.text('шаг 1 из 6'), findsOneWidget);
+      expect(find.text('шаг 1 из 7'), findsOneWidget);
     });
 
     testWidgets('displays progress bar', (tester) async {
@@ -94,11 +122,22 @@ void main() {
       final cubit = RegisterConsultantCubit(consultantRepository: repository);
       const consultant = ConsultantProfileModel(
         hasMedicalEducation: null,
-        socialLinks: SocialLinksModel(vkLink: null, tgLink: null, fbLink: null, instaLink: null, personalSiteLink: null),
+        socialLinks: SocialLinksModel(
+          vkLink: null,
+          tgLink: null,
+          fbLink: null,
+          instaLink: null,
+          personalSiteLink: null,
+        ),
         photos: null,
         certificates: null,
       );
-      const state = RegisterConsultantState(consultant: consultant, acceptOffer: false, loading: false, isUpdating: false);
+      const state = RegisterConsultantState(
+        consultant: consultant,
+        acceptOffer: false,
+        loading: false,
+        isUpdating: false,
+      );
 
       cubit.emit(state);
 
@@ -117,11 +156,22 @@ void main() {
       final cubit = RegisterConsultantCubit(consultantRepository: repository);
       const consultant = ConsultantProfileModel(
         hasMedicalEducation: null,
-        socialLinks: SocialLinksModel(vkLink: null, tgLink: null, fbLink: null, instaLink: null, personalSiteLink: null),
+        socialLinks: SocialLinksModel(
+          vkLink: null,
+          tgLink: null,
+          fbLink: null,
+          instaLink: null,
+          personalSiteLink: null,
+        ),
         photos: null,
         certificates: null,
       );
-      const state = RegisterConsultantState(consultant: consultant, acceptOffer: false, loading: false, isUpdating: false);
+      const state = RegisterConsultantState(
+        consultant: consultant,
+        acceptOffer: false,
+        loading: false,
+        isUpdating: false,
+      );
 
       cubit.emit(state);
 
@@ -140,11 +190,22 @@ void main() {
       final cubit = RegisterConsultantCubit(consultantRepository: repository);
       const consultant = ConsultantProfileModel(
         hasMedicalEducation: null,
-        socialLinks: SocialLinksModel(vkLink: null, tgLink: null, fbLink: null, instaLink: null, personalSiteLink: null),
+        socialLinks: SocialLinksModel(
+          vkLink: null,
+          tgLink: null,
+          fbLink: null,
+          instaLink: null,
+          personalSiteLink: null,
+        ),
         photos: null,
         certificates: null,
       );
-      const state = RegisterConsultantState(consultant: consultant, acceptOffer: false, loading: false, isUpdating: false);
+      const state = RegisterConsultantState(
+        consultant: consultant,
+        acceptOffer: false,
+        loading: false,
+        isUpdating: false,
+      );
 
       cubit.emit(state);
 
@@ -163,11 +224,22 @@ void main() {
       final cubit = RegisterConsultantCubit(consultantRepository: repository);
       const consultant = ConsultantProfileModel(
         hasMedicalEducation: null,
-        socialLinks: SocialLinksModel(vkLink: null, tgLink: null, fbLink: null, instaLink: null, personalSiteLink: null),
+        socialLinks: SocialLinksModel(
+          vkLink: null,
+          tgLink: null,
+          fbLink: null,
+          instaLink: null,
+          personalSiteLink: null,
+        ),
         photos: null,
         certificates: null,
       );
-      const state = RegisterConsultantState(consultant: consultant, acceptOffer: false, loading: false, isUpdating: false);
+      const state = RegisterConsultantState(
+        consultant: consultant,
+        acceptOffer: false,
+        loading: false,
+        isUpdating: false,
+      );
 
       cubit.emit(state);
 
diff --git a/test/features/consultant/become_consultant/repositories/consultant_repository_test.dart b/test/features/consultant/become_consultant/repositories/consultant_repository_test.dart
index c695cc5b..3ea68162 100644
--- a/test/features/consultant/become_consultant/repositories/consultant_repository_test.dart
+++ b/test/features/consultant/become_consultant/repositories/consultant_repository_test.dart
@@ -5,6 +5,7 @@ import 'package:dio/dio.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_cert_photo_model.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_profile_model.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultation_request_model.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/models/sbp_bank_model.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/repositories/consultant_repository.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/services/consultant_service.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -36,42 +37,99 @@ void main() {
     setUp(() {
       mockService = MockConsultantService();
       repository = ConsultantRepository(consultantService: mockService);
-      consultantProfile = ConsultantProfileModel.fromJson(FixtureReader.readAsMap('consultant/consultant_profile_request.json'));
-      consultationRequest = ConsultationRequestModel.fromJson(FixtureReader.readAsMap('consultant/consultation_request.json'));
-      certPhotos = FixtureReader.readAsList('consultant/consultant_cert_photos.json')
-          .map((item) => ConsultantCertPhotoModel.fromJson(item as Map<String, dynamic>))
-          .toList();
+      consultantProfile = ConsultantProfileModel.fromJson(
+        FixtureReader.readAsMap('consultant/consultant_profile_request.json'),
+      );
+      consultationRequest = ConsultationRequestModel.fromJson(
+        FixtureReader.readAsMap('consultant/consultation_request.json'),
+      );
+      certPhotos =
+          FixtureReader.readAsList('consultant/consultant_cert_photos.json')
+              .map(
+                (item) => ConsultantCertPhotoModel.fromJson(
+                  item as Map<String, dynamic>,
+                ),
+              )
+              .toList();
     });
 
-    test('registerConsultant delegates to consultantRegistration when update=false', () async {
-      when(() => mockService.consultantRegistration(consultantModel: any<ConsultantProfileModel>(named: 'consultantModel'))).thenAnswer((_) async {});
+    test(
+      'registerConsultant delegates to consultantRegistration when update=false',
+      () async {
+        when(
+          () => mockService.consultantRegistration(
+            consultantModel: any<ConsultantProfileModel>(
+              named: 'consultantModel',
+            ),
+          ),
+        ).thenAnswer((_) async {});
 
-      await repository.registerConsultant(consultant: consultantProfile);
+        await repository.registerConsultant(consultant: consultantProfile);
 
-      verify(() => mockService.consultantRegistration(consultantModel: consultantProfile)).called(1);
-      verifyNever(() => mockService.consultantUpdate(consultantModel: any<ConsultantProfileModel>(named: 'consultantModel')));
-    });
+        verify(
+          () => mockService.consultantRegistration(
+            consultantModel: consultantProfile,
+          ),
+        ).called(1);
+        verifyNever(
+          () => mockService.consultantUpdate(
+            consultantModel: any<ConsultantProfileModel>(
+              named: 'consultantModel',
+            ),
+          ),
+        );
+      },
+    );
 
-    test('registerConsultant delegates to consultantUpdate when update=true', () async {
-      when(() => mockService.consultantUpdate(consultantModel: any<ConsultantProfileModel>(named: 'consultantModel'))).thenAnswer((_) async {});
+    test(
+      'registerConsultant delegates to consultantUpdate when update=true',
+      () async {
+        when(
+          () => mockService.consultantUpdate(
+            consultantModel: any<ConsultantProfileModel>(
+              named: 'consultantModel',
+            ),
+          ),
+        ).thenAnswer((_) async {});
 
-      await repository.registerConsultant(consultant: consultantProfile, update: true);
+        await repository.registerConsultant(
+          consultant: consultantProfile,
+          update: true,
+        );
 
-      verify(() => mockService.consultantUpdate(consultantModel: consultantProfile)).called(1);
-      verifyNever(() => mockService.consultantRegistration(consultantModel: any<ConsultantProfileModel>(named: 'consultantModel')));
-    });
+        verify(
+          () =>
+              mockService.consultantUpdate(consultantModel: consultantProfile),
+        ).called(1);
+        verifyNever(
+          () => mockService.consultantRegistration(
+            consultantModel: any<ConsultantProfileModel>(
+              named: 'consultantModel',
+            ),
+          ),
+        );
+      },
+    );
 
     test('getConsultantRequestStatus returns request from service', () async {
-      when(() => mockService.getConsultantRequestStatus(slug: any<String>(named: 'slug'))).thenAnswer((_) async => consultationRequest);
+      when(
+        () => mockService.getConsultantRequestStatus(
+          slug: any<String>(named: 'slug'),
+        ),
+      ).thenAnswer((_) async => consultationRequest);
 
       final result = await repository.getConsultantRequestStatus('user-slug');
 
       expect(result, equals(consultationRequest));
-      verify(() => mockService.getConsultantRequestStatus(slug: 'user-slug')).called(1);
+      verify(
+        () => mockService.getConsultantRequestStatus(slug: 'user-slug'),
+      ).called(1);
     });
 
     test('getMyRequestStatus returns request from service', () async {
-      when(() => mockService.getMyRequestStatus(slug: any<String>(named: 'slug'))).thenAnswer((_) async => consultationRequest);
+      when(
+        () => mockService.getMyRequestStatus(slug: any<String>(named: 'slug')),
+      ).thenAnswer((_) async => consultationRequest);
 
       final result = await repository.getMyRequestStatus('my-slug');
 
@@ -80,7 +138,9 @@ void main() {
     });
 
     test('getConsultantCertPhotos returns photos from service', () async {
-      when(() => mockService.getConsultantCertPhotos()).thenAnswer((_) async => certPhotos);
+      when(
+        () => mockService.getConsultantCertPhotos(),
+      ).thenAnswer((_) async => certPhotos);
 
       final result = await repository.getConsultantCertPhotos();
 
@@ -88,42 +148,92 @@ void main() {
       verify(() => mockService.getConsultantCertPhotos()).called(1);
     });
 
-    test('storeConsultantCertPhotos returns empty list when no files provided', () async {
-      final result = await repository.storeConsultantCertPhotos(files: []);
+    test('getSbpBanks returns banks from service', () async {
+      final banks = FixtureReader.readAsList('consultant/sbp_banks.json')
+          .map((item) => SbpBankModel.fromJson(item as Map<String, dynamic>))
+          .toList();
+      when(() => mockService.getSbpBanks()).thenAnswer((_) async => banks);
 
-      expect(result, isEmpty);
-      verifyNever(() => mockService.storeConsultantCertPhotos(photos: any<List<MultipartFile>>(named: 'photos')));
+      final result = await repository.getSbpBanks();
+
+      expect(result, banks);
+      verify(() => mockService.getSbpBanks()).called(1);
     });
 
-    test('storeConsultantCertPhotos uploads prepared files and returns response', () async {
-      final mockFile = MockFile();
-      when(() => mockFile.readAsBytes()).thenAnswer((_) async => Uint8List.fromList([1, 2, 3]));
-      when(() => mockFile.path).thenReturn('/tmp/certificate.png');
-      when(() => mockService.storeConsultantCertPhotos(photos: any<List<MultipartFile>>(named: 'photos'))).thenAnswer((_) async => certPhotos);
+    test(
+      'storeConsultantCertPhotos returns empty list when no files provided',
+      () async {
+        final result = await repository.storeConsultantCertPhotos(files: []);
 
-      final result = await repository.storeConsultantCertPhotos(files: [mockFile]);
+        expect(result, isEmpty);
+        verifyNever(
+          () => mockService.storeConsultantCertPhotos(
+            photos: any<List<MultipartFile>>(named: 'photos'),
+          ),
+        );
+      },
+    );
 
-      expect(result, certPhotos);
-      final capturedArgument = verify(() => mockService.storeConsultantCertPhotos(photos: captureAny<List<MultipartFile>>(named: 'photos'))).captured.single as List<MultipartFile>;
-      expect(capturedArgument, hasLength(1));
-      expect(capturedArgument.first.filename, 'certificate.png');
-    });
+    test(
+      'storeConsultantCertPhotos uploads prepared files and returns response',
+      () async {
+        final mockFile = MockFile();
+        when(
+          () => mockFile.readAsBytes(),
+        ).thenAnswer((_) async => Uint8List.fromList([1, 2, 3]));
+        when(() => mockFile.path).thenReturn('/tmp/certificate.png');
+        when(
+          () => mockService.storeConsultantCertPhotos(
+            photos: any<List<MultipartFile>>(named: 'photos'),
+          ),
+        ).thenAnswer((_) async => certPhotos);
+
+        final result = await repository.storeConsultantCertPhotos(
+          files: [mockFile],
+        );
+
+        expect(result, certPhotos);
+        final capturedArgument =
+            verify(
+                  () => mockService.storeConsultantCertPhotos(
+                    photos: captureAny<List<MultipartFile>>(named: 'photos'),
+                  ),
+                ).captured.single
+                as List<MultipartFile>;
+        expect(capturedArgument, hasLength(1));
+        expect(capturedArgument.first.filename, 'certificate.png');
+      },
+    );
 
     test('hideConsultantCertPhoto sends payload to service', () async {
-      when(() => mockService.hideConsultantCertPhoto(payload: any<Map<String, dynamic>>(named: 'payload'))).thenAnswer((_) async {});
+      when(
+        () => mockService.hideConsultantCertPhoto(
+          payload: any<Map<String, dynamic>>(named: 'payload'),
+        ),
+      ).thenAnswer((_) async {});
 
       await repository.hideConsultantCertPhoto(42);
 
-      verify(() => mockService.hideConsultantCertPhoto(payload: {'cert_photo_id': 42})).called(1);
+      verify(
+        () =>
+            mockService.hideConsultantCertPhoto(payload: {'cert_photo_id': 42}),
+      ).called(1);
     });
 
     test('unHideConsultantCertPhoto sends payload to service', () async {
-      when(() => mockService.unHideConsultantCertPhoto(payload: any<Map<String, dynamic>>(named: 'payload'))).thenAnswer((_) async {});
+      when(
+        () => mockService.unHideConsultantCertPhoto(
+          payload: any<Map<String, dynamic>>(named: 'payload'),
+        ),
+      ).thenAnswer((_) async {});
 
       await repository.unHideConsultantCertPhoto(7);
 
-      verify(() => mockService.unHideConsultantCertPhoto(payload: {'cert_photo_id': 7})).called(1);
+      verify(
+        () => mockService.unHideConsultantCertPhoto(
+          payload: {'cert_photo_id': 7},
+        ),
+      ).called(1);
     });
   });
 }
-
diff --git a/test/features/consultant/become_consultant/services/consultant_service_test.dart b/test/features/consultant/become_consultant/services/consultant_service_test.dart
index dd429904..0ae3b63b 100644
--- a/test/features/consultant/become_consultant/services/consultant_service_test.dart
+++ b/test/features/consultant/become_consultant/services/consultant_service_test.dart
@@ -20,11 +20,14 @@ void main() {
 
     test('getMyRequestStatus - возвращает статус запроса', () async {
       const slug = 'test-consultant';
-      final json = FixtureReader.readAsMap('consultant/consultation_request.json');
+      final json = FixtureReader.readAsMap(
+        'consultant/consultation_request.json',
+      );
       final expectedRequest = ConsultationRequestModel.fromJson(json);
 
-      when(mockConsultantService.getMyRequestStatus(slug: slug))
-          .thenAnswer((_) async => expectedRequest);
+      when(
+        mockConsultantService.getMyRequestStatus(slug: slug),
+      ).thenAnswer((_) async => expectedRequest);
 
       final result = await mockConsultantService.getMyRequestStatus(slug: slug);
 
@@ -33,25 +36,36 @@ void main() {
       verify(mockConsultantService.getMyRequestStatus(slug: slug)).called(1);
     });
 
-    test('getConsultantRequestStatus - возвращает статус запроса консультанта', () async {
-      const slug = 'test-consultant';
-      final json = FixtureReader.readAsMap('consultant/consultation_request.json');
-      final expectedRequest = ConsultationRequestModel.fromJson(json);
+    test(
+      'getConsultantRequestStatus - возвращает статус запроса консультанта',
+      () async {
+        const slug = 'test-consultant';
+        final json = FixtureReader.readAsMap(
+          'consultant/consultation_request.json',
+        );
+        final expectedRequest = ConsultationRequestModel.fromJson(json);
 
-      when(mockConsultantService.getConsultantRequestStatus(slug: slug))
-          .thenAnswer((_) async => expectedRequest);
+        when(
+          mockConsultantService.getConsultantRequestStatus(slug: slug),
+        ).thenAnswer((_) async => expectedRequest);
 
-      final result = await mockConsultantService.getConsultantRequestStatus(slug: slug);
+        final result = await mockConsultantService.getConsultantRequestStatus(
+          slug: slug,
+        );
 
-      expect(result, isA<ConsultationRequestModel>());
-      verify(mockConsultantService.getConsultantRequestStatus(slug: slug)).called(1);
-    });
+        expect(result, isA<ConsultationRequestModel>());
+        verify(
+          mockConsultantService.getConsultantRequestStatus(slug: slug),
+        ).called(1);
+      },
+    );
 
     test('getConsultantCertPhotos - возвращает фото сертификатов', () async {
       final expectedPhotos = <ConsultantCertPhotoModel>[];
 
-      when(mockConsultantService.getConsultantCertPhotos())
-          .thenAnswer((_) async => expectedPhotos);
+      when(
+        mockConsultantService.getConsultantCertPhotos(),
+      ).thenAnswer((_) async => expectedPhotos);
 
       final result = await mockConsultantService.getConsultantCertPhotos();
 
@@ -60,16 +74,22 @@ void main() {
     });
 
     test('consultantRegistration - регистрирует консультанта', () async {
-      final profileJson = FixtureReader.readAsMap('consultant/consultant_profile_request.json');
+      final profileJson = FixtureReader.readAsMap(
+        'consultant/consultant_profile_request.json',
+      );
       final profile = ConsultantProfileModel.fromJson(profileJson);
 
-      when(mockConsultantService.consultantRegistration(consultantModel: profile))
-          .thenAnswer((_) async => Future.value());
+      when(
+        mockConsultantService.consultantRegistration(consultantModel: profile),
+      ).thenAnswer((_) async => Future.value());
 
-      await mockConsultantService.consultantRegistration(consultantModel: profile);
+      await mockConsultantService.consultantRegistration(
+        consultantModel: profile,
+      );
 
-      verify(mockConsultantService.consultantRegistration(consultantModel: profile)).called(1);
+      verify(
+        mockConsultantService.consultantRegistration(consultantModel: profile),
+      ).called(1);
     });
   });
 }
-
diff --git a/test/features/consultant/become_consultant/utils/laravel_validation_errors_test.dart b/test/features/consultant/become_consultant/utils/laravel_validation_errors_test.dart
new file mode 100644
index 00000000..88a0d328
--- /dev/null
+++ b/test/features/consultant/become_consultant/utils/laravel_validation_errors_test.dart
@@ -0,0 +1,113 @@
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/utils/laravel_validation_errors.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group('parseLaravelValidationErrors', () {
+    DioException dio422(Map<String, dynamic> data) {
+      return DioException(
+        requestOptions: RequestOptions(path: '/test'),
+        response: Response(
+          requestOptions: RequestOptions(path: '/test'),
+          statusCode: 422,
+          data: data,
+        ),
+        type: DioExceptionType.badResponse,
+      );
+    }
+
+    test('maps unique and format errors to Russian UI texts', () {
+      final parsed = parseLaravelValidationErrors(
+        dio422({
+          'message': 'The given data was invalid.',
+          'errors': {
+            'inn': ['The inn format is invalid.'],
+            'passport_number': ['The passport number has already been taken.'],
+            'snils': ['The snils has already been taken.'],
+          },
+        }),
+      );
+
+      expect(parsed.fieldErrors['inn'], 'Некорректный ИНН');
+      expect(parsed.fieldErrors['passport_number'], 'Такой паспорт существует');
+      expect(parsed.fieldErrors['snils'], 'Такой СНИЛС существует');
+      expect(parsed.summary, isNot(contains('The given data was invalid.')));
+      expect(parsed.summary, isNot(contains('already been taken')));
+      expect(parsed.summary, contains('Некорректный ИНН'));
+      expect(parsed.summary, contains('Такой паспорт существует'));
+      expect(parsed.hasFieldErrors, isTrue);
+    });
+
+    test('maps required and agreement errors', () {
+      final parsed = parseLaravelValidationErrors(
+        dio422({
+          'errors': {
+            'last_name': ['The last name field is required.'],
+            'agreement_accepted': ['The agreement accepted must be accepted.'],
+          },
+        }),
+      );
+
+      expect(parsed.fieldErrors['last_name'], 'Укажите фамилию');
+      expect(
+        parsed.fieldErrors['agreement_accepted'],
+        'Примите условия оферты',
+      );
+    });
+
+    test('maps name format errors', () {
+      final parsed = parseLaravelValidationErrors(
+        dio422({
+          'errors': {
+            'last_name': ['The last name format is invalid.'],
+            'first_name': ['The first name format is invalid.'],
+            'middle_name': ['The middle name format is invalid.'],
+          },
+        }),
+      );
+
+      expect(parsed.fieldErrors['last_name'], 'Некорректная фамилия');
+      expect(parsed.fieldErrors['first_name'], 'Некорректное имя');
+      expect(parsed.fieldErrors['middle_name'], 'Некорректное отчество');
+    });
+
+    test('falls back to generic message for non-422 DioException', () {
+      final error = DioException(
+        requestOptions: RequestOptions(path: '/test'),
+        message: 'Network failed',
+        type: DioExceptionType.connectionError,
+      );
+
+      final parsed = parseLaravelValidationErrors(error);
+
+      expect(parsed.summary, 'Не удалось отправить данные. Попробуйте ещё раз');
+      expect(parsed.fieldErrors, isEmpty);
+    });
+
+    test('uses generic text for non-Dio errors', () {
+      final parsed = parseLaravelValidationErrors(Exception('boom'));
+
+      expect(parsed.summary, 'Не удалось отправить данные. Попробуйте ещё раз');
+      expect(parsed.fieldErrors, isEmpty);
+    });
+  });
+
+  group('mapConsultantValidationMessage', () {
+    test('unique inn and snils', () {
+      expect(
+        mapConsultantValidationMessage(
+          fieldKey: 'inn',
+          rawMessage: 'The inn has already been taken.',
+        ),
+        'Такой ИНН существует',
+      );
+      expect(
+        mapConsultantValidationMessage(
+          fieldKey: 'snils',
+          rawMessage: 'The snils has already been taken.',
+        ),
+        'Такой СНИЛС существует',
+      );
+    });
+  });
+}
diff --git a/test/features/consultant/become_consultant/utils/passport_data_validator_test.dart b/test/features/consultant/become_consultant/utils/passport_data_validator_test.dart
new file mode 100644
index 00000000..fd568e36
--- /dev/null
+++ b/test/features/consultant/become_consultant/utils/passport_data_validator_test.dart
@@ -0,0 +1,120 @@
+import 'package:eatvio_app/features/consultant/become_consultant/models/consultant_profile_model.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/utils/passport_data_validator.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  const valid = ConsultantProfileModel(
+    lastName: 'Иванов',
+    firstName: 'Иван',
+    inn: '123456789012',
+    snils: '123-456-789 00',
+    passportSeries: '1234',
+    passportNumber: '567890',
+    passportIssueDate: '2020-01-15',
+    passportIssuer: 'ОВД',
+    passportIssuerCode: '772-053',
+    birthDate: '1990-05-20',
+    birthPlace: 'Москва',
+    registrationAddress: 'Адрес 1',
+    residenceAddress: 'Адрес 2',
+    citizenship: 'RU',
+  );
+
+  group('PassportDataValidator', () {
+    test('returns empty map for a valid individual person profile', () {
+      expect(PassportDataValidator.validate(valid), isEmpty);
+    });
+
+    test('rejects names that do not match Alfa Bank pattern', () {
+      final errors = PassportDataValidator.validate(
+        valid.copyWith(
+          lastName: 'Regress14LastName',
+          firstName: 'Regress14Name',
+          middleName: 'Regress14middleName',
+        ),
+      );
+
+      expect(errors['last_name'], 'Некорректная фамилия');
+      expect(errors['first_name'], 'Некорректное имя');
+      expect(errors['middle_name'], 'Некорректное отчество');
+    });
+
+    test('allows hyphenated names and empty middle name', () {
+      final errors = PassportDataValidator.validate(
+        valid.copyWith(
+          lastName: 'Салтыков-Щедрин',
+          firstName: 'Mary Jane',
+          middleName: '',
+        ),
+      );
+
+      expect(errors.containsKey('last_name'), isFalse);
+      expect(errors.containsKey('first_name'), isFalse);
+      expect(errors.containsKey('middle_name'), isFalse);
+    });
+
+    test('requires empty text fields', () {
+      final errors = PassportDataValidator.validate(
+        valid.copyWith(lastName: '', firstName: null),
+      );
+
+      expect(errors['last_name'], 'Укажите фамилию');
+      expect(errors['first_name'], 'Укажите имя');
+    });
+
+    test('rejects short INN and malformed SNILS', () {
+      final errors = PassportDataValidator.validate(
+        valid.copyWith(inn: '123', snils: '12345678900'),
+      );
+
+      expect(errors['inn'], 'Некорректный ИНН');
+      expect(errors['snils'], 'Некорректный СНИЛС');
+    });
+
+    test('rejects empty INN and SNILS', () {
+      final errors = PassportDataValidator.validate(
+        valid.copyWith(inn: '', snils: ''),
+      );
+
+      expect(errors['inn'], 'Укажите ИНН');
+      expect(errors['snils'], 'Укажите СНИЛС');
+    });
+
+    test('rejects non-calendar dates', () {
+      final errors = PassportDataValidator.validate(
+        valid.copyWith(
+          birthDate: '2020-02-31',
+          passportIssueDate: '1999-13-32',
+        ),
+      );
+
+      expect(errors['birth_date'], 'Некорректная дата рождения');
+      expect(errors['passport_issue_date'], 'Некорректная дата выдачи');
+    });
+
+    test('rejects dates in the future', () {
+      final errors = PassportDataValidator.validate(
+        valid.copyWith(
+          birthDate: '2030-01-01',
+          passportIssueDate: '2030-01-01',
+        ),
+        now: DateTime(2026, 8, 13),
+      );
+
+      expect(errors['birth_date'], PassportDataValidator.futureDateMessage);
+      expect(
+        errors['passport_issue_date'],
+        PassportDataValidator.futureDateMessage,
+      );
+    });
+
+    test('accepts today as a valid date', () {
+      final errors = PassportDataValidator.validate(
+        valid.copyWith(passportIssueDate: '2026-08-13'),
+        now: DateTime(2026, 8, 13, 18),
+      );
+
+      expect(errors.containsKey('passport_issue_date'), isFalse);
+    });
+  });
+}
diff --git a/test/features/feed/models/feed_blog_post_model_test.dart b/test/features/feed/models/feed_blog_post_model_test.dart
index 9d84480a..140266ba 100644
--- a/test/features/feed/models/feed_blog_post_model_test.dart
+++ b/test/features/feed/models/feed_blog_post_model_test.dart
@@ -2,6 +2,8 @@ import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:flutter_test/flutter_test.dart';
 
+import '../../../fixtures/feed_fixtures.dart';
+
 void main() {
   group('FeedBlogPostModel', () {
     test('creates FeedBlogPostModel with all parameters', () {
@@ -102,6 +104,65 @@ void main() {
       expect(model.totalLikes, 10);
     });
 
+    test('parses v2 show JSON with gallery images and video_url_embed', () {
+      final model = FeedBlogPostModel.fromJson({
+        'id': 1,
+        'state': 'active',
+        'image': 'media/1/cover.jpg',
+        'images': [
+          {'id': 10, 'url': 'media/1/a.jpg', 'position': 1, 'orientation': 'horizontal'},
+          {'id': 11, 'url': 'media/1/b.jpg', 'position': 2},
+        ],
+        'description': 'Описание',
+        'author': {
+          'author_slug': 'author-slug',
+          'author_name': 'Автор',
+          'author_profile_icon': 'icon.jpg',
+          'author_is_me': false,
+        },
+        'video_url': 'https://rutube.ru/video/abc/',
+        'video_url_embed': 'https://rutube.ru/play/embed/abc/',
+        'video_url_thumb': 'media/1/thumb.jpg',
+        'created_at': '2024-01-15T12:00:00Z',
+        'updated_at': '2024-01-15T12:00:00Z',
+        'title': 'Заголовок',
+        'total_likes': 10,
+        'total_views': 100,
+        'total_comments': 5,
+        'was_liked_by_me': false,
+      });
+
+      expect(model.images, hasLength(2));
+      expect(model.images.first.id, 10);
+      expect(model.images.first.url, 'media/1/a.jpg');
+      expect(model.images.first.orientation, 'horizontal');
+      expect(model.images[1].orientation, 'horizontal');
+      expect(model.images[1].position, 2);
+      expect(model.videoEmbedUrl, 'https://rutube.ru/play/embed/abc/');
+      expect(model.videoUrlThumb, 'media/1/thumb.jpg');
+    });
+
+    test('parses fixture feedBlogPostModel with gallery and embed', () {
+      final model = FeedFixtures.feedBlogPostModel();
+
+      expect(model.images, hasLength(2));
+      expect(model.videoEmbedUrl, contains('rutube.ru/play/embed'));
+      expect(model.videoUrlThumb, 'media/1/thumb.jpg');
+    });
+
+    test('parses profile search_by_author fixture with gallery and video', () {
+      final posts = FeedFixtures.blogPostsByAuthor();
+
+      expect(posts, hasLength(2));
+      expect(posts.first.images, hasLength(2));
+      expect(posts.first.images.first.orientation, 'horizontal');
+      expect(posts.first.images[1].orientation, 'vertical');
+      expect(posts.first.videoEmbedUrl, contains('rutube.ru/play/embed'));
+      expect(posts.first.videoUrlThumb, 'media/1/thumb.jpg');
+      expect(posts[1].images, hasLength(2));
+      expect(posts[1].videoEmbedUrl, isNull);
+    });
+
     test('creates FeedBlogPostModel with different states', () {
       const author = Author(
         authorSlug: 'author',
diff --git a/test/features/feed/models/post_feed_mapper_test.dart b/test/features/feed/models/post_feed_mapper_test.dart
new file mode 100644
index 00000000..2873aa0c
--- /dev/null
+++ b/test/features/feed/models/post_feed_mapper_test.dart
@@ -0,0 +1,56 @@
+import 'package:eatvio_app/core/app_config.dart';
+import 'package:eatvio_app/core/app_initializer.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_mapper.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import '../../../fixtures/feed_fixtures.dart';
+
+void main() {
+  group('PostFeedMapper', () {
+    setUpAll(() async {
+      await sl.reset();
+      dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
+      sl.registerLazySingleton<AppConfig>(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
+    });
+
+    test('maps fixture item post_id to FeedBlogPostModel.id', () {
+      final item = FeedFixtures.postFeedItem();
+      final model = PostFeedMapper.fromPostFeedItem(item, currentUserId: 10);
+
+      expect(model.id, 1);
+      expect(model.author.authorIsMe, isTrue);
+      expect(model.author.authorSlug, 'anna-ivanova');
+      expect(model.images, hasLength(2));
+      expect(model.videoUrl, isEmpty);
+      expect(model.videoEmbedUrl, isNull);
+      expect(model.title, 'Завтрак с овсянкой');
+      expect(model.image, 'http://localhost/storage/posts/oatmeal.jpg');
+      expect(model.author.isEntitySubscribedByMe, isFalse);
+    });
+
+    test('maps fixture embed video post and likes', () {
+      final item = FeedFixtures.postFeedItem(index: 1);
+      final model = PostFeedMapper.fromPostFeedItem(item);
+
+      expect(model.id, 2);
+      expect(model.videoUrl, isEmpty);
+      expect(model.videoEmbedUrl, 'https://www.youtube.com/embed/dQw4w9WgXcQ');
+      expect(model.wasLikedByMe, isTrue);
+      expect(model.totalLikes, 42);
+      expect(model.author.authorIsMe, isFalse);
+      expect(model.author.isEntitySubscribedByMe, isTrue);
+    });
+
+    test('maps all fixture posts', () {
+      final posts = FeedFixtures.mappedFeedPosts(currentUserId: 11);
+
+      expect(posts, hasLength(3));
+      expect(posts[1].author.authorIsMe, isTrue);
+      expect(posts[1].author.isEntitySubscribedByMe, isTrue);
+      expect(posts[2].videoEmbedUrl, contains('rutube.ru/play/embed'));
+      expect(posts[2].author.isEntitySubscribedByMe, isNull);
+    });
+  });
+}
diff --git a/test/features/feed/models/post_feed_pagination_model_test.dart b/test/features/feed/models/post_feed_pagination_model_test.dart
new file mode 100644
index 00000000..fb1fb47f
--- /dev/null
+++ b/test/features/feed/models/post_feed_pagination_model_test.dart
@@ -0,0 +1,57 @@
+import 'package:flutter_test/flutter_test.dart';
+
+import '../../../fixtures/feed_fixtures.dart';
+
+void main() {
+  group('PostFeedPaginationModel fixtures', () {
+    test('parses first page with gallery, video and next_cursor', () {
+      final model = FeedFixtures.postFeedPaginationModel();
+
+      expect(model.data, hasLength(3));
+      expect(model.meta.perPage, 20);
+      expect(model.meta.nextCursor, 'eyJpZCI6MTAzfQ');
+      expect(model.meta.prevCursor, isNull);
+      expect(model.links.next, contains('cursor=eyJpZCI6MTAzfQ'));
+
+      final withGallery = model.data[0];
+      expect(withGallery.postId, 1);
+      expect(withGallery.images, hasLength(2));
+      expect(withGallery.images.first.orientation, 'horizontal');
+      expect(withGallery.videoEmbedUrl, isNull);
+      expect(withGallery.isEntitySubscribedByMe, isFalse);
+      expect(withGallery.postAuthorDetails?.slug, 'anna-ivanova');
+      expect(withGallery.postAuthorDetails?.isConsultant, isTrue);
+
+      final withYoutubeEmbed = model.data[1];
+      expect(withYoutubeEmbed.postId, 2);
+      expect(withYoutubeEmbed.videoEmbedUrl, 'https://www.youtube.com/embed/dQw4w9WgXcQ');
+      expect(withYoutubeEmbed.postIsLikedByUser, isTrue);
+      expect(withYoutubeEmbed.isEntitySubscribedByMe, isTrue);
+      expect(withYoutubeEmbed.images, isEmpty);
+
+      final withRutubeEmbed = model.data[2];
+      expect(withRutubeEmbed.postId, 3);
+      expect(withRutubeEmbed.postImageUrl, isNull);
+      expect(withRutubeEmbed.images, hasLength(1));
+      expect(withRutubeEmbed.videoEmbedUrl, contains('rutube.ru/play/embed'));
+      expect(withRutubeEmbed.isEntitySubscribedByMe, isNull);    });
+
+    test('parses next page without next_cursor', () {
+      final model = FeedFixtures.postFeedNextPagePaginationModel();
+
+      expect(model.data, hasLength(1));
+      expect(model.data.first.postId, 4);
+      expect(model.meta.nextCursor, isNull);
+      expect(model.meta.prevCursor, 'eyJpZCI6MTAzfQ');
+      expect(model.links.next, isNull);
+    });
+
+    test('parses empty feed', () {
+      final model = FeedFixtures.postFeedEmptyPaginationModel();
+
+      expect(model.data, isEmpty);
+      expect(model.meta.nextCursor, isNull);
+      expect(model.links.next, isNull);
+    });
+  });
+}
diff --git a/test/features/feed/presentation/bloc/feed_cubit/feed_cubit_test.dart b/test/features/feed/presentation/bloc/feed_cubit/feed_cubit_test.dart
index 15cfaa79..cb17180e 100644
--- a/test/features/feed/presentation/bloc/feed_cubit/feed_cubit_test.dart
+++ b/test/features/feed/presentation/bloc/feed_cubit/feed_cubit_test.dart
@@ -1,7 +1,5 @@
-import 'package:eatvio_app/core/models/pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
-import 'package:eatvio_app/features/feed/models/feed_blog_post_settings_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state.dart';
 import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
@@ -13,211 +11,52 @@ import 'feed_cubit_test.mocks.dart';
 
 @GenerateNiceMocks([MockSpec<FeedRepository>()])
 void main() {
-  group('FeedCubit', () {
-    FeedCubit? feedCubit;
-    late MockFeedRepository mockFeedRepository;
-    late FeedBlogPostSettingsModel feedBlogPostsFixture;
+  group('FeedCubit cursor flow', () {
+    late FeedCubit cubit;
+    late MockFeedRepository repository;
+
+    final post = FeedBlogPostModel(
+      id: 10,
+      state: 'active',
+      image: '',
+      description: 'description',
+      author: const Author(authorSlug: 'slug', authorName: 'name', authorProfileIcon: '', authorIsMe: false),
+      videoUrl: '',
+      createdAt: DateTime(2024, 1, 1),
+      updatedAt: DateTime(2024, 1, 1),
+      title: 'title',
+      totalLikes: 1,
+      totalViews: 1,
+      totalComments: 1,
+      wasLikedByMe: false,
+    );
 
     setUp(() {
-      mockFeedRepository = MockFeedRepository();
-      
-      // Создаём тестовые данные
-      final testPosts = [
-        FeedBlogPostModel(
-          id: 1,
-          state: 'published',
-          image: 'https://example.com/image1.jpg',
-          description: 'Описание поста 1',
-          author: const Author(
-            authorSlug: 'author-1',
-            authorName: 'Автор 1',
-            authorProfileIcon: 'https://example.com/photo1.jpg',
-            authorIsMe: false,
-            isEntitySubscribedByMe: null,
-            authorPlaceInRating: null,
-          ),
-          videoUrl: '',
-          createdAt: DateTime.now(),
-          updatedAt: DateTime.now(),
-          title: 'Тестовый пост 1',
-          totalLikes: 10,
-          totalViews: 100,
-          totalComments: 5,
-          wasLikedByMe: false,
-        ),
-        FeedBlogPostModel(
-          id: 2,
-          state: 'published',
-          image: 'https://example.com/image2.jpg',
-          description: 'Описание поста 2',
-          author: const Author(
-            authorSlug: 'author-2',
-            authorName: 'Автор 2',
-            authorProfileIcon: 'https://example.com/photo2.jpg',
-            authorIsMe: false,
-            isEntitySubscribedByMe: null,
-            authorPlaceInRating: null,
-          ),
-          videoUrl: '',
-          createdAt: DateTime.now(),
-          updatedAt: DateTime.now(),
-          title: 'Тестовый пост 2',
-          totalLikes: 20,
-          totalViews: 200,
-          totalComments: 10,
-          wasLikedByMe: true,
-        ),
-      ];
-      
-      feedBlogPostsFixture = FeedBlogPostSettingsModel(
-        feedBlogPostList: testPosts,
-        meta: const Meta(
-          currentPage: 1,
-          from: null,
-          lastPage: 3,
-          links: [],
-          path: null,
-          perPage: 10,
-          to: null,
-          total: 25,
-          totalMinPrice: null,
-          totalMaxPrice: null,
-        ),
-      );
+      repository = MockFeedRepository();
+      cubit = FeedCubit(feedRepository: repository);
     });
 
     tearDown(() async {
-      if (feedCubit != null && !feedCubit!.isClosed) {
-        await Future.delayed(const Duration(milliseconds: 100));
-        feedCubit!.close();
-        feedCubit = null;
-      }
+      await cubit.close();
     });
 
-    test('начальное состояние - FeedStateLoading', () {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      expect(feedCubit!.state, const FeedState.loading());
+    test('error state on load failure', () async {
+      when(repository.getFeed(search: null, cursor: null, currentUserId: null)).thenThrow(Exception('boom'));
+
+      await cubit.loadFeedBlogPostList();
+
+      expect(cubit.state, isA<FeedStateError>());
     });
 
-    test('loadFeedBlogPostList - успешная загрузка постов', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
+    test('updateFeedBlogPostList updates likes in loaded state', () async {
+      when(repository.getFeed(search: null, cursor: null, currentUserId: null)).thenAnswer((_) async => (posts: [post], nextCursor: null));
+      await cubit.loadFeedBlogPostList();
 
-      when(mockFeedRepository.getFeedBlogPosts(query: null))
-          .thenAnswer((_) async => feedBlogPostsFixture);
+      cubit.updateFeedBlogPostList(post, true);
 
-      await feedCubit!.loadFeedBlogPostList();
-
-      await Future.delayed(const Duration(milliseconds: 100));
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      expect(loadedState.feedBlogPostList.length, 2);
-      expect(loadedState.isLoading, false);
-      expect(feedCubit!.lastPage, 3);
-    });
-
-    test('loadFeedBlogPostList - загрузка с запросом', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const query = 'тест';
-
-      when(mockFeedRepository.getFeedBlogPosts(query: query))
-          .thenAnswer((_) async => feedBlogPostsFixture);
-
-      await feedCubit!.loadFeedBlogPostList(query: query);
-
-      await Future.delayed(const Duration(milliseconds: 100));
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      verify(mockFeedRepository.getFeedBlogPosts(query: query)).called(1);
-    });
-
-    test('loadFeedBlogPostList - обработка ошибки', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-
-      when(mockFeedRepository.getFeedBlogPosts(query: anyNamed('query')))
-          .thenThrow(Exception('Ошибка загрузки'));
-
-      await feedCubit!.loadFeedBlogPostList();
-
-      await Future.delayed(const Duration(milliseconds: 100));
-      expect(feedCubit!.state, isA<FeedStateError>());
-      final errorState = feedCubit!.state as FeedStateError;
-      expect(errorState.errorMessage, contains('Exception'));
-    });
-
-    test('updateFeedBlogPostList - обновление лайка поста', () {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      
-      // Сначала загружаем посты
-      when(mockFeedRepository.getFeedBlogPosts(query: anyNamed('query')))
-          .thenAnswer((_) async => feedBlogPostsFixture);
-
-      // Устанавливаем состояние loaded вручную для теста
-      feedCubit!.emit(FeedState.loaded(
-        feedBlogPostList: feedBlogPostsFixture.feedBlogPostList,
-        isLoading: false,
-      ));
-      feedCubit!.lastPage = 3;
-
-      final postToUpdate = feedBlogPostsFixture.feedBlogPostList.first;
-      feedCubit!.updateFeedBlogPostList(postToUpdate, true);
-
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      final updatedPost = loadedState.feedBlogPostList.firstWhere((p) => p.id == postToUpdate.id);
-      expect(updatedPost.wasLikedByMe, true);
-      expect(updatedPost.totalLikes, postToUpdate.totalLikes + 1);
-    });
-
-    test('updateFeedBlogPostList - снятие лайка', () {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      
-      feedCubit!.emit(FeedState.loaded(
-        feedBlogPostList: feedBlogPostsFixture.feedBlogPostList,
-        isLoading: false,
-      ));
-      feedCubit!.lastPage = 3;
-
-      final postToUpdate = feedBlogPostsFixture.feedBlogPostList[1]; // У этого wasLikedByMe = true
-      final initialLikes = postToUpdate.totalLikes;
-      
-      feedCubit!.updateFeedBlogPostList(postToUpdate, false);
-
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      final updatedPost = loadedState.feedBlogPostList.firstWhere((p) => p.id == postToUpdate.id);
-      expect(updatedPost.wasLikedByMe, false);
-      expect(updatedPost.totalLikes, initialLikes - 1);
-    });
-
-    test('updateFeedBlogPostList - игнорирует обновление если состояние не loaded', () {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      
-      // Состояние loading
-      feedCubit!.emit(const FeedState.loading());
-      
-      final postToUpdate = feedBlogPostsFixture.feedBlogPostList.first;
-      feedCubit!.updateFeedBlogPostList(postToUpdate, true);
-
-      // Состояние не должно измениться
-      expect(feedCubit!.state, const FeedState.loading());
-    });
-
-    test('updateFeedBlogPostList - игнорирует обновление если пост не найден', () {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      
-      feedCubit!.emit(FeedState.loaded(
-        feedBlogPostList: feedBlogPostsFixture.feedBlogPostList,
-        isLoading: false,
-      ));
-      feedCubit!.lastPage = 3;
-
-      // Создаём пост с несуществующим ID
-      final nonExistentPost = feedBlogPostsFixture.feedBlogPostList.first.copyWith(id: 999);
-      feedCubit!.updateFeedBlogPostList(nonExistentPost, true);
-
-      // Список не должен измениться
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      expect(loadedState.feedBlogPostList.length, 2);
+      final loaded = cubit.state as FeedStateLoaded;
+      expect(loaded.feedBlogPostList.first.wasLikedByMe, true);
+      expect(loaded.feedBlogPostList.first.totalLikes, 2);
     });
   });
 }
-
diff --git a/test/features/feed/presentation/bloc/feed_cubit_test.dart b/test/features/feed/presentation/bloc/feed_cubit_test.dart
index 7213c5e9..e8d1de87 100644
--- a/test/features/feed/presentation/bloc/feed_cubit_test.dart
+++ b/test/features/feed/presentation/bloc/feed_cubit_test.dart
@@ -1,404 +1,66 @@
-import 'package:eatvio_app/core/models/pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
-import 'package:eatvio_app/features/feed/models/feed_blog_post_settings_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state.dart';
 import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
+
 import 'feed_cubit_test.mocks.dart';
 
 @GenerateNiceMocks([MockSpec<FeedRepository>()])
 void main() {
   group('FeedCubit', () {
-    FeedCubit? feedCubit;
-    late MockFeedRepository mockFeedRepository;
+    late MockFeedRepository repository;
+    late FeedCubit cubit;
 
-    final testBlogPost = FeedBlogPostModel(
+    final post = FeedBlogPostModel(
       id: 1,
-      title: 'Test Post',
-      description: 'Test description',
-      image: 'https://example.com/image.jpg',
-      state: 'published',
-      author: const Author(authorSlug: 'author-1', authorName: 'Author Name', authorProfileIcon: 'https://example.com/icon.jpg', authorIsMe: false),
-      videoUrl: 'https://example.com/video.mp4',
-      createdAt: DateTime(2024, 1, 15),
-      updatedAt: DateTime(2024, 1, 15),
-      totalLikes: 10,
-      totalViews: 100,
-      totalComments: 5,
+      state: 'active',
+      image: 'https://example.com/image.png',
+      description: 'text',
+      author: const Author(authorSlug: 'a', authorName: 'Author', authorProfileIcon: 'https://example.com/avatar.png', authorIsMe: false),
+      videoUrl: '',
+      createdAt: DateTime(2024, 1, 1),
+      updatedAt: DateTime(2024, 1, 1),
+      title: 'Title',
+      totalLikes: 1,
+      totalViews: 2,
+      totalComments: 3,
       wasLikedByMe: false,
     );
 
-    final testBlogPost2 = FeedBlogPostModel(
-      id: 2,
-      title: 'Test Post 2',
-      description: 'Test description 2',
-      image: 'https://example.com/image2.jpg',
-      state: 'published',
-      author: const Author(authorSlug: 'author-2', authorName: 'Author Name 2', authorProfileIcon: 'https://example.com/icon2.jpg', authorIsMe: false),
-      videoUrl: 'https://example.com/video2.mp4',
-      createdAt: DateTime(2024, 1, 16),
-      updatedAt: DateTime(2024, 1, 16),
-      totalLikes: 20,
-      totalViews: 200,
-      totalComments: 10,
-      wasLikedByMe: true,
-    );
-
     setUp(() {
-      mockFeedRepository = MockFeedRepository();
+      repository = MockFeedRepository();
+      cubit = FeedCubit(feedRepository: repository);
     });
 
     tearDown(() async {
-      if (feedCubit != null && !feedCubit!.isClosed) {
-        await Future.delayed(const Duration(milliseconds: 100));
-        feedCubit!.close();
-        feedCubit = null;
-      }
+      await cubit.close();
     });
 
-    test('начальное состояние - loading', () {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      expect(feedCubit!.state, const FeedState.loading());
+    test('loadFeedBlogPostList emits loaded from getFeed', () async {
+      when(repository.getFeed(search: null, cursor: null, currentUserId: null)).thenAnswer((_) async => (posts: [post], nextCursor: 'next'));
+
+      await cubit.loadFeedBlogPostList();
+
+      expect(cubit.state, isA<FeedStateLoaded>());
+      final loaded = cubit.state as FeedStateLoaded;
+      expect(loaded.feedBlogPostList, hasLength(1));
+      verify(repository.getFeed(search: null, cursor: null, currentUserId: null)).called(1);
     });
 
-    test('loadFeedBlogPostList - успешно загружает список постов', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final expectedSettings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 3, total: 3, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
+    test('loadNextPage appends posts', () async {
+      when(repository.getFeed(search: null, cursor: null, currentUserId: null)).thenAnswer((_) async => (posts: [post], nextCursor: 'next'));
+      when(repository.getFeed(search: null, cursor: 'next', currentUserId: null)).thenAnswer((_) async => (posts: [post.copyWith(id: 2)], nextCursor: null));
 
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => expectedSettings);
+      await cubit.loadFeedBlogPostList();
+      await cubit.loadNextPage();
 
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      expect(loadedState.feedBlogPostList.length, 1);
-      expect(loadedState.feedBlogPostList.first.id, 1);
-      expect(loadedState.isLoading, false);
-      expect(feedCubit!.lastPage, 3);
-      verify(mockFeedRepository.getFeedBlogPosts(query: null)).called(1);
-    });
-
-    test('loadFeedBlogPostList - загружает список постов с query', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const query = 'test query';
-      final expectedSettings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost, testBlogPost2],
-        meta: const Meta(currentPage: 1, lastPage: 1, total: 2, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: query)).thenAnswer((_) async => expectedSettings);
-
-      await feedCubit!.loadFeedBlogPostList(query: query);
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      expect(loadedState.feedBlogPostList.length, 2);
-      verify(mockFeedRepository.getFeedBlogPosts(query: query)).called(1);
-    });
-
-    test('loadFeedBlogPostList - обрабатывает ошибку', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final exception = Exception('Network error');
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenThrow(exception);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, isA<FeedStateError>());
-      final errorState = feedCubit!.state as FeedStateError;
-      expect(errorState.errorMessage, contains('Exception: Network error'));
-    });
-
-    test('loadNextPage - загружает следующую страницу', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final firstPageSettings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 3, total: 3, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      final secondPageSettings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost2],
-        meta: const Meta(currentPage: 2, lastPage: 3, total: 3, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => firstPageSettings);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      when(mockFeedRepository.getFeedBlogPosts(page: 2, query: null)).thenAnswer((_) async => secondPageSettings);
-
-      await feedCubit!.loadNextPage();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      expect(loadedState.feedBlogPostList.length, 2);
-      expect(feedCubit!.currentPage, 2);
-      expect(loadedState.isLoading, false);
-      verify(mockFeedRepository.getFeedBlogPosts(page: 2, query: null)).called(1);
-    });
-
-    test('loadNextPage - не загружает если уже на последней странице', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final settings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 1, total: 1, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => settings);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      await feedCubit!.loadNextPage();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      verifyNever(mockFeedRepository.getFeedBlogPosts(page: 2, query: anyNamed('query')));
-    });
-
-    test('loadNextPage - не загружает если уже загружается', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final settings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 3, total: 3, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => settings);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      feedCubit!.isLoading = true;
-
-      await feedCubit!.loadNextPage();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      verifyNever(mockFeedRepository.getFeedBlogPosts(page: 2, query: anyNamed('query')));
-    });
-
-    test('loadNextPage - обрабатывает ошибку при загрузке следующей страницы', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final firstPageSettings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 3, total: 3, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => firstPageSettings);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      final exception = Exception('Network error');
-      when(mockFeedRepository.getFeedBlogPosts(page: 2, query: null)).thenThrow(exception);
-
-      await feedCubit!.loadNextPage();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, isA<FeedStateError>());
-      final errorState = feedCubit!.state as FeedStateError;
-      expect(errorState.errorMessage, contains('Exception: Network error'));
-    });
-
-    test('loadNextPage - сохраняет query при загрузке следующей страницы', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const query = 'test query';
-      final firstPageSettings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 3, total: 3, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      final secondPageSettings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost2],
-        meta: const Meta(currentPage: 2, lastPage: 3, total: 3, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: query)).thenAnswer((_) async => firstPageSettings);
-
-      await feedCubit!.loadFeedBlogPostList(query: query);
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      when(mockFeedRepository.getFeedBlogPosts(page: 2, query: query)).thenAnswer((_) async => secondPageSettings);
-
-      await feedCubit!.loadNextPage();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      verify(mockFeedRepository.getFeedBlogPosts(page: 2, query: query)).called(1);
-    });
-
-    test('updateFeedBlogPostList - обновляет лайк поста', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final settings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 1, total: 1, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => settings);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      feedCubit!.updateFeedBlogPostList(testBlogPost, true);
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      expect(loadedState.feedBlogPostList.first.wasLikedByMe, true);
-      expect(loadedState.feedBlogPostList.first.totalLikes, 11);
-    });
-
-    test('updateFeedBlogPostList - убирает лайк поста', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final settings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost2],
-        meta: const Meta(currentPage: 1, lastPage: 1, total: 1, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => settings);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      feedCubit!.updateFeedBlogPostList(testBlogPost2, false);
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      expect(loadedState.feedBlogPostList.first.wasLikedByMe, false);
-      expect(loadedState.feedBlogPostList.first.totalLikes, 19);
-    });
-
-    test('updateFeedBlogPostList - не обновляет если пост не найден', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final settings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 1, total: 1, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => settings);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      final nonExistentPost = testBlogPost.copyWith(id: 999);
-      final initialState = feedCubit!.state;
-      feedCubit!.updateFeedBlogPostList(nonExistentPost, true);
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, initialState);
-    });
-
-    test('updateFeedBlogPostList - не обновляет если state не loaded', () {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      feedCubit!.updateFeedBlogPostList(testBlogPost, true);
-      expect(feedCubit!.state, const FeedState.loading());
-    });
-
-    test('updateFeedBlogPostList - не обновляет если post null', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final settings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 1, total: 1, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => settings);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      final initialState = feedCubit!.state;
-      feedCubit!.updateFeedBlogPostList(null, true);
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, initialState);
-    });
-
-    test('likePost - лайкает пост', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const postId = 1;
-
-      when(mockFeedRepository.likeBlogPost(id: postId)).thenAnswer((_) async => Future.value());
-
-      await feedCubit!.likePost(postId);
-
-      verify(mockFeedRepository.likeBlogPost(id: postId)).called(1);
-    });
-
-    test('likePost - обрабатывает ошибку без выбрасывания', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const postId = 1;
-      final exception = Exception('Network error');
-
-      when(mockFeedRepository.likeBlogPost(id: postId)).thenThrow(exception);
-
-      await feedCubit!.likePost(postId);
-
-      verify(mockFeedRepository.likeBlogPost(id: postId)).called(1);
-    });
-
-    test('unlikedPost - убирает лайк с поста', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const postId = 1;
-
-      when(mockFeedRepository.unlikedBlogPost(id: postId)).thenAnswer((_) async => Future.value());
-
-      await feedCubit!.unlikedPost(postId);
-
-      verify(mockFeedRepository.unlikedBlogPost(id: postId)).called(1);
-    });
-
-    test('viewPost - отправляет просмотр поста', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const postId = 1;
-
-      when(mockFeedRepository.viewPost(postId)).thenAnswer((_) async => Future.value());
-
-      await feedCubit!.viewPost(postId);
-
-      verify(mockFeedRepository.viewPost(postId)).called(1);
-    });
-
-    test('viewRecipe - отправляет просмотр рецепта', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const slug = 'recipe-1';
-
-      when(mockFeedRepository.viewRecipe(slug)).thenAnswer((_) async => Future.value());
-
-      await feedCubit!.viewRecipe(slug);
-
-      verify(mockFeedRepository.viewRecipe(slug)).called(1);
-    });
-
-    test('viewDiet - отправляет просмотр диеты', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const dietId = 2;
-
-      when(mockFeedRepository.viewDiet(dietId)).thenAnswer((_) async => Future.value());
-
-      await feedCubit!.viewDiet(dietId);
-
-      verify(mockFeedRepository.viewDiet(dietId)).called(1);
-    });
-
-    test('viewPlan - отправляет просмотр плана', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const slug = 'plan-1';
-
-      when(mockFeedRepository.viewPlan(slug)).thenAnswer((_) async => Future.value());
-
-      await feedCubit!.viewPlan(slug);
-
-      verify(mockFeedRepository.viewPlan(slug)).called(1);
+      final loaded = cubit.state as FeedStateLoaded;
+      expect(loaded.feedBlogPostList, hasLength(2));
+      verify(repository.getFeed(search: null, cursor: 'next', currentUserId: null)).called(1);
     });
   });
 }
diff --git a/test/features/feed/presentation/widgets/basic_widget_test.dart b/test/features/feed/presentation/widgets/basic_widget_test.dart
index 16e18b6e..b9d7a80b 100644
--- a/test/features/feed/presentation/widgets/basic_widget_test.dart
+++ b/test/features/feed/presentation/widgets/basic_widget_test.dart
@@ -1,12 +1,10 @@
 import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/app_initializer.dart';
 import 'package:eatvio_app/core/locator_service.dart';
-import 'package:eatvio_app/core/models/pagination_model.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/core/routing/route_constants.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
-import 'package:eatvio_app/features/feed/models/feed_blog_post_settings_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/blog_posts.dart';
@@ -378,12 +376,8 @@ void main() {
         // Arrange
         feedCubit.emit(FeedState.loaded(feedBlogPostList: [testBlogPost], isLoading: false));
 
-        when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer(
-          (_) async => FeedBlogPostSettingsModel(
-            feedBlogPostList: [testBlogPost, testBlogPost2],
-            meta: const Meta(currentPage: 1, lastPage: 1, total: 2, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-          ),
-        );
+        when(mockFeedRepository.getFeed(search: null, cursor: null, currentUserId: null))
+            .thenAnswer((_) async => (posts: [testBlogPost, testBlogPost2], nextCursor: null));
 
         final widget = BlogPosts(handleVisibility: ({required visibleFraction, required id, required type}) {});
 
diff --git a/test/features/feed/presentation/widgets/blog_post_widget_test.dart b/test/features/feed/presentation/widgets/blog_post_widget_test.dart
index 3571cf2b..ffc2b581 100644
--- a/test/features/feed/presentation/widgets/blog_post_widget_test.dart
+++ b/test/features/feed/presentation/widgets/blog_post_widget_test.dart
@@ -81,7 +81,7 @@ void main() {
         when(cubit.stream).thenAnswer((_) => Stream.value(state));
         when(cubit.close()).thenAnswer((_) async => Future<void>.value());
 
-        await tester.pumpWidget(BlocProvider<FeedCubit>.value(value: cubit, child: wrap(const BlogPostWidget(index: 0))));
+        await tester.pumpWidget(BlocProvider<FeedCubit>.value(value: cubit, child: wrap(BlogPostWidget(post: mockBlogPost))));
         await tester.pump();
         await tester.pump(const Duration(milliseconds: 100));
 
diff --git a/test/features/feed/repositories/feed_repository_test.dart b/test/features/feed/repositories/feed_repository_test.dart
index d2a56a55..10e9f200 100644
--- a/test/features/feed/repositories/feed_repository_test.dart
+++ b/test/features/feed/repositories/feed_repository_test.dart
@@ -1,8 +1,10 @@
 import 'package:eatvio_app/core/models/pagination_model.dart';
+import 'package:eatvio_app/core/app_config.dart';
+import 'package:eatvio_app/core/app_initializer.dart';
+import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/features/feed/models/comment_model.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
-import 'package:eatvio_app/features/feed/models/feed_blog_post_settings_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_consultant_model.dart';
 import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/recipes_model.dart';
@@ -11,9 +13,11 @@ import 'package:eatvio_app/features/feed/models/view_model.dart';
 import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
 import 'package:eatvio_app/features/feed/services/feed_service.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 
+import '../../../fixtures/feed_fixtures.dart';
 import '../../../fixtures/fixture_reader.dart';
 import 'feed_repository_test.mocks.dart';
 
@@ -23,72 +27,57 @@ void main() {
     late FeedRepository feedRepository;
     late MockFeedService mockFeedService;
 
-    setUp(() {
+    setUp(() async {
+      dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
+      await sl.reset();
+      sl.registerLazySingleton<AppConfig>(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
       mockFeedService = MockFeedService();
       feedRepository = FeedRepository(feedService: mockFeedService);
     });
 
-    test('getFeedBlogPosts - успешное получение постов', () async {
-      const expectedModel = FeedBlogPostSettingsModel(
-        feedBlogPostList: [],
-        meta: Meta(currentPage: 1, from: null, lastPage: 1, links: [], path: null, perPage: 10, to: null, total: 0, totalMinPrice: null, totalMaxPrice: null),
-      );
+    test('getFeed - успешное получение постов', () async {
+      final expectedModel = FeedFixtures.postFeedPaginationModel();
 
-      when(mockFeedService.getBlogPostList(page: 1, query: null)).thenAnswer((_) async => expectedModel);
+      when(mockFeedService.getFeed(search: null, cursor: null)).thenAnswer((_) async => expectedModel);
 
-      final result = await feedRepository.getFeedBlogPosts();
+      final result = await feedRepository.getFeed();
 
-      expect(result, isA<FeedBlogPostSettingsModel>());
-      verify(mockFeedService.getBlogPostList(page: 1, query: null)).called(1);
+      expect(result.posts, hasLength(3));
+      expect(result.posts.first.id, 1);
+      expect(result.posts[1].videoEmbedUrl, 'https://www.youtube.com/embed/dQw4w9WgXcQ');
+      expect(result.nextCursor, 'eyJpZCI6MTAzfQ');
+      verify(mockFeedService.getFeed(search: null, cursor: null)).called(1);
     });
 
-    test('getFeedBlogPosts - с запросом и страницей', () async {
+    test('getFeed - с запросом и курсором', () async {
       const query = 'тест';
-      const page = 2;
-      const expectedModel = FeedBlogPostSettingsModel(
-        feedBlogPostList: [],
-        meta: Meta(
-          currentPage: page,
-          from: null,
-          lastPage: 2,
-          links: [],
-          path: null,
-          perPage: 10,
-          to: null,
-          total: 15,
-          totalMinPrice: null,
-          totalMaxPrice: null,
-        ),
-      );
+      const cursor = 'eyJpZCI6MTAzfQ';
+      final expectedModel = FeedFixtures.postFeedNextPagePaginationModel();
 
-      when(mockFeedService.getBlogPostList(page: page, query: query)).thenAnswer((_) async => expectedModel);
+      when(mockFeedService.getFeed(search: query, cursor: cursor)).thenAnswer((_) async => expectedModel);
 
-      final result = await feedRepository.getFeedBlogPosts(query: query, page: page);
+      final result = await feedRepository.getFeed(search: query, cursor: cursor);
 
-      expect(result, isA<FeedBlogPostSettingsModel>());
-      verify(mockFeedService.getBlogPostList(page: page, query: query)).called(1);
+      expect(result.posts, hasLength(1));
+      expect(result.posts.first.id, 4);
+      expect(result.nextCursor, isNull);
+      verify(mockFeedService.getFeed(search: query, cursor: cursor)).called(1);
     });
 
-    test('getFeedBlogPosts - возвращает список постов без query', () async {
-      const page = 1;
-      const expectedSettings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [],
-        meta: Meta(currentPage: 1, lastPage: 1, total: 0, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
+    test('getFeed - пустая лента', () async {
+      final expectedModel = FeedFixtures.postFeedEmptyPaginationModel();
 
-      when(mockFeedService.getBlogPostList(page: page, query: null)).thenAnswer((_) async => expectedSettings);
+      when(mockFeedService.getFeed(search: null, cursor: null)).thenAnswer((_) async => expectedModel);
 
-      final result = await feedRepository.getFeedBlogPosts(page: page);
+      final result = await feedRepository.getFeed();
 
-      expect(result, isA<FeedBlogPostSettingsModel>());
-      expect(result.feedBlogPostList.isEmpty, true);
-      verify(mockFeedService.getBlogPostList(page: page, query: null)).called(1);
+      expect(result.posts, isEmpty);
+      expect(result.nextCursor, isNull);
     });
 
     test('getBlogPost - успешное получение поста', () async {
       const postId = 1;
-      final json = FixtureReader.readAsMap('feed/feed_blog_post_response.json');
-      final expectedPost = FeedBlogPostModel.fromJson(json);
+      final expectedPost = FeedFixtures.feedBlogPostModel();
 
       when(mockFeedService.getBlogPost(postId: postId)).thenAnswer((_) async => expectedPost);
 
@@ -96,6 +85,9 @@ void main() {
 
       expect(result, isA<FeedBlogPostModel>());
       expect(result.id, postId);
+      expect(result.images, hasLength(2));
+      expect(result.videoEmbedUrl, contains('rutube.ru/play/embed'));
+      expect(result.videoUrlThumb, isNotEmpty);
       verify(mockFeedService.getBlogPost(postId: postId)).called(1);
     });
 
@@ -529,10 +521,10 @@ void main() {
       verify(mockFeedService.viewContent(viewModel: viewModel)).called(1);
     });
 
-    test('getFeedBlogPosts - пробрасывает исключение', () async {
-      when(mockFeedService.getBlogPostList(page: 1, query: null)).thenThrow(Exception('Ошибка сети'));
+    test('getFeed - пробрасывает исключение', () async {
+      when(mockFeedService.getFeed(search: null, cursor: null)).thenThrow(Exception('Ошибка сети'));
 
-      expect(() => feedRepository.getFeedBlogPosts(), throwsException);
+      expect(() => feedRepository.getFeed(), throwsException);
     });
   });
 }
diff --git a/test/features/feed/services/feed_service_test.dart b/test/features/feed/services/feed_service_test.dart
index e8832ec5..1c1ec3c1 100644
--- a/test/features/feed/services/feed_service_test.dart
+++ b/test/features/feed/services/feed_service_test.dart
@@ -13,6 +13,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 
+import '../../../fixtures/feed_fixtures.dart';
 import 'feed_service_test.mocks.dart';
 
 @GenerateNiceMocks([MockSpec<FeedService>()])
@@ -55,6 +56,32 @@ void main() {
       verify(mockFeedService.getBlogPostList(page: page, query: null)).called(1);
     });
 
+    test('getFeed returns cursor response', () async {
+      final expected = FeedFixtures.postFeedPaginationModel();
+
+      when(mockFeedService.getFeed(search: null, cursor: null)).thenAnswer((_) async => expected);
+
+      final result = await mockFeedService.getFeed(search: null, cursor: null);
+
+      expect(result.data, hasLength(3));
+      expect(result.meta.perPage, 20);
+      expect(result.meta.nextCursor, 'eyJpZCI6MTAzfQ');
+      verify(mockFeedService.getFeed(search: null, cursor: null)).called(1);
+    });
+
+    test('getFeed returns next page without cursor', () async {
+      const cursor = 'eyJpZCI6MTAzfQ';
+      final expected = FeedFixtures.postFeedNextPagePaginationModel();
+
+      when(mockFeedService.getFeed(search: null, cursor: cursor)).thenAnswer((_) async => expected);
+
+      final result = await mockFeedService.getFeed(search: null, cursor: cursor);
+
+      expect(result.data, hasLength(1));
+      expect(result.meta.nextCursor, isNull);
+      verify(mockFeedService.getFeed(search: null, cursor: cursor)).called(1);
+    });
+
     test('getBlogPost returns post', () async {
       const id = 10;
       final expected = FeedBlogPostModel(
diff --git a/test/features/payment/consultation_payment_flow_test.dart b/test/features/payment/consultation_payment_flow_test.dart
index f0544e6d..8b532853 100644
--- a/test/features/payment/consultation_payment_flow_test.dart
+++ b/test/features/payment/consultation_payment_flow_test.dart
@@ -1,6 +1,9 @@
-import 'package:eatvio_app/generated/l10n.dart';
+import 'package:eatvio_app/features/payment/models/promo_apply_response.dart';
+import 'package:eatvio_app/features/payment/models/promo_code_model.dart';
+import 'package:eatvio_app/features/payment/models/promo_validate_response.dart';
 import 'package:eatvio_app/features/payment/presentation/payment_flow.dart';
 import 'package:eatvio_app/features/payment/presentation/widgets/promo_code_modal.dart';
+import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -26,8 +29,17 @@ void main() {
     late bool? gateResult;
     late bool formCalled;
     late PromoCodeResult? formResult;
+    late PromoCodeModel? formInitialPromo;
     late bool sbpCalled;
     late int sbpPlanId;
+    late int validateCalls;
+    late int applyCalls;
+    late String? lastValidatedCode;
+    late String? lastAppliedCode;
+    late PromoValidateResponse validateResponse;
+    late PromoApplyResponse applyResponse;
+    late bool applyThrows;
+    late PromoCodeModel? listAppliedResult;
 
     Future<bool?> mockGate(BuildContext context) async {
       gateCalled = true;
@@ -37,8 +49,27 @@ void main() {
     Future<PromoCodeResult?> mockForm(
       BuildContext context, {
       Future<PromoValidation> Function(String)? onValidate,
+      Future<bool> Function()? onRemove,
+      PromoCodeModel? initialPromo,
     }) async {
       formCalled = true;
+      formInitialPromo = initialPromo;
+
+      if (formResult?.hasPromoCode == true &&
+          !formResult!.alreadyApplied &&
+          onValidate != null) {
+        final validation = await onValidate(formResult!.code!);
+        if (!validation.isValid) {
+          return null;
+        }
+        return PromoCodeResult(
+          code: formResult!.code,
+          discountPercent: validation.discountPercent,
+          discountAmountRub: validation.discountAmountRub,
+          originalAmountRub: validation.originalAmountRub,
+          finalAmountRub: validation.finalAmountRub,
+        );
+      }
       return formResult;
     }
 
@@ -47,31 +78,86 @@ void main() {
       sbpPlanId = planId;
     }
 
+    Future<PromoValidateResponse> mockValidate({
+      required int planId,
+      required String promoCode,
+    }) async {
+      validateCalls++;
+      lastValidatedCode = promoCode;
+      return validateResponse;
+    }
+
+    Future<PromoApplyResponse> mockApply({
+      required int planId,
+      required String promoCode,
+    }) async {
+      applyCalls++;
+      lastAppliedCode = promoCode;
+      if (applyThrows) {
+        throw Exception('network');
+      }
+      return applyResponse;
+    }
+
+    Future<PromoCodeModel?> mockListApplied(int planId) async {
+      return listAppliedResult;
+    }
+
+    Future<bool> mockRemove(int planId) async {
+      return true;
+    }
+
     setUp(() {
       gateCalled = false;
       gateResult = null;
       formCalled = false;
       formResult = null;
+      formInitialPromo = null;
       sbpCalled = false;
       sbpPlanId = 0;
+      validateCalls = 0;
+      applyCalls = 0;
+      lastValidatedCode = null;
+      lastAppliedCode = null;
+      listAppliedResult = null;
+      validateResponse = const PromoValidateResponse(
+        valid: true,
+        promoCode: 'TEST123',
+        discountPercent: 5,
+        discountAmountRub: 60,
+        originalAmountRub: 1200,
+        finalAmountRub: 1140,
+      );
+      applyResponse = const PromoApplyResponse(success: true);
+      applyThrows = false;
     });
 
-    testWidgets('Нет → вызывает SbpBanks (не форму)', (tester) async {
-      gateResult = false;
-      await tester.pumpWidget(createTestApp());
-
-      await showConsultationPaymentFlow(
+    Future<void> runFlow(WidgetTester tester) {
+      return showConsultationPaymentFlow(
         tester.element(find.byType(SizedBox)),
         planId: 42,
         showGate: mockGate,
         showForm: mockForm,
         showSbp: mockSbp,
+        validatePromo: mockValidate,
+        applyPromo: mockApply,
+        listApplied: mockListApplied,
+        removePromo: mockRemove,
       );
+    }
+
+    testWidgets('Нет → вызывает SbpBanks (не форму)', (tester) async {
+      gateResult = false;
+      await tester.pumpWidget(createTestApp());
+
+      await runFlow(tester);
 
       expect(gateCalled, isTrue);
       expect(formCalled, isFalse);
       expect(sbpCalled, isTrue);
       expect(sbpPlanId, 42);
+      expect(validateCalls, 0);
+      expect(applyCalls, 0);
     });
 
     testWidgets('Да → форма → Пропустить → вызывает SbpBanks', (tester) async {
@@ -79,18 +165,13 @@ void main() {
       formResult = const PromoCodeResult();
       await tester.pumpWidget(createTestApp());
 
-      await showConsultationPaymentFlow(
-        tester.element(find.byType(SizedBox)),
-        planId: 42,
-        showGate: mockGate,
-        showForm: mockForm,
-        showSbp: mockSbp,
-      );
+      await runFlow(tester);
 
       expect(gateCalled, isTrue);
       expect(formCalled, isTrue);
       expect(sbpCalled, isTrue);
       expect(sbpPlanId, 42);
+      expect(applyCalls, 0);
     });
 
     testWidgets('Да → форма отменена (null) → Sbp не вызывается', (tester) async {
@@ -98,13 +179,7 @@ void main() {
       formResult = null;
       await tester.pumpWidget(createTestApp());
 
-      await showConsultationPaymentFlow(
-        tester.element(find.byType(SizedBox)),
-        planId: 42,
-        showGate: mockGate,
-        showForm: mockForm,
-        showSbp: mockSbp,
-      );
+      await runFlow(tester);
 
       expect(gateCalled, isTrue);
       expect(formCalled, isTrue);
@@ -115,17 +190,121 @@ void main() {
       gateResult = null;
       await tester.pumpWidget(createTestApp());
 
-      await showConsultationPaymentFlow(
-        tester.element(find.byType(SizedBox)),
-        planId: 42,
-        showGate: mockGate,
-        showForm: mockForm,
-        showSbp: mockSbp,
-      );
+      await runFlow(tester);
 
       expect(gateCalled, isTrue);
       expect(formCalled, isFalse);
       expect(sbpCalled, isFalse);
     });
+
+    testWidgets('Да → код → validate + apply → SbpBanks', (tester) async {
+      gateResult = true;
+      formResult = const PromoCodeResult(code: 'TEST123');
+      await tester.pumpWidget(createTestApp());
+
+      await runFlow(tester);
+
+      expect(validateCalls, 1);
+      expect(lastValidatedCode, 'TEST123');
+      expect(applyCalls, 1);
+      expect(lastAppliedCode, 'TEST123');
+      expect(sbpCalled, isTrue);
+      expect(sbpPlanId, 42);
+    });
+
+    testWidgets('Да → код → apply fail → Sbp не вызывается', (tester) async {
+      gateResult = true;
+      formResult = const PromoCodeResult(code: 'BAD');
+      applyResponse = const PromoApplyResponse(
+        success: false,
+        error: 'Промокод уже использован',
+      );
+      await tester.pumpWidget(createTestApp());
+
+      await runFlow(tester);
+
+      expect(applyCalls, 1);
+      expect(sbpCalled, isFalse);
+    });
+
+    testWidgets('applied rehydrate → Continue → SBP без apply и без гейта', (tester) async {
+      listAppliedResult = const PromoCodeModel(
+        id: 1,
+        chosenPlanId: 42,
+        promoCode: 'SAVE5',
+        discountPercent: 5,
+        discountAmountRub: 60,
+        state: 'applied',
+      );
+      formResult = const PromoCodeResult(
+        code: 'SAVE5',
+        discountPercent: 5,
+        discountAmountRub: 60,
+        alreadyApplied: true,
+      );
+      await tester.pumpWidget(createTestApp());
+
+      await runFlow(tester);
+
+      expect(gateCalled, isFalse);
+      expect(formCalled, isTrue);
+      expect(formInitialPromo?.promoCode, 'SAVE5');
+      expect(applyCalls, 0);
+      expect(sbpCalled, isTrue);
+    });
+
+    testWidgets('list пустой → идёт через гейт', (tester) async {
+      listAppliedResult = null;
+      gateResult = false;
+      await tester.pumpWidget(createTestApp());
+
+      await runFlow(tester);
+
+      expect(gateCalled, isTrue);
+      expect(formCalled, isFalse);
+      expect(sbpCalled, isTrue);
+    });
+
+    testWidgets('rehydrate → Remove → новый код → apply → SBP', (tester) async {
+      listAppliedResult = const PromoCodeModel(
+        id: 1,
+        chosenPlanId: 42,
+        promoCode: 'OLD',
+        discountPercent: 5,
+        discountAmountRub: 60,
+        state: 'applied',
+      );
+      formResult = const PromoCodeResult(code: 'NEW123');
+      await tester.pumpWidget(createTestApp());
+
+      await runFlow(tester);
+
+      expect(gateCalled, isFalse);
+      expect(formCalled, isTrue);
+      expect(validateCalls, 1);
+      expect(applyCalls, 1);
+      expect(lastAppliedCode, 'NEW123');
+      expect(sbpCalled, isTrue);
+    });
+
+    testWidgets('rehydrate → Remove → Skip → SBP без apply', (tester) async {
+      listAppliedResult = const PromoCodeModel(
+        id: 1,
+        chosenPlanId: 42,
+        promoCode: 'OLD',
+        discountPercent: 5,
+        discountAmountRub: 60,
+        state: 'applied',
+      );
+      formResult = const PromoCodeResult();
+      await tester.pumpWidget(createTestApp());
+
+      await runFlow(tester);
+
+      expect(gateCalled, isFalse);
+      expect(formCalled, isTrue);
+      expect(applyCalls, 0);
+      expect(sbpCalled, isTrue);
+    });
   });
 }
diff --git a/test/features/payment/models/promo_response_models_test.dart b/test/features/payment/models/promo_response_models_test.dart
new file mode 100644
index 00000000..d9c65468
--- /dev/null
+++ b/test/features/payment/models/promo_response_models_test.dart
@@ -0,0 +1,108 @@
+import 'package:eatvio_app/features/payment/models/promo_applied_list_response.dart';
+import 'package:eatvio_app/features/payment/models/promo_apply_response.dart';
+import 'package:eatvio_app/features/payment/models/promo_code_model.dart';
+import 'package:eatvio_app/features/payment/models/promo_validate_response.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group('PromoValidateResponse', () {
+    test('parses valid preview', () {
+      final response = PromoValidateResponse.fromJson({
+        'valid': true,
+        'promo_code': 'PROMO_100117_A',
+        'discount_percent': 5,
+        'discount_amount_rub': 60.0,
+        'original_amount_rub': 1200.0,
+        'final_amount_rub': 1140.0,
+      });
+
+      expect(response.valid, isTrue);
+      expect(response.promoCode, 'PROMO_100117_A');
+      expect(response.discountPercent, 5);
+      expect(response.finalAmountRub, 1140.0);
+      expect(response.error, isNull);
+    });
+
+    test('parses invalid preview with HTTP 200 body', () {
+      final response = PromoValidateResponse.fromJson({
+        'valid': false,
+        'error': 'Промокод «UNKNOWN» не найден в системе.',
+      });
+
+      expect(response.valid, isFalse);
+      expect(response.error, contains('не найден'));
+    });
+  });
+
+  group('PromoApplyResponse', () {
+    test('parses success with nested promo_code', () {
+      final response = PromoApplyResponse.fromJson({
+        'success': true,
+        'promo_code': {
+          'id': 1,
+          'chosen_plan_id': 42,
+          'promo_code': 'PROMO_100117_A',
+          'discount_percent': 5,
+          'discount_amount_rub': 60.0,
+          'state': 'applied',
+          'applied_at': '2024-01-15T10:30:00+00:00',
+          'confirmed_at': null,
+          'cancelled_at': null,
+        },
+        'discount_percent': 5,
+        'discount_amount_rub': 60.0,
+        'original_amount_rub': 1200.0,
+        'final_amount_rub': 1140.0,
+      });
+
+      expect(response.success, isTrue);
+      expect(response.promoCode, isA<PromoCodeModel>());
+      expect(response.promoCode!.promoCode, 'PROMO_100117_A');
+      expect(response.promoCode!.state, 'applied');
+      expect(response.finalAmountRub, 1140.0);
+    });
+
+    test('parses failure body', () {
+      final response = PromoApplyResponse.fromJson({
+        'success': false,
+        'error': 'Промокод «X» уже был использован вами ранее.',
+      });
+
+      expect(response.success, isFalse);
+      expect(response.error, contains('уже был использован'));
+      expect(response.promoCode, isNull);
+    });
+  });
+
+  group('PromoAppliedListResponse', () {
+    test('parses promo_codes list', () {
+      final response = PromoAppliedListResponse.fromJson({
+        'promo_codes': [
+          {
+            'id': 2,
+            'chosen_plan_id': 42,
+            'promo_code': 'PROMO_LIST_B',
+            'discount_percent': 3,
+            'discount_amount_rub': 36.0,
+            'state': 'applied',
+            'applied_at': '2024-01-15T10:30:00+00:00',
+            'confirmed_at': null,
+            'cancelled_at': null,
+          },
+        ],
+      });
+
+      expect(response.promoCodes, hasLength(1));
+      expect(response.promoCodes.first.promoCode, 'PROMO_LIST_B');
+      expect(response.promoCodes.first.chosenPlanId, 42);
+    });
+
+    test('parses empty list', () {
+      final response = PromoAppliedListResponse.fromJson({
+        'promo_codes': <dynamic>[],
+      });
+
+      expect(response.promoCodes, isEmpty);
+    });
+  });
+}
diff --git a/test/features/payment/presentation/widgets/promo_code_modal_test.dart b/test/features/payment/presentation/widgets/promo_code_modal_test.dart
index e1b2e923..56d10633 100644
--- a/test/features/payment/presentation/widgets/promo_code_modal_test.dart
+++ b/test/features/payment/presentation/widgets/promo_code_modal_test.dart
@@ -1,4 +1,5 @@
 import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/payment/models/promo_code_model.dart';
 import 'package:eatvio_app/features/payment/presentation/widgets/promo_code_modal.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
@@ -11,6 +12,8 @@ void main() {
   group('ItvioPromoCodeModal', () {
     Widget createTestWidget({
       Future<PromoValidation> Function(String)? onValidate,
+      Future<bool> Function()? onRemove,
+      PromoCodeModel? initialPromo,
     }) {
       return MaterialApp(
         theme: ThemeHelper().themeData(),
@@ -26,6 +29,8 @@ void main() {
             onPressed: () => ItvioPromoCodeModal.show(
               context,
               onValidate: onValidate,
+              onRemove: onRemove,
+              initialPromo: initialPromo,
             ),
             child: const Text('Open'),
           ),
@@ -88,14 +93,84 @@ void main() {
       expect(find.text('Есть промокод?'), findsNothing);
     });
 
-    testWidgets('отсутствует UI applied-состояния (Промокод применён)', (tester) async {
-      await tester.pumpWidget(createTestWidget());
+    testWidgets('initialPromo показывает applied UI', (tester) async {
+      await tester.pumpWidget(
+        createTestWidget(
+          initialPromo: const PromoCodeModel(
+            id: 1,
+            chosenPlanId: 42,
+            promoCode: 'SAVE5',
+            discountPercent: 5,
+            discountAmountRub: 60,
+            state: 'applied',
+          ),
+          onRemove: () async => true,
+        ),
+      );
       await tester.tap(find.text('Open'));
       await tester.pumpAndSettle();
 
+      expect(find.text('Промокод применён!'), findsOneWidget);
+      expect(find.text('Продолжить'), findsOneWidget);
+      expect(find.text('Убрать промокод'), findsOneWidget);
+      expect(find.text('Применить'), findsNothing);
+    });
+
+    testWidgets('Убрать промокод переводит в input', (tester) async {
+      var removeCalled = false;
+      await tester.pumpWidget(
+        createTestWidget(
+          initialPromo: const PromoCodeModel(
+            id: 1,
+            chosenPlanId: 42,
+            promoCode: 'SAVE5',
+            discountPercent: 5,
+            discountAmountRub: 60,
+            state: 'applied',
+          ),
+          onRemove: () async {
+            removeCalled = true;
+            return true;
+          },
+        ),
+      );
+      await tester.tap(find.text('Open'));
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.text('Убрать промокод'));
+      await tester.pumpAndSettle();
+
+      expect(removeCalled, isTrue);
+      expect(find.text('Есть промокод?'), findsOneWidget);
+      expect(find.text('Применить'), findsOneWidget);
+      expect(find.text('Пропустить'), findsOneWidget);
       expect(find.text('Промокод применён!'), findsNothing);
-      expect(find.text('Продолжить'), findsNothing);
-      expect(find.text('Убрать промокод'), findsNothing);
+    });
+
+    testWidgets('Применить с успешным onValidate закрывает шторку', (tester) async {
+      String? validatedCode;
+      await tester.pumpWidget(
+        createTestWidget(
+          onValidate: (code) async {
+            validatedCode = code;
+            return const PromoValidation.success(
+              discountPercent: 5,
+              discountAmountRub: 60,
+              originalAmountRub: 1200,
+              finalAmountRub: 1140,
+            );
+          },
+        ),
+      );
+      await tester.tap(find.text('Open'));
+      await tester.pumpAndSettle();
+
+      await tester.enterText(find.byType(TextField), 'save5');
+      await tester.tap(find.text('Применить'));
+      await tester.pumpAndSettle();
+
+      expect(validatedCode, 'SAVE5');
+      expect(find.text('Есть промокод?'), findsNothing);
     });
   });
 }
diff --git a/test/features/profile/presentation/bloc/profile_cubit/profile_cubit_test.dart b/test/features/profile/presentation/bloc/profile_cubit/profile_cubit_test.dart
index 9b109014..c61bd465 100644
--- a/test/features/profile/presentation/bloc/profile_cubit/profile_cubit_test.dart
+++ b/test/features/profile/presentation/bloc/profile_cubit/profile_cubit_test.dart
@@ -1,7 +1,6 @@
 import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/repositories/consultant_repository.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
-import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
 import 'package:eatvio_app/features/profile/models/profile_model.dart';
 import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
 import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_state.dart';
@@ -10,6 +9,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 
+import '../../../../../fixtures/feed_fixtures.dart';
 import 'profile_cubit_test.mocks.dart';
 
 @GenerateNiceMocks([
@@ -267,20 +267,10 @@ void main() {
         authorPlaceInRating: null,
       );
 
-      final blogPost = FeedBlogPostModel(
-        id: 1,
-        state: 'published',
-        title: 'Test Post',
-        description: 'Test Content',
-        image: 'https://example.com/image.jpg',
+      final blogPost = FeedFixtures.feedBlogPostGalleryAndVideo().copyWith(
         author: author,
-        videoUrl: '',
-        createdAt: DateTime.now(),
-        updatedAt: DateTime.now(),
-        totalLikes: 10,
-        totalComments: 5,
-        totalViews: 100,
         wasLikedByMe: false,
+        totalLikes: 10,
       );
 
       const profileDetails = ProfileDetailsModel(
diff --git a/test/features/profile/presentation/widgets/profile_blog_post_widget_smoke_test.dart b/test/features/profile/presentation/widgets/profile_blog_post_widget_smoke_test.dart
index 8f6fe8ed..4102ca44 100644
--- a/test/features/profile/presentation/widgets/profile_blog_post_widget_smoke_test.dart
+++ b/test/features/profile/presentation/widgets/profile_blog_post_widget_smoke_test.dart
@@ -5,20 +5,20 @@ import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/app_initializer.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
-import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
+import 'package:eatvio_app/features/feed/presentation/widgets/blog_post_media_content.dart';
 import 'package:eatvio_app/features/profile/models/profile_model.dart';
 import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
 import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_state.dart';
 import 'package:eatvio_app/features/profile/presentation/widgets/profile_blog_post_widget.dart';
+import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
-import 'package:eatvio_app/generated/l10n.dart';
 
+import '../../../../fixtures/feed_fixtures.dart';
 import 'profile_blog_post_widget_smoke_test.mocks.dart';
 
 class _FakeHttpClient implements HttpClient {
@@ -35,7 +35,6 @@ class _FakeHttpClient implements HttpClient {
   @override
   Future<HttpClientRequest> getUrl(Uri url) async => _FakeHttpClientRequest();
 
-
   @override
   dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 }
@@ -48,7 +47,8 @@ class _FakeHttpClientRequest implements HttpClientRequest {
   dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 }
 
-class _FakeHttpClientResponse extends Stream<List<int>> implements HttpClientResponse {
+class _FakeHttpClientResponse extends Stream<List<int>>
+    implements HttpClientResponse {
   // 1x1 transparent PNG.
   static final List<int> _png = <int>[
     0x89,
@@ -127,11 +127,22 @@ class _FakeHttpClientResponse extends Stream<List<int>> implements HttpClientRes
   int get contentLength => _png.length;
 
   @override
-  HttpClientResponseCompressionState get compressionState => HttpClientResponseCompressionState.notCompressed;
+  HttpClientResponseCompressionState get compressionState =>
+      HttpClientResponseCompressionState.notCompressed;
 
   @override
-  StreamSubscription<List<int>> listen(void Function(List<int>)? onData, {Function? onError, void Function()? onDone, bool? cancelOnError}) {
-    return Stream<List<int>>.fromIterable([_png]).listen(onData, onError: onError, onDone: onDone, cancelOnError: cancelOnError);
+  StreamSubscription<List<int>> listen(
+    void Function(List<int>)? onData, {
+    Function? onError,
+    void Function()? onDone,
+    bool? cancelOnError,
+  }) {
+    return Stream<List<int>>.fromIterable([_png]).listen(
+      onData,
+      onError: onError,
+      onDone: onDone,
+      cancelOnError: cancelOnError,
+    );
   }
 
   @override
@@ -142,84 +153,183 @@ class _FakeHttpClientResponse extends Stream<List<int>> implements HttpClientRes
 void main() {
   group('ProfileBlogPostWidget 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'),
+      );
     });
 
-    testWidgets('renders blog post card', (tester) async {
-      final post = FeedBlogPostModel(
-        id: 1,
-        state: 'published',
-        image: 'test.png',
-        description: 'Hello',
-        author: const Author(
-          authorSlug: 'author',
-          authorName: 'Author',
-          authorProfileIcon: 'https://example.com/icon.png',
-          authorIsMe: false,
-          isEntitySubscribedByMe: false,
+    const profile = ProfileModel(
+      id: 1,
+      name: 'User',
+      email: 'u@e.com',
+      phoneConfirmationState: 'confirmed',
+      slug: 'user',
+      isPublicProfile: true,
+      isBlockedByMe: false,
+      isBlockedByAuthor: false,
+      isBlockedByUser: false,
+      isEntitySubscribedByMe: false,
+      profilePhotoUrl: '',
+      roles: [],
+      badges: [],
+      subscriptions: [],
+      subscribers: [],
+    );
+
+    const details = ProfileDetailsModel(
+      firstName: 'Test',
+      lastName: 'User',
+      birthdate: '1990-01-01',
+      gender: 'male',
+      country: 'Russia',
+      city: 'Moscow',
+      lang: 'ru',
+      weight: 70.0,
+      height: 175,
+      chestCircumference: 100,
+      waistCircumference: 80,
+      hipCircumference: 90,
+      bloodPressureUp: 120,
+      bloodPressureDown: 80,
+      hasHypo: false,
+      hasHyper: false,
+      aboutAlergy: '',
+      aboutTakingPils: '',
+      aboutSportHobbies: '',
+      favoriteFoods: '',
+      unfavoriteFoods: '',
+      additionalInfo: '',
+      isMoodFillable: true,
+      isBedtimeFillable: true,
+      activityCoefficient: 1.5,
+    );
+
+    Future<void> pumpPost(WidgetTester tester, ProfileCubit cubit) async {
+      await HttpOverrides.runZoned(() async {
+        await tester.pumpWidget(
+          MaterialApp(
+            theme: ThemeHelper().themeData(),
+            localizationsDelegates: const [
+              S.delegate,
+              GlobalMaterialLocalizations.delegate,
+              GlobalWidgetsLocalizations.delegate,
+              GlobalCupertinoLocalizations.delegate,
+            ],
+            supportedLocales: const [Locale('ru')],
+            home: Scaffold(
+              body: MediaQuery(
+                data: const MediaQueryData(size: Size(800, 1600)),
+                child: SingleChildScrollView(
+                  child: ProfileBlogPostWidget(index: 0, profileCubit: cubit),
+                ),
+              ),
+            ),
+          ),
+        );
+        await tester.pumpAndSettle(const Duration(milliseconds: 200));
+      }, createHttpClient: (_) => _FakeHttpClient());
+    }
+
+    testWidgets('renders gallery and video media content', (tester) async {
+      final post = FeedFixtures.feedBlogPostGalleryAndVideo();
+      final loadedState = ProfileState.loaded(
+        profile: profile,
+        profileDetails: details,
+        blogPosts: [post],
+        isMyProfile: true,
+        certPhotos: [],
+      );
+      final cubit = MockProfileCubit();
+      when(cubit.state).thenReturn(loadedState);
+      when(cubit.stream).thenAnswer((_) => const Stream<ProfileState>.empty());
+      when(cubit.close()).thenAnswer((_) async => Future<void>.value());
+
+      await pumpPost(tester, cubit);
+
+      expect(find.byType(BlogPostMediaContent), findsOneWidget);
+      expect(find.textContaining('Галерея и видео'), findsWidgets);
+    });
+
+    testWidgets('renders gallery-only media content', (tester) async {
+      final post = FeedFixtures.feedBlogPostWithGallery();
+      final loadedState = ProfileState.loaded(
+        profile: profile,
+        profileDetails: details,
+        blogPosts: [post],
+        isMyProfile: true,
+        certPhotos: [],
+      );
+      final cubit = MockProfileCubit();
+      when(cubit.state).thenReturn(loadedState);
+      when(cubit.stream).thenAnswer((_) => const Stream<ProfileState>.empty());
+      when(cubit.close()).thenAnswer((_) async => Future<void>.value());
+
+      await pumpPost(tester, cubit);
+
+      expect(find.byType(BlogPostMediaContent), findsOneWidget);
+      expect(find.text('Галерея'), findsOneWidget);
+    });
+
+    testWidgets('renders video-only media content', (tester) async {
+      final post = FeedFixtures.feedBlogPostVideoOnly();
+      final loadedState = ProfileState.loaded(
+        profile: profile,
+        profileDetails: details,
+        blogPosts: [post],
+        isMyProfile: true,
+        certPhotos: [],
+      );
+      final cubit = MockProfileCubit();
+      when(cubit.state).thenReturn(loadedState);
+      when(cubit.stream).thenAnswer((_) => const Stream<ProfileState>.empty());
+      when(cubit.close()).thenAnswer((_) async => Future<void>.value());
+
+      await pumpPost(tester, cubit);
+
+      expect(find.byType(BlogPostMediaContent), findsOneWidget);
+      expect(find.text('Видео'), findsOneWidget);
+    });
+
+    testWidgets('cover-only posts with the same image use unique hero tags', (
+      tester,
+    ) async {
+      const sharedImage = 'https://example.com/same-cover.jpg';
+      final posts = [
+        FeedFixtures.feedBlogPostModel().copyWith(
+          id: 11,
+          title: 'Первый',
+          description: 'Текст',
+          image: sharedImage,
+          images: const [],
+          videoUrl: '',
+          videoEmbedUrl: null,
         ),
-        videoUrl: '',
-        createdAt: DateTime(2025, 1, 1),
-        updatedAt: DateTime(2025, 1, 1),
-        title: 'Title',
-        totalLikes: 0,
-        totalViews: 0,
-        totalComments: 0,
-        wasLikedByMe: false,
+        FeedFixtures.feedBlogPostModel().copyWith(
+          id: 22,
+          title: 'Второй',
+          description: 'Текст',
+          image: sharedImage,
+          images: const [],
+          videoUrl: '',
+          videoEmbedUrl: null,
+        ),
+      ];
+      final loadedState = ProfileState.loaded(
+        profile: profile,
+        profileDetails: details,
+        blogPosts: posts,
+        isMyProfile: true,
+        certPhotos: [],
       );
-
-      const profile = ProfileModel(
-        id: 1,
-        name: 'User',
-        email: 'u@e.com',
-        phoneConfirmationState: 'confirmed',
-        slug: 'user',
-        isPublicProfile: true,
-        isBlockedByMe: false,
-        isBlockedByAuthor: false,
-        isBlockedByUser: false,
-        isEntitySubscribedByMe: false,
-        profilePhotoUrl: '',
-        roles: [],
-        badges: [],
-        subscriptions: [],
-        subscribers: [],
-      );
-
-      const details = ProfileDetailsModel(
-        firstName: 'Test',
-        lastName: 'User',
-        birthdate: '1990-01-01',
-        gender: 'male',
-        country: 'Russia',
-        city: 'Moscow',
-        lang: 'ru',
-        weight: 70.0,
-        height: 175,
-        chestCircumference: 100,
-        waistCircumference: 80,
-        hipCircumference: 90,
-        bloodPressureUp: 120,
-        bloodPressureDown: 80,
-        hasHypo: false,
-        hasHyper: false,
-        aboutAlergy: '',
-        aboutTakingPils: '',
-        aboutSportHobbies: '',
-        favoriteFoods: '',
-        unfavoriteFoods: '',
-        additionalInfo: '',
-        isMoodFillable: true,
-        isBedtimeFillable: true,
-        activityCoefficient: 1.5,
-      );
-
-      final loadedState = ProfileState.loaded(profile: profile, profileDetails: details, blogPosts: [post], isMyProfile: true, certPhotos: []);
       final cubit = MockProfileCubit();
       when(cubit.state).thenReturn(loadedState);
       when(cubit.stream).thenAnswer((_) => const Stream<ProfileState>.empty());
@@ -236,15 +346,36 @@ void main() {
               GlobalCupertinoLocalizations.delegate,
             ],
             supportedLocales: const [Locale('ru')],
-            home: Scaffold(body: ProfileBlogPostWidget(index: 0, profileCubit: cubit)),
+            home: Scaffold(
+              body: MediaQuery(
+                data: const MediaQueryData(size: Size(800, 1600)),
+                child: SingleChildScrollView(
+                  child: Column(
+                    children: [
+                      ProfileBlogPostWidget(index: 0, profileCubit: cubit),
+                      ProfileBlogPostWidget(index: 1, profileCubit: cubit),
+                    ],
+                  ),
+                ),
+              ),
+            ),
           ),
         );
         await tester.pumpAndSettle(const Duration(milliseconds: 200));
-      }, createHttpClient: (context) => _FakeHttpClient());
+      }, createHttpClient: (_) => _FakeHttpClient());
 
-      expect(find.text('Регистрация'), findsNothing);
-      expect(find.text('Title'), findsOneWidget);
-      expect(find.text('Author'), findsOneWidget);
+      final tags = tester
+          .widgetList<Hero>(find.byType(Hero))
+          .map((hero) => hero.tag)
+          .toList();
+      expect(
+        tags,
+        containsAll([
+          'profile-blog-post-11-cover',
+          'profile-blog-post-22-cover',
+        ]),
+      );
+      expect(tags.toSet().length, tags.length);
     });
   });
 }
diff --git a/test/features/profile/services/profile_service_test.dart b/test/features/profile/services/profile_service_test.dart
index 5c773bc3..9d02811a 100644
--- a/test/features/profile/services/profile_service_test.dart
+++ b/test/features/profile/services/profile_service_test.dart
@@ -3,9 +3,11 @@ import 'package:eatvio_app/features/profile/models/circumference_model.dart';
 import 'package:eatvio_app/features/profile/models/profile_model.dart';
 import 'package:eatvio_app/features/profile/models/weight_model.dart';
 import 'package:eatvio_app/features/profile/services/profile_service.dart';
+import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
-import 'package:flutter_test/flutter_test.dart';
+
+import '../../../fixtures/feed_fixtures.dart';
 import 'profile_service_test.mocks.dart';
 
 @GenerateNiceMocks([MockSpec<ProfileService>()])
@@ -72,9 +74,17 @@ void main() {
       expect(await mockProfileService.getProfileDetailsBySlug(slug: 'slug'), isA<ProfileDetailsModel>());
     });
 
-    test('getBlogPostByAuthorSlug', () async {
-      when(mockProfileService.getBlogPostByAuthorSlug(slug: '')).thenAnswer((_) async => []);
-      expect(await mockProfileService.getBlogPostByAuthorSlug(slug: 'slug'), isA<List<FeedBlogPostModel>>());
+    test('getBlogPostByAuthorSlug returns posts with gallery and video fields', () async {
+      final posts = FeedFixtures.blogPostsByAuthor();
+      when(mockProfileService.getBlogPostByAuthorSlug(slug: 'slug')).thenAnswer((_) async => posts);
+
+      final result = await mockProfileService.getBlogPostByAuthorSlug(slug: 'slug');
+
+      expect(result, isA<List<FeedBlogPostModel>>());
+      expect(result, hasLength(2));
+      expect(result.first.images, isNotEmpty);
+      expect(result.first.videoEmbedUrl, isNotNull);
+      expect(result.first.videoUrlThumb, isNotNull);
     });
 
     test('getWeight', () async {
diff --git a/test/features/video_calls/models/video_call_models_test.dart b/test/features/video_calls/models/video_call_models_test.dart
index ee2e730f..bc46c8f3 100644
--- a/test/features/video_calls/models/video_call_models_test.dart
+++ b/test/features/video_calls/models/video_call_models_test.dart
@@ -112,4 +112,24 @@ void main() {
       expect(restored, model);
     });
   });
+
+  group('VideoCallAcceptResponse', () {
+    test('fromJson десериализует sent и devices_notified', () {
+      final json = FixtureReader.readAsMap('video_calls/video_call_accept_response.json');
+
+      final model = VideoCallAcceptResponse.fromJson(json);
+
+      expect(model.sent, isTrue);
+      expect(model.devicesNotified, 2);
+    });
+
+    test('round-trip JSON сохраняет значения', () {
+      final json = FixtureReader.readAsMap('video_calls/video_call_accept_response.json');
+
+      final model = VideoCallAcceptResponse.fromJson(json);
+      final restored = VideoCallAcceptResponse.fromJson(model.toJson());
+
+      expect(restored, model);
+    });
+  });
 }
diff --git a/test/features/video_calls/presentation/video_call_manager_lifecycle_test.dart b/test/features/video_calls/presentation/video_call_manager_lifecycle_test.dart
new file mode 100644
index 00000000..36fb87b0
--- /dev/null
+++ b/test/features/video_calls/presentation/video_call_manager_lifecycle_test.dart
@@ -0,0 +1,89 @@
+import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_foreground_coordinator.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_lifecycle_binding.dart';
+import 'package:eatvio_app/features/video_calls/repositories/video_call_repository.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:livekit_client/livekit_client.dart' as lk;
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+
+import 'video_call_manager_lifecycle_test.mocks.dart';
+
+class _RecordingForeground extends VideoCallForegroundCoordinator {
+  int startCount = 0;
+  int stopCount = 0;
+
+  @override
+  Future<void> startOngoingCall({
+    required String conversationUuid,
+    required String notificationTitle,
+    required String notificationBody,
+    required String endCallButtonLabel,
+  }) async {
+    startCount++;
+  }
+
+  @override
+  Future<void> stopOngoingCall() async {
+    stopCount++;
+  }
+}
+
+@GenerateNiceMocks([MockSpec<VideoCallRepository>(), MockSpec<lk.Room>()])
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  group('VideoCallManager lifecycle', () {
+    late MockVideoCallRepository mockRepository;
+    late _RecordingForeground foreground;
+    late VideoCallLifecycleBinding lifecycleBinding;
+    late VideoCallManager manager;
+    late MockRoom mockRoom;
+
+    setUp(() {
+      mockRepository = MockVideoCallRepository();
+      foreground = _RecordingForeground();
+      lifecycleBinding = VideoCallLifecycleBinding();
+      manager = VideoCallManager(
+        videoCallRepository: mockRepository,
+        foregroundCoordinator: foreground,
+        lifecycleBinding: lifecycleBinding,
+      );
+      mockRoom = MockRoom();
+      when(mockRoom.connectionState).thenReturn(lk.ConnectionState.connected);
+      when(mockRoom.localParticipant).thenReturn(null);
+    });
+
+    tearDown(() {
+      manager.dispose();
+    });
+
+    test('paused starts foreground and does not disconnect room', () async {
+      manager.markActiveCallForTesting(mockRoom);
+
+      lifecycleBinding.simulateLifecycle(AppLifecycleState.paused);
+      await Future<void>.delayed(Duration.zero);
+
+      expect(foreground.startCount, 1);
+      expect(manager.liveKitDisposedForTesting, isFalse);
+      verifyNever(mockRepository.notifyCallEnded(any));
+    });
+
+    test('paused without active call does not start foreground', () async {
+      lifecycleBinding.simulateLifecycle(AppLifecycleState.paused);
+      await Future<void>.delayed(Duration.zero);
+
+      expect(foreground.startCount, 0);
+    });
+
+    test('endCall stops foreground service', () async {
+      manager.markActiveCallForTesting(mockRoom);
+
+      await manager.endCall();
+
+      expect(foreground.stopCount, 1);
+      expect(manager.liveKitDisposedForTesting, isTrue);
+    });
+  });
+}
diff --git a/test/features/video_calls/presentation/video_call_session_cubit_test.dart b/test/features/video_calls/presentation/video_call_session_cubit_test.dart
new file mode 100644
index 00000000..2f9e9c3b
--- /dev/null
+++ b/test/features/video_calls/presentation/video_call_session_cubit_test.dart
@@ -0,0 +1,390 @@
+import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart';
+import 'package:eatvio_app/features/video_calls/managers/video_call_manager_snapshot.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:livekit_client/livekit_client.dart' as lk;
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+
+import 'video_call_session_cubit_test.mocks.dart';
+
+@GenerateNiceMocks([MockSpec<VideoCallManager>(), MockSpec<lk.Room>()])
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  group('VideoCallSessionCubit', () {
+    late MockVideoCallManager mockManager;
+    late _TestVideoCallSessionCubit cubit;
+
+    late VideoCallManagerListener managerListener;
+
+    setUp(() {
+      mockManager = MockVideoCallManager();
+      when(mockManager.snapshot).thenReturn(VideoCallManagerSnapshot.initial);
+      when(mockManager.room).thenReturn(null);
+      when(mockManager.addListener(any)).thenAnswer((invocation) {
+        managerListener =
+            invocation.positionalArguments[0] as VideoCallManagerListener;
+      });
+      when(
+        mockManager.notifyIncomingCallAccepted(any),
+      ).thenAnswer((_) async {});
+      cubit = _TestVideoCallSessionCubit(videoCallManager: mockManager);
+    });
+
+    tearDown(() async {
+      when(mockManager.endCall()).thenAnswer((_) async {});
+      await cubit.close();
+    });
+
+    test('onCallScreenDisposed minimizes to pip when in call stage', () async {
+      cubit.emit(
+        const VideoCallSessionState(
+          conversationUuid: 'uuid',
+          connectPhase: VideoCallConnectPhase.connected,
+          callStageEntered: true,
+          uiMode: VideoCallUiMode.fullscreen,
+        ),
+      );
+
+      cubit.onCallScreenDisposed();
+
+      await Future<void>.delayed(Duration.zero);
+
+      expect(cubit.state.uiMode, VideoCallUiMode.pip);
+      verifyNever(mockManager.endCall());
+    });
+
+    test('onCallScreenDisposed ends call when not in call stage', () async {
+      cubit.emit(
+        const VideoCallSessionState(
+          conversationUuid: 'uuid',
+          connectPhase: VideoCallConnectPhase.connected,
+          callStageEntered: false,
+          uiMode: VideoCallUiMode.fullscreen,
+        ),
+      );
+
+      when(mockManager.endCall()).thenAnswer((_) async {});
+
+      cubit.onCallScreenDisposed();
+
+      await Future<void>.delayed(Duration.zero);
+
+      verify(mockManager.endCall()).called(1);
+    });
+
+    test(
+      'manager idle snapshot resets callStageEntered and uiMode',
+      () async {
+        cubit.emit(
+          const VideoCallSessionState(
+            conversationUuid: 'uuid',
+            connectPhase: VideoCallConnectPhase.connected,
+            callStageEntered: true,
+            uiMode: VideoCallUiMode.pip,
+          ),
+        );
+
+        managerListener(VideoCallManagerSnapshot.initial);
+
+        expect(cubit.state.callStageEntered, isFalse);
+        expect(cubit.state.uiMode, VideoCallUiMode.hidden);
+        expect(cubit.state.connectPhase, VideoCallConnectPhase.idle);
+      },
+    );
+
+    test(
+      'manager connecting snapshot resets callStageEntered for new call',
+      () async {
+        cubit.emit(
+          const VideoCallSessionState(
+            conversationUuid: 'old',
+            connectPhase: VideoCallConnectPhase.connected,
+            callStageEntered: true,
+            uiMode: VideoCallUiMode.fullscreen,
+          ),
+        );
+
+        managerListener(
+          const VideoCallManagerSnapshot(
+            conversationUuid: 'new-uuid',
+            micEnabled: true,
+            videoEnabled: true,
+            connectPhase: VideoCallConnectPhase.connecting,
+            linkIssue: VideoCallLinkIssue.none,
+          ),
+        );
+
+        expect(cubit.state.conversationUuid, 'new-uuid');
+        expect(cubit.state.callStageEntered, isFalse);
+        expect(cubit.state.uiMode, VideoCallUiMode.fullscreen);
+        expect(cubit.state.connectPhase, VideoCallConnectPhase.connecting);
+      },
+    );
+
+    test('isMicActiveForUi mirrors micEnabled', () {
+      const state = VideoCallSessionState(micEnabled: true);
+      expect(state.isMicActiveForUi, isTrue);
+    });
+
+    test('onCallEndedExternally resets session state', () async {
+      cubit.emit(
+        const VideoCallSessionState(
+          conversationUuid: 'uuid',
+          connectPhase: VideoCallConnectPhase.connected,
+          callStageEntered: true,
+          uiMode: VideoCallUiMode.pip,
+        ),
+      );
+
+      await cubit.onCallEndedExternally();
+
+      expect(cubit.state, const VideoCallSessionState());
+    });
+
+    test('syncPipUiStateFromSystem skips overlay when call screen is visible', () async {
+      cubit.emit(
+        const VideoCallSessionState(
+          conversationUuid: 'uuid',
+          connectPhase: VideoCallConnectPhase.connected,
+          callStageEntered: true,
+          uiMode: VideoCallUiMode.fullscreen,
+        ),
+      );
+
+      await cubit.onCallScreenVisible(conversationUuid: 'uuid');
+      await cubit.syncPipUiStateFromSystem();
+
+      expect(cubit.state.uiMode, VideoCallUiMode.fullscreen);
+    });
+
+    test('manager idle snapshot ignored while call screen is visible', () async {
+      when(
+        mockManager.startCall(
+          conversationUuid: anyNamed('conversationUuid'),
+          counterpartName: anyNamed('counterpartName'),
+          localParticipantName: anyNamed('localParticipantName'),
+          micEnabled: anyNamed('micEnabled'),
+          videoEnabled: anyNamed('videoEnabled'),
+        ),
+      ).thenAnswer((_) async {});
+
+      await cubit.onCallScreenVisible(
+        conversationUuid: 'uuid',
+        entryMode: VideoCallEntryMode.incomingAccepted,
+      );
+
+      managerListener(VideoCallManagerSnapshot.initial);
+
+      expect(cubit.state.entryMode, VideoCallEntryMode.incomingAccepted);
+      expect(cubit.state.conversationUuid, 'uuid');
+    });
+
+    test('incoming accept auto-enters call stage after connect', () async {
+      when(
+        mockManager.startCall(
+          conversationUuid: anyNamed('conversationUuid'),
+          counterpartName: anyNamed('counterpartName'),
+          localParticipantName: anyNamed('localParticipantName'),
+          micEnabled: anyNamed('micEnabled'),
+          videoEnabled: anyNamed('videoEnabled'),
+        ),
+      ).thenAnswer((_) async {
+        managerListener(
+          const VideoCallManagerSnapshot(
+            conversationUuid: 'uuid',
+            micEnabled: false,
+            videoEnabled: false,
+            connectPhase: VideoCallConnectPhase.connected,
+            linkIssue: VideoCallLinkIssue.none,
+          ),
+        );
+      });
+      when(mockManager.onEnterCallStage()).thenAnswer((_) async => true);
+
+      await cubit.onCallScreenVisible(
+        conversationUuid: 'uuid',
+        entryMode: VideoCallEntryMode.incomingAccepted,
+      );
+
+      verify(
+        mockManager.startCall(
+          conversationUuid: 'uuid',
+          counterpartName: anyNamed('counterpartName'),
+          localParticipantName: anyNamed('localParticipantName'),
+          micEnabled: false,
+          videoEnabled: false,
+        ),
+      ).called(1);
+      verify(mockManager.onEnterCallStage()).called(1);
+      expect(cubit.state.entryMode, VideoCallEntryMode.incomingAccepted);
+      expect(cubit.state.callStageEntered, isTrue);
+    });
+
+    test('outgoing call stays on connecting lobby until callee joins', () async {
+      when(
+        mockManager.startCall(
+          conversationUuid: anyNamed('conversationUuid'),
+          counterpartName: anyNamed('counterpartName'),
+          localParticipantName: anyNamed('localParticipantName'),
+          micEnabled: anyNamed('micEnabled'),
+          videoEnabled: anyNamed('videoEnabled'),
+        ),
+      ).thenAnswer((_) async {});
+      when(mockManager.ensureLobbyRoomJoined()).thenAnswer((_) async {});
+      when(mockManager.onEnterCallStage()).thenAnswer((_) async => true);
+
+      await cubit.onCallScreenVisible(conversationUuid: 'uuid');
+
+      verifyNever(mockManager.onEnterCallStage());
+      expect(cubit.state.entryMode, VideoCallEntryMode.outgoing);
+      expect(cubit.state.callStageEntered, isFalse);
+      expect(cubit.state.micEnabled, isFalse);
+
+      managerListener(
+        const VideoCallManagerSnapshot(
+          conversationUuid: 'uuid',
+          micEnabled: false,
+          videoEnabled: false,
+          connectPhase: VideoCallConnectPhase.connected,
+          linkIssue: VideoCallLinkIssue.none,
+        ),
+      );
+      await Future<void>.delayed(Duration.zero);
+
+      verify(mockManager.ensureLobbyRoomJoined()).called(1);
+      verifyNever(mockManager.onEnterCallStage());
+    });
+
+    test('outgoing call auto-enters when callee joins lobby room', () async {
+      when(
+        mockManager.startCall(
+          conversationUuid: anyNamed('conversationUuid'),
+          counterpartName: anyNamed('counterpartName'),
+          localParticipantName: anyNamed('localParticipantName'),
+          micEnabled: anyNamed('micEnabled'),
+          videoEnabled: anyNamed('videoEnabled'),
+        ),
+      ).thenAnswer((_) async {});
+      when(mockManager.ensureLobbyRoomJoined()).thenAnswer((_) async {});
+      when(mockManager.onEnterCallStage()).thenAnswer((_) async => true);
+
+      await cubit.onCallScreenVisible(conversationUuid: 'uuid');
+
+      managerListener(
+        const VideoCallManagerSnapshot(
+          conversationUuid: 'uuid',
+          micEnabled: false,
+          videoEnabled: false,
+          connectPhase: VideoCallConnectPhase.connected,
+          linkIssue: VideoCallLinkIssue.none,
+          counterpartPresentInLobby: true,
+        ),
+      );
+      await Future<void>.delayed(Duration.zero);
+
+      verify(mockManager.onEnterCallStage()).called(1);
+      expect(cubit.state.callStageEntered, isTrue);
+    });
+
+    test('duplicate onCallScreenVisible does not restart connecting call', () async {
+      when(
+        mockManager.startCall(
+          conversationUuid: anyNamed('conversationUuid'),
+          counterpartName: anyNamed('counterpartName'),
+          localParticipantName: anyNamed('localParticipantName'),
+          micEnabled: anyNamed('micEnabled'),
+          videoEnabled: anyNamed('videoEnabled'),
+        ),
+      ).thenAnswer((_) async {});
+
+      await cubit.onCallScreenVisible(
+        conversationUuid: 'uuid',
+        entryMode: VideoCallEntryMode.incomingAccepted,
+      );
+      await cubit.onCallScreenVisible(
+        conversationUuid: 'uuid',
+        entryMode: VideoCallEntryMode.outgoing,
+      );
+
+      verify(
+        mockManager.startCall(
+          conversationUuid: 'uuid',
+          counterpartName: anyNamed('counterpartName'),
+          localParticipantName: anyNamed('localParticipantName'),
+          micEnabled: false,
+          videoEnabled: false,
+        ),
+      ).called(1);
+      expect(cubit.state.entryMode, VideoCallEntryMode.incomingAccepted);
+    });
+
+    test('leaveCallRoute minimizes to pip and marks call screen not visible', () async {
+      final mockRoom = MockRoom();
+      when(mockManager.room).thenReturn(mockRoom);
+      when(
+        mockManager.onCallScreenVisible(
+          conversationUuid: anyNamed('conversationUuid'),
+          counterpartName: anyNamed('counterpartName'),
+          localParticipantName: anyNamed('localParticipantName'),
+          micEnabled: anyNamed('micEnabled'),
+          videoEnabled: anyNamed('videoEnabled'),
+        ),
+      ).thenAnswer((_) async {});
+
+      cubit.emit(
+        const VideoCallSessionState(
+          conversationUuid: 'uuid',
+          connectPhase: VideoCallConnectPhase.connected,
+          callStageEntered: true,
+          uiMode: VideoCallUiMode.fullscreen,
+        ),
+      );
+      await cubit.onCallScreenVisible(conversationUuid: 'uuid');
+      expect(cubit.isCallScreenRouteVisible, isTrue);
+
+      await cubit.leaveCallRoute();
+
+      expect(cubit.state.uiMode, VideoCallUiMode.pip);
+      expect(cubit.isCallScreenRouteVisible, isFalse);
+    });
+
+    test('tracks whether call screen route is visible', () async {
+      when(
+        mockManager.startCall(
+          conversationUuid: anyNamed('conversationUuid'),
+          counterpartName: anyNamed('counterpartName'),
+          localParticipantName: anyNamed('localParticipantName'),
+          micEnabled: anyNamed('micEnabled'),
+          videoEnabled: anyNamed('videoEnabled'),
+        ),
+      ).thenAnswer((_) async {});
+
+      await cubit.onCallScreenVisible(conversationUuid: 'uuid');
+      expect(cubit.isCallScreenRouteVisible, isTrue);
+
+      cubit.emit(
+        const VideoCallSessionState(
+          conversationUuid: 'uuid',
+          connectPhase: VideoCallConnectPhase.connected,
+          callStageEntered: true,
+          uiMode: VideoCallUiMode.pip,
+        ),
+      );
+
+      cubit.onCallScreenDisposed();
+      expect(cubit.isCallScreenRouteVisible, isFalse);
+    });
+  });
+}
+
+class _TestVideoCallSessionCubit extends VideoCallSessionCubit {
+  _TestVideoCallSessionCubit({required super.videoCallManager});
+
+  bool grantMicOnRequest = false;
+
+  @override
+  Future<bool> requestMicPermissionForCall() async => grantMicOnRequest;
+}
diff --git a/test/features/video_calls/services/video_call_push_payload_test.dart b/test/features/video_calls/services/video_call_push_payload_test.dart
new file mode 100644
index 00000000..4e30a006
--- /dev/null
+++ b/test/features/video_calls/services/video_call_push_payload_test.dart
@@ -0,0 +1,71 @@
+import 'package:eatvio_app/features/video_calls/services/video_call_ended_push_payload.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_push_payload.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group('VideoCallPushPayload', () {
+    test('parses video_call type with conversation uuid', () {
+      final payload = VideoCallPushPayload.tryParse({
+        'type': 'video_call_incoming',
+        'conversation_uuid': 'abc-123',
+        'caller_name': 'Anna',
+        'avatar': 'https://cdn.example/avatar.jpg',
+      });
+
+      expect(payload, isNotNull);
+      expect(payload!.conversationUuid, 'abc-123');
+      expect(payload.counterpartName, 'Anna');
+      expect(payload.counterpartAvatarUrl, 'https://cdn.example/avatar.jpg');
+    });
+
+    test('parses is_consultant flag from push payload', () {
+      final payload = VideoCallPushPayload.tryParse({
+        'type': 'video_call_incoming',
+        'conversation_uuid': 'abc-123',
+        'caller_name': 'Anna',
+        'is_consultant': 'true',
+      });
+
+      expect(payload, isNotNull);
+      expect(payload!.counterpartIsConsultant, isTrue);
+    });
+
+    test('parses action_url with video-call path', () {
+      final payload = VideoCallPushPayload.tryParse({
+        'action_url': 'https://eatvio.ru/video-call-screen?uuid=room-42',
+        'counterpartName': 'Ivan',
+      });
+
+      expect(payload, isNotNull);
+      expect(payload!.conversationUuid, 'room-42');
+      expect(payload.counterpartName, 'Ivan');
+    });
+
+    test('parses ended video call push with type only', () {
+      final payload = VideoCallEndedPushPayload.tryParse({
+        'type': 'video_call_ended',
+      });
+
+      expect(payload, isNotNull);
+    });
+
+    test('parses ended video call push with optional conversation uuid', () {
+      final payload = VideoCallEndedPushPayload.tryParse({
+        'type': 'video_call_ended',
+        'conversation_uuid': 'abc-123',
+      });
+
+      expect(payload, isNotNull);
+    });
+
+    test('ignores regular chat push', () {
+      expect(
+        VideoCallPushPayload.tryParse({
+          'type': 'chat_message',
+          'action_url': 'https://eatvio.ru/chat/123',
+        }),
+        isNull,
+      );
+    });
+  });
+}
diff --git a/test/features/video_calls/services/video_call_service_test.dart b/test/features/video_calls/services/video_call_service_test.dart
index 3bada540..4d2aa887 100644
--- a/test/features/video_calls/services/video_call_service_test.dart
+++ b/test/features/video_calls/services/video_call_service_test.dart
@@ -90,5 +90,25 @@ void main() {
         throwsA(isA<Exception>()),
       );
     });
+
+    test('notifyCallAccepted - отправляет hw_id и получает ответ', () async {
+      const conversationUuid = 'conv-uuid-123';
+      const body = <String, dynamic>{'hw_id': 'device-android-001'};
+      final json = FixtureReader.readAsMap('video_calls/video_call_accept_response.json');
+      final expected = VideoCallAcceptResponse.fromJson(json);
+
+      when(mockService.notifyCallAccepted(conversationUuid: conversationUuid, body: body))
+          .thenAnswer((_) async => expected);
+
+      final result = await mockService.notifyCallAccepted(
+        conversationUuid: conversationUuid,
+        body: body,
+      );
+
+      expect(result, isA<VideoCallAcceptResponse>());
+      expect(result.sent, isTrue);
+      expect(result.devicesNotified, 2);
+      verify(mockService.notifyCallAccepted(conversationUuid: conversationUuid, body: body)).called(1);
+    });
   });
 }
diff --git a/test/features/video_calls/widgets/video_call_livekit_track_utils_test.dart b/test/features/video_calls/widgets/video_call_livekit_track_utils_test.dart
index 2749415a..d8aff74a 100644
--- a/test/features/video_calls/widgets/video_call_livekit_track_utils_test.dart
+++ b/test/features/video_calls/widgets/video_call_livekit_track_utils_test.dart
@@ -12,6 +12,8 @@ import 'video_call_livekit_track_utils_test.mocks.dart';
   MockSpec<lk.Room>(),
   MockSpec<lk.LocalParticipant>(),
   MockSpec<lk.RemoteParticipant>(),
+  MockSpec<lk.RemoteTrackPublication>(),
+  MockSpec<lk.RemoteVideoTrack>(),
   MockSpec<lk.TrackPublication>(),
   MockSpec<lk.VideoTrack>(),
 ])
@@ -67,6 +69,33 @@ void main() {
       expect(VideoCallLiveKitTrackUtils.visibleVideoFromPublication(pub), isNull);
     });
 
+    test('visibleVideoFromPublication возвращает remote track при paused stream', () {
+      final pub = MockRemoteTrackPublication();
+      final track = MockRemoteVideoTrack();
+      when(pub.muted).thenReturn(false);
+      when(pub.subscribed).thenReturn(true);
+      when(pub.streamState).thenReturn(lk.StreamState.paused);
+      when(pub.track).thenReturn(track);
+      when(track.muted).thenReturn(false);
+
+      expect(VideoCallLiveKitTrackUtils.visibleVideoFromPublication(pub), equals(track));
+    });
+
+    test('visibleVideoFromPublication возвращает null для unsubscribed remote', () {
+      final pub = MockRemoteTrackPublication();
+      when(pub.muted).thenReturn(false);
+      when(pub.subscribed).thenReturn(false);
+
+      expect(VideoCallLiveKitTrackUtils.visibleVideoFromPublication(pub), isNull);
+    });
+
+    test('isSoloInRoom is true when remote participants are empty', () {
+      final room = MockRoom();
+      when(room.remoteParticipants).thenReturn(UnmodifiableMapView(<String, lk.RemoteParticipant>{}));
+
+      expect(VideoCallLiveKitTrackUtils.isSoloInRoom(room), isTrue);
+    });
+
     test('localCameraVideoTrack возвращает null если localParticipant отсутствует', () {
       final room = MockRoom();
       when(room.localParticipant).thenReturn(null);
diff --git a/test/features/video_calls/widgets/video_call_name_label_test.dart b/test/features/video_calls/widgets/video_call_name_label_test.dart
index bf759ad6..6332785e 100644
--- a/test/features/video_calls/widgets/video_call_name_label_test.dart
+++ b/test/features/video_calls/widgets/video_call_name_label_test.dart
@@ -1,5 +1,7 @@
 import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_name_chips.dart';
+import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
@@ -18,4 +20,30 @@ void main() {
 
     expect(find.text('Alex'), findsOneWidget);
   });
+
+  testWidgets('VideoCallParticipantNameLabel renders consultant role above name', (tester) async {
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: const [
+          S.delegate,
+          ...GlobalMaterialLocalizations.delegates,
+          GlobalWidgetsLocalizations.delegate,
+        ],
+        supportedLocales: S.delegate.supportedLocales,
+        home: const Scaffold(
+          body: Stack(
+            children: [
+              VideoCallParticipantNameLabel(
+                name: 'Alex',
+                isConsultant: true,
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+
+    expect(find.text('Alex'), findsOneWidget);
+    expect(find.text('Eatvio consultant'), findsOneWidget);
+  });
 }
diff --git a/test/features/video_calls/widgets/video_call_remote_video_stage_test.dart b/test/features/video_calls/widgets/video_call_remote_video_stage_test.dart
index c4ed91b2..c34840f9 100644
--- a/test/features/video_calls/widgets/video_call_remote_video_stage_test.dart
+++ b/test/features/video_calls/widgets/video_call_remote_video_stage_test.dart
@@ -25,7 +25,9 @@ void main() {
     );
   }
 
-  testWidgets('shows error text when connectError is provided', (tester) async {
+  testWidgets('hides connectError text when room is connected without remote video', (
+    tester,
+  ) async {
     final room = buildRoom(state: lk.ConnectionState.connected);
 
     await tester.pumpWidget(
@@ -37,10 +39,27 @@ void main() {
       ),
     );
 
-    expect(find.text('Connection failed'), findsOneWidget);
+    expect(find.text('Connection failed'), findsNothing);
     expect(find.byType(CircularProgressIndicator), findsNothing);
   });
 
+  testWidgets('shows error text when connectError and room is not connected', (
+    tester,
+  ) async {
+    final room = buildRoom(state: lk.ConnectionState.disconnected);
+
+    await tester.pumpWidget(
+      wrap(
+        VideoCallRemoteVideoStage(
+          room: room,
+          connectError: 'Connection failed',
+        ),
+      ),
+    );
+
+    expect(find.text('Connection failed'), findsOneWidget);
+  });
+
   testWidgets('shows progress indicator when not connected and no error', (tester) async {
     final room = buildRoom(state: lk.ConnectionState.disconnected);
 
diff --git a/test/features/video_calls/widgets/video_call_stage_layout_test.dart b/test/features/video_calls/widgets/video_call_stage_layout_test.dart
index 3c51a89e..ba3afd89 100644
--- a/test/features/video_calls/widgets/video_call_stage_layout_test.dart
+++ b/test/features/video_calls/widgets/video_call_stage_layout_test.dart
@@ -9,7 +9,7 @@ import 'package:mockito/mockito.dart';
 
 import 'video_call_stage_layout_test.mocks.dart';
 
-@GenerateNiceMocks([MockSpec<lk.Room>()])
+@GenerateNiceMocks([MockSpec<lk.Room>(), MockSpec<lk.RemoteParticipant>()])
 void main() {
   Widget wrap(Widget child) {
     return MaterialApp(
@@ -27,8 +27,19 @@ void main() {
     return room;
   }
 
+  MockRoom buildRoomWithRemote() {
+    final room = MockRoom();
+    final remote = MockRemoteParticipant();
+    when(room.remoteParticipants).thenReturn(
+      UnmodifiableMapView(<String, lk.RemoteParticipant>{'remote': remote}),
+    );
+    when(room.localParticipant).thenReturn(null);
+    when(room.connectionState).thenReturn(lk.ConnectionState.connected);
+    return room;
+  }
+
   testWidgets('renders split mode participant names and controls', (tester) async {
-    final room = buildRoom();
+    final room = buildRoomWithRemote();
     var localExpanded = 0;
     var remoteExpanded = 0;
 
@@ -113,8 +124,8 @@ void main() {
     expect(shrinkPressed, greaterThanOrEqualTo(0));
   });
 
-  testWidgets('split layout shows connectError on remote pane and uses bottomInset', (tester) async {
-    final room = buildRoom();
+  testWidgets('split layout hides connectError on remote pane when connected', (tester) async {
+    final room = buildRoomWithRemote();
 
     await tester.pumpWidget(
       wrap(
@@ -145,12 +156,12 @@ void main() {
       ),
     );
 
-    expect(find.text('No connection'), findsOneWidget);
+    expect(find.text('No connection'), findsNothing);
     expect(find.text('Doctor'), findsOneWidget);
   });
 
   testWidgets('fullscreen layout shows remote name when main stage is remote', (tester) async {
-    final room = buildRoom();
+    final room = buildRoomWithRemote();
 
     await tester.pumpWidget(
       wrap(
@@ -186,7 +197,7 @@ void main() {
   });
 
   testWidgets('split layout with video on shows camera switch on local pane', (tester) async {
-    final room = buildRoom();
+    final room = buildRoomWithRemote();
 
     await tester.pumpWidget(
       wrap(
@@ -222,7 +233,7 @@ void main() {
   });
 
   testWidgets('split layout with rear camera and remote main stage variant', (tester) async {
-    final room = buildRoom();
+    final room = buildRoomWithRemote();
     var stageSwapped = 0;
 
     await tester.pumpWidget(
@@ -299,8 +310,131 @@ void main() {
     expect(find.text('Leave'), findsOneWidget);
   });
 
-  testWidgets('fullscreen layout with connect error shows it on stage', (tester) async {
+  testWidgets('fullscreen layout shows local PIP when camera is off', (tester) async {
+    final room = buildRoomWithRemote();
+
+    await tester.pumpWidget(
+      wrap(
+        VideoCallStageLayout(
+          room: room,
+          connectError: null,
+          localDisplayName: 'You',
+          remoteDisplayName: 'Doctor',
+          micEnabled: true,
+          videoEnabled: false,
+          splitParticipantView: false,
+          mainStageShowsLocalVideo: false,
+          useFrontCamera: true,
+          onExpandLocal: () {},
+          onExpandRemote: () {},
+          onShrinkFromFullscreen: () {},
+          onToggleStageSwap: () {},
+          onChat: () {},
+          onToggleMic: () {},
+          onToggleVideo: () {},
+          onHangUp: () {},
+          onSwitchCamera: () {},
+          controlLabelStyle: const TextStyle(fontSize: 14),
+          labels: (chat: 'Chat', sound: 'Sound', video: 'Video', leave: 'Leave'),
+          topInset: 0,
+          bottomInset: 0,
+        ),
+      ),
+    );
+
+    await tester.pump();
+    expect(find.byType(AnimatedContainer), findsOneWidget);
+  });
+
+  testWidgets('fullscreen layout shows only local participant when solo in room', (tester) async {
     final room = buildRoom();
+    var stageSwapped = 0;
+
+    await tester.pumpWidget(
+      wrap(
+        VideoCallStageLayout(
+          room: room,
+          connectError: null,
+          localDisplayName: 'You',
+          remoteDisplayName: 'Doctor',
+          micEnabled: true,
+          videoEnabled: false,
+          splitParticipantView: false,
+          mainStageShowsLocalVideo: false,
+          useFrontCamera: true,
+          onExpandLocal: () {},
+          onExpandRemote: () {},
+          onShrinkFromFullscreen: () {},
+          onToggleStageSwap: () => stageSwapped++,
+          onChat: () {},
+          onToggleMic: () {},
+          onToggleVideo: () {},
+          onHangUp: () {},
+          onSwitchCamera: () {},
+          controlLabelStyle: const TextStyle(fontSize: 14),
+          labels: (chat: 'Chat', sound: 'Sound', video: 'Video', leave: 'Leave'),
+          topInset: 8,
+          bottomInset: 32,
+        ),
+      ),
+    );
+
+    await tester.pump();
+    expect(find.text('You'), findsOneWidget);
+    expect(find.text('Doctor'), findsNothing);
+    expect(find.byType(AnimatedContainer), findsNothing);
+    expect(stageSwapped, 0);
+  });
+
+  testWidgets('split layout places remote above local with 70/30 height ratio', (tester) async {
+    final room = buildRoomWithRemote();
+
+    await tester.pumpWidget(
+      wrap(
+        VideoCallStageLayout(
+          room: room,
+          connectError: null,
+          localDisplayName: 'You',
+          remoteDisplayName: 'Doctor',
+          micEnabled: true,
+          videoEnabled: false,
+          splitParticipantView: true,
+          mainStageShowsLocalVideo: false,
+          useFrontCamera: true,
+          onExpandLocal: () {},
+          onExpandRemote: () {},
+          onShrinkFromFullscreen: () {},
+          onToggleStageSwap: () {},
+          onChat: () {},
+          onToggleMic: () {},
+          onToggleVideo: () {},
+          onHangUp: () {},
+          onSwitchCamera: () {},
+          controlLabelStyle: const TextStyle(fontSize: 14),
+          labels: (chat: 'Chat', sound: 'Sound', video: 'Video', leave: 'Leave'),
+          topInset: 0,
+          bottomInset: 0,
+        ),
+      ),
+    );
+
+    await tester.pump();
+
+    final remoteTop = tester.getTopLeft(find.text('Doctor')).dy;
+    final localTop = tester.getTopLeft(find.text('You')).dy;
+    expect(remoteTop, lessThan(localTop));
+
+    final remotePane = tester.getSize(
+      find.ancestor(of: find.text('Doctor'), matching: find.byType(Material)).first,
+    );
+    final localPane = tester.getSize(
+      find.ancestor(of: find.text('You'), matching: find.byType(Material)).first,
+    );
+    expect(remotePane.height / localPane.height, closeTo(7 / 3, 0.05));
+  });
+
+  testWidgets('split layout with connect error shows it on stage', (tester) async {
+    final room = buildRoomWithRemote();
     when(room.connectionState).thenReturn(lk.ConnectionState.disconnected);
 
     await tester.pumpWidget(
diff --git a/test/features/video_calls/widgets/video_call_top_overlay_test.dart b/test/features/video_calls/widgets/video_call_top_overlay_test.dart
index 4b2aea2d..f6dc791a 100644
--- a/test/features/video_calls/widgets/video_call_top_overlay_test.dart
+++ b/test/features/video_calls/widgets/video_call_top_overlay_test.dart
@@ -1,10 +1,15 @@
 import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_top_overlay.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 
 void main() {
-  testWidgets('insertBanner shows message and can be removed manually', (tester) async {
-    await tester.pumpWidget(const MaterialApp(home: Scaffold(body: SizedBox.shrink())));
+  testWidgets('insertBanner shows message and can be removed manually', (
+    tester,
+  ) async {
+    await tester.pumpWidget(
+      const MaterialApp(home: Scaffold(body: SizedBox.shrink())),
+    );
 
     final context = tester.element(find.byType(SizedBox));
     final entry = VideoCallTopOverlay.insertBanner(
@@ -23,7 +28,9 @@ void main() {
   });
 
   testWidgets('insertBanner auto removes entry', (tester) async {
-    await tester.pumpWidget(const MaterialApp(home: Scaffold(body: SizedBox.shrink())));
+    await tester.pumpWidget(
+      const MaterialApp(home: Scaffold(body: SizedBox.shrink())),
+    );
 
     final context = tester.element(find.byType(SizedBox));
     VideoCallTopOverlay.insertBanner(
@@ -40,4 +47,57 @@ void main() {
     await tester.pump(const Duration(milliseconds: 40));
     expect(find.text('Muted mic'), findsNothing);
   });
+
+  testWidgets('insertBanner does not throw without an overlay', (tester) async {
+    await tester.pumpWidget(
+      const Directionality(
+        textDirection: TextDirection.ltr,
+        child: SizedBox.shrink(),
+      ),
+    );
+
+    final context = tester.element(find.byType(SizedBox));
+    final entry = VideoCallTopOverlay.insertBanner(
+      context,
+      message: 'Recording notice',
+      backgroundColor: Colors.grey,
+      svgAsset: VideoCallTopOverlay.warningSvg,
+    );
+
+    expect(entry.mounted, isFalse);
+    await tester.pump();
+    expect(find.text('Recording notice'), findsNothing);
+  });
+
+  testWidgets('showPoorConnectionIcon renders compact icon chip', (tester) async {
+    await tester.pumpWidget(
+      const MaterialApp(home: Scaffold(body: SizedBox.shrink())),
+    );
+
+    final context = tester.element(find.byType(SizedBox));
+    VideoCallTopOverlay.showPoorConnectionIcon(context);
+
+    await tester.pump();
+    expect(find.byType(SvgPicture), findsOneWidget);
+    expect(find.text('Poor connection'), findsNothing);
+    expect(VideoCallTopOverlay.isPoorConnectionIconVisible, isTrue);
+  });
+
+  testWidgets('hidePoorConnectionIcon removes poor connection chip', (
+    tester,
+  ) async {
+    await tester.pumpWidget(
+      const MaterialApp(home: Scaffold(body: SizedBox.shrink())),
+    );
+
+    final context = tester.element(find.byType(SizedBox));
+    VideoCallTopOverlay.showPoorConnectionIcon(context);
+    await tester.pump();
+    expect(VideoCallTopOverlay.isPoorConnectionIconVisible, isTrue);
+
+    VideoCallTopOverlay.hidePoorConnectionIcon();
+    await tester.pump();
+    expect(VideoCallTopOverlay.isPoorConnectionIconVisible, isFalse);
+    expect(find.byType(SvgPicture), findsNothing);
+  });
 }
diff --git a/test/fixtures/blog_post_create/create_request_full.json b/test/fixtures/blog_post_create/create_request_full.json
index d329141e..bd6d15b6 100644
--- a/test/fixtures/blog_post_create/create_request_full.json
+++ b/test/fixtures/blog_post_create/create_request_full.json
@@ -1,7 +1,6 @@
 {
   "title": "Complete Test Title",
   "description_md": "Complete Test Description",
-  "video_url": "https://youtube.com/watch?v=complete",
+  "video_url": "https://rutube.ru/video/12345/",
   "image_name": null
 }
-
diff --git a/test/fixtures/blog_post_create/update_request.json b/test/fixtures/blog_post_create/update_request.json
index c3185f69..ae633780 100644
--- a/test/fixtures/blog_post_create/update_request.json
+++ b/test/fixtures/blog_post_create/update_request.json
@@ -2,8 +2,7 @@
   "id": 1,
   "title": "Updated Title",
   "description_md": "Updated Description",
-  "video_url": "https://youtube.com/watch?v=updated",
-  "old_image_url": "original_image.jpg",
+  "video_url": "https://vk.com/video-1_1",
+  "existing_media_ids": [2, 1],
   "image_name": null
 }
-
diff --git a/test/fixtures/consultant/consultant_profile_request.json b/test/fixtures/consultant/consultant_profile_request.json
index fc05c731..270d4a20 100644
--- a/test/fixtures/consultant/consultant_profile_request.json
+++ b/test/fixtures/consultant/consultant_profile_request.json
@@ -20,6 +20,26 @@
       "title": "Психология питания",
       "date": "2023-06-05"
     }
-  ]
+  ],
+  "legal_type": "individualPerson",
+  "last_name": "Иванов",
+  "first_name": "Иван",
+  "middle_name": "Иванович",
+  "inn": "123456789012",
+  "snils": "123-456-789 00",
+  "passport_series": "1234",
+  "passport_number": "567890",
+  "passport_issue_date": "2020-01-15",
+  "passport_issuer": "ОВД Пресненского района г. Москвы",
+  "passport_issuer_code": "772-053",
+  "birth_date": "1990-05-20",
+  "birth_place": "г. Москва",
+  "registration_address": "г. Москва, ул. Тверская, д. 1, кв. 1",
+  "residence_address": "г. Москва, ул. Тверская, д. 1, кв. 1",
+  "citizenship": "RU",
+  "tax_resident_us": false,
+  "foreign_tax_resident": false,
+  "sbp_phone": "+79991234567",
+  "agreement_accepted": true,
+  "frdo_agreement_accepted": true
 }
-
diff --git a/test/fixtures/consultant/consultation_request.json b/test/fixtures/consultant/consultation_request.json
index f4065e15..7d1fcc78 100644
--- a/test/fixtures/consultant/consultation_request.json
+++ b/test/fixtures/consultant/consultation_request.json
@@ -23,6 +23,31 @@
     "personal_site_link": "https://consultant.eatvio.app",
     "request_state": "approved"
   },
+  "legal_entity_resource": {
+    "id": 1,
+    "type": "individualPerson",
+    "last_name": "Иванов",
+    "first_name": "Иван",
+    "middle_name": "Иванович",
+    "inn": "123456789012",
+    "snils": "123-456-789 00",
+    "state": "created",
+    "alfa_scoring_status": "scoring_failed",
+    "alfa_scoring_request_id": "abc-123",
+    "passport_series": "1234",
+    "passport_number": "567890",
+    "passport_issue_date": "2020-01-15",
+    "passport_issuer": "ОВД Пресненского района г. Москвы",
+    "passport_issuer_code": "772-053",
+    "birth_date": "1990-05-20",
+    "birth_place": "г. Москва",
+    "registration_address": "г. Москва, ул. Тверская, д. 1, кв. 1",
+    "residence_address": "г. Москва, ул. Тверская, д. 1, кв. 1",
+    "citizenship": "RU",
+    "tax_resident_us": false,
+    "foreign_tax_resident": false,
+    "sbp_phone": "+79991234567"
+  },
   "cert_photos": [
     {
       "url": "https://cdn.eatvio.app/certificates/visible.jpg"
@@ -40,4 +65,3 @@
     ]
   }
 }
-
diff --git a/test/fixtures/consultant/sbp_banks.json b/test/fixtures/consultant/sbp_banks.json
new file mode 100644
index 00000000..b725de52
--- /dev/null
+++ b/test/fixtures/consultant/sbp_banks.json
@@ -0,0 +1,16 @@
+[
+  {
+    "bank_member_id": "100000000111",
+    "bank_name": "Сбербанк",
+    "short_name": "Сбер",
+    "logo_url": "https://example.com/sber.png",
+    "bic": "044525225"
+  },
+  {
+    "bank_member_id": "100000000004",
+    "bank_name": "Т-Банк",
+    "short_name": "ТБанк",
+    "logo_url": "https://example.com/tbank.png",
+    "bic": "044525974"
+  }
+]
diff --git a/test/fixtures/doubles/blog_post_doubles.dart b/test/fixtures/doubles/blog_post_doubles.dart
index d79ca54c..ed59b75f 100644
--- a/test/fixtures/doubles/blog_post_doubles.dart
+++ b/test/fixtures/doubles/blog_post_doubles.dart
@@ -4,12 +4,12 @@ import 'package:eatvio_app/features/blog_post_create/services/blog_post_service.
 import 'package:flutter_image_compress/flutter_image_compress.dart';
 
 class FixtureBlogPostRepository extends BlogPostRepository {
-  FixtureBlogPostRepository()
-      : super(blogPostService: _NoopBlogPostService());
+  FixtureBlogPostRepository() : super(blogPostService: _NoopBlogPostService());
 
   final List<BlogPostCreatePayload> createPayloads = <BlogPostCreatePayload>[];
   final List<BlogPostUpdatePayload> updatePayloads = <BlogPostUpdatePayload>[];
   final List<int> deleteCalls = <int>[];
+  final List<({int postId, int mediaId})> deleteMediaCalls = <({int postId, int mediaId})>[];
 
   Duration createDelay = Duration.zero;
   Duration updateDelay = Duration.zero;
@@ -18,15 +18,21 @@ class FixtureBlogPostRepository extends BlogPostRepository {
   Object? createError;
   Object? updateError;
   Object? deleteError;
+  Object? deleteMediaError;
 
   @override
-  Future<void> createBlogPost(String? title, String? videoUrl, String? description, XFile? image) async {
+  Future<void> createBlogPost({
+    String? title,
+    String? videoUrl,
+    String? description,
+    List<XFile> images = const [],
+  }) async {
     createPayloads.add(
       BlogPostCreatePayload(
         title: title,
         description: description,
         videoUrl: videoUrl,
-        imageName: image?.name,
+        imageName: images.isEmpty ? null : images.first.name,
       ),
     );
     if (createDelay > Duration.zero) {
@@ -38,15 +44,26 @@ class FixtureBlogPostRepository extends BlogPostRepository {
   }
 
   @override
-  Future<void> updateBlogPost(int id, String? title, String? videoUrl, String? description, XFile? image, String? oldImageUrl) async {
+  Future<void> updateBlogPost({
+    required int id,
+    String? title,
+    String? videoUrl,
+    String? description,
+    List<int> existingMediaIds = const [],
+    List<XFile> newImages = const [],
+    List<int> mediaIdsToDelete = const [],
+  }) async {
+    for (final mediaId in mediaIdsToDelete) {
+      deleteMediaCalls.add((postId: id, mediaId: mediaId));
+    }
     updatePayloads.add(
       BlogPostUpdatePayload(
         id: id,
         title: title,
         description: description,
         videoUrl: videoUrl,
-        imageName: image?.name,
-        oldImageUrl: oldImageUrl,
+        imageName: newImages.isEmpty ? null : newImages.first.name,
+        existingMediaIds: existingMediaIds,
       ),
     );
     if (updateDelay > Duration.zero) {
@@ -97,7 +114,7 @@ class BlogPostUpdatePayload {
     required this.description,
     required this.videoUrl,
     required this.imageName,
-    required this.oldImageUrl,
+    required this.existingMediaIds,
   });
 
   final int id;
@@ -105,15 +122,15 @@ class BlogPostUpdatePayload {
   final String? description;
   final String? videoUrl;
   final String? imageName;
-  final String? oldImageUrl;
+  final List<int> existingMediaIds;
 
   Map<String, dynamic> toJson() => <String, dynamic>{
         'id': id,
         'title': title,
         'description_md': description,
         'video_url': videoUrl,
+        'existing_media_ids': existingMediaIds,
         'image_name': imageName,
-        'old_image_url': oldImageUrl,
       };
 }
 
@@ -128,6 +145,11 @@ class _NoopBlogPostService implements BlogPostService {
     throw UnimplementedError('Fixture overrides repository methods directly.');
   }
 
+  @override
+  Future<void> deleteBlogPostMedia({required int postId, required int mediaId}) {
+    throw UnimplementedError('Fixture overrides repository methods directly.');
+  }
+
   @override
   Future<void> updateBlogPost({required int id, required FormData formData}) {
     throw UnimplementedError('Fixture overrides repository methods directly.');
@@ -141,4 +163,3 @@ class FeedReloadProbe {
     loadRequests += 1;
   }
 }
-
diff --git a/test/fixtures/feed/feed_blog_post_gallery_and_video_response.json b/test/fixtures/feed/feed_blog_post_gallery_and_video_response.json
new file mode 100644
index 00000000..c54b04af
--- /dev/null
+++ b/test/fixtures/feed/feed_blog_post_gallery_and_video_response.json
@@ -0,0 +1,39 @@
+{
+  "id": 4,
+  "state": "active",
+  "image": "media/4/a.jpg",
+  "images": [
+    {
+      "id": 40,
+      "url": "media/4/a.jpg",
+      "position": 1,
+      "orientation": "horizontal"
+    },
+    {
+      "id": 41,
+      "url": "media/4/b.jpg",
+      "position": 2,
+      "orientation": "horizontal"
+    }
+  ],
+  "description": "Галерея и видео",
+  "author": {
+    "author_slug": "author-slug",
+    "author_name": "Автор",
+    "author_profile_icon": "https://example.com/photo.jpg",
+    "author_is_me": false,
+    "is_entity_subscribed_by_me": true,
+    "author_place_in_rating": null
+  },
+  "video_url": "https://rutube.ru/video/6a62f217aa99daf00af8fa6cebebf218/",
+  "video_url_embed": "https://rutube.ru/play/embed/6a62f217aa99daf00af8fa6cebebf218/",
+  "video_url_thumb": "media/4/thumb.jpg",
+  "created_at": "2024-01-18T12:00:00Z",
+  "updated_at": "2024-01-18T12:00:00Z",
+  "title": "Галерея и видео",
+  "total_likes": 12,
+  "total_views": 200,
+  "total_comments": 4,
+  "was_liked_by_me": false,
+  "is_favorite": false
+}
diff --git a/test/fixtures/feed/feed_blog_post_gallery_response.json b/test/fixtures/feed/feed_blog_post_gallery_response.json
new file mode 100644
index 00000000..fd23f3a4
--- /dev/null
+++ b/test/fixtures/feed/feed_blog_post_gallery_response.json
@@ -0,0 +1,45 @@
+{
+  "id": 2,
+  "state": "active",
+  "image": "media/2/a.jpg",
+  "images": [
+    {
+      "id": 20,
+      "url": "media/2/a.jpg",
+      "position": 1,
+      "orientation": "horizontal"
+    },
+    {
+      "id": 21,
+      "url": "media/2/b.jpg",
+      "position": 2,
+      "orientation": "horizontal"
+    },
+    {
+      "id": 22,
+      "url": "media/2/c.jpg",
+      "position": 3,
+      "orientation": "vertical"
+    }
+  ],
+  "description": "Пост только с галереей",
+  "author": {
+    "author_slug": "author-slug",
+    "author_name": "Автор",
+    "author_profile_icon": "https://example.com/photo.jpg",
+    "author_is_me": false,
+    "is_entity_subscribed_by_me": false,
+    "author_place_in_rating": null
+  },
+  "video_url": "",
+  "video_url_embed": null,
+  "video_url_thumb": null,
+  "created_at": "2024-01-16T12:00:00Z",
+  "updated_at": "2024-01-16T12:00:00Z",
+  "title": "Галерея",
+  "total_likes": 3,
+  "total_views": 40,
+  "total_comments": 1,
+  "was_liked_by_me": false,
+  "is_favorite": false
+}
diff --git a/test/fixtures/feed/feed_blog_post_response.json b/test/fixtures/feed/feed_blog_post_response.json
index 75ae180b..c5af87de 100644
--- a/test/fixtures/feed/feed_blog_post_response.json
+++ b/test/fixtures/feed/feed_blog_post_response.json
@@ -1,7 +1,21 @@
 {
   "id": 1,
-  "state": "published",
-  "image": "https://example.com/image.jpg",
+  "state": "active",
+  "image": "media/1/cover.jpg",
+  "images": [
+    {
+      "id": 10,
+      "url": "media/1/a.jpg",
+      "position": 1,
+      "orientation": "horizontal"
+    },
+    {
+      "id": 11,
+      "url": "media/1/b.jpg",
+      "position": 2,
+      "orientation": "vertical"
+    }
+  ],
   "description": "Описание поста",
   "author": {
     "author_slug": "author-slug",
@@ -11,13 +25,15 @@
     "is_entity_subscribed_by_me": null,
     "author_place_in_rating": null
   },
-  "video_url": "",
+  "video_url": "https://rutube.ru/video/6a62f217aa99daf00af8fa6cebebf218/",
+  "video_url_embed": "https://rutube.ru/play/embed/6a62f217aa99daf00af8fa6cebebf218/",
+  "video_url_thumb": "media/1/thumb.jpg",
   "created_at": "2024-01-15T12:00:00Z",
   "updated_at": "2024-01-15T12:00:00Z",
   "title": "Заголовок",
   "total_likes": 10,
   "total_views": 100,
   "total_comments": 5,
-  "was_liked_by_me": false
+  "was_liked_by_me": false,
+  "is_favorite": false
 }
-
diff --git a/test/fixtures/feed/feed_blog_post_video_only_response.json b/test/fixtures/feed/feed_blog_post_video_only_response.json
new file mode 100644
index 00000000..f3025547
--- /dev/null
+++ b/test/fixtures/feed/feed_blog_post_video_only_response.json
@@ -0,0 +1,26 @@
+{
+  "id": 3,
+  "state": "active",
+  "image": "images/element-image-placeholder.svg",
+  "images": [],
+  "description": "Пост только с видео",
+  "author": {
+    "author_slug": "author-slug",
+    "author_name": "Автор",
+    "author_profile_icon": "https://example.com/photo.jpg",
+    "author_is_me": false,
+    "is_entity_subscribed_by_me": false,
+    "author_place_in_rating": null
+  },
+  "video_url": "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
+  "video_url_embed": "https://www.youtube.com/embed/dQw4w9WgXcQ",
+  "video_url_thumb": "media/3/thumb.jpg",
+  "created_at": "2024-01-17T12:00:00Z",
+  "updated_at": "2024-01-17T12:00:00Z",
+  "title": "Видео",
+  "total_likes": 8,
+  "total_views": 90,
+  "total_comments": 2,
+  "was_liked_by_me": true,
+  "is_favorite": false
+}
diff --git a/test/fixtures/feed/post_feed_empty_response.json b/test/fixtures/feed/post_feed_empty_response.json
new file mode 100644
index 00000000..872f387b
--- /dev/null
+++ b/test/fixtures/feed/post_feed_empty_response.json
@@ -0,0 +1,15 @@
+{
+  "data": [],
+  "links": {
+    "first": null,
+    "last": null,
+    "prev": null,
+    "next": null
+  },
+  "meta": {
+    "path": "/api/feed",
+    "per_page": 20,
+    "next_cursor": null,
+    "prev_cursor": null
+  }
+}
diff --git a/test/fixtures/feed/post_feed_next_page_response.json b/test/fixtures/feed/post_feed_next_page_response.json
new file mode 100644
index 00000000..56603e76
--- /dev/null
+++ b/test/fixtures/feed/post_feed_next_page_response.json
@@ -0,0 +1,45 @@
+{
+  "data": [
+    {
+      "id": 104,
+      "post_id": 4,
+      "post_author_id": 13,
+      "post_author_name": "Олег Кузнецов",
+      "post_author_image_url": "/storage/avatars/oleg.png",
+      "post_author_profile_url": "/ru/profiles/oleg-kuznetsov",
+      "post_created_at": "2024-06-04T11:00:00.000000Z",
+      "post_title": "Ужин за 20 минут",
+      "post_short_description": "Быстрый ужин после работы",
+      "post_text_md": "Курица с овощами на сковороде.",
+      "post_image_url": "/storage/posts/dinner.jpg",
+      "images": [],
+      "video_embed_url": null,
+      "post_views_count": 88,
+      "post_likes_count": 7,
+      "post_comments_count": 2,
+      "post_is_liked_by_user": false,
+      "is_entity_subscribed_by_me": false,
+      "post_url": "/ru/blog_post/4",
+      "video_url_thumb": null,
+      "post_state": "active",
+      "post_author_detailz": {
+        "slug": "oleg-kuznetsov",
+        "is_consultant": false
+      },
+      "created_at": "2024-06-04T11:05:00.000000Z",
+      "updated_at": "2024-06-04T11:05:00.000000Z"
+    }
+  ],
+  "links": {
+    "first": null,
+    "last": null,
+    "prev": "https://example.com/api/feed?cursor=eyJpZCI6MTAzfQ",
+    "next": null
+  },
+  "meta": {
+    "path": "/api/feed",
+    "per_page": 20,
+    "next_cursor": null,
+    "prev_cursor": "eyJpZCI6MTAzfQ"
+  }
+}
diff --git a/test/fixtures/feed/post_feed_response.json b/test/fixtures/feed/post_feed_response.json
new file mode 100644
index 00000000..77a103d4
--- /dev/null
+++ b/test/fixtures/feed/post_feed_response.json
@@ -0,0 +1,115 @@
+{
+  "data": [
+    {
+      "id": 101, 
+      "post_id": 1,
+      "post_author_id": 10,
+      "post_author_name": "Анна Иванова",
+      "post_author_image_url": "/storage/avatars/anna.png",
+      "post_author_profile_url": "/ru/profiles/anna-ivanova",
+      "post_created_at": "2024-06-01T10:00:00.000000Z",
+      "post_title": "Завтрак с овсянкой",
+      "post_short_description": "Простой и полезный завтрак",
+      "post_text_md": "Сегодня приготовила **овсянку** с ягодами.",
+      "post_image_url": "/storage/posts/oatmeal.jpg",
+      "images": [
+        {
+          "url": "/storage/posts/oatmeal-1.jpg",
+          "orientation": "horizontal"
+        },
+        {
+          "url": "/storage/posts/oatmeal-2.jpg",
+          "orientation": "vertical"
+        }
+      ],
+      "video_embed_url": null,
+      "post_views_count": 120,
+      "post_likes_count": 15,
+      "post_comments_count": 4,
+      "post_is_liked_by_user": false,
+      "is_entity_subscribed_by_me": false,
+      "post_url": "/ru/blog_post/1",
+      "post_state": "active",
+      "video_url_thumb": null,
+      "post_author_detailz": {
+        "slug": "anna-ivanova",
+        "is_consultant": true
+      },
+      "created_at": "2024-06-01T10:05:00.000000Z",
+      "updated_at": "2024-06-01T10:05:00.000000Z"
+    },
+    {
+      "id": 102,
+      "post_id": 2,
+      "post_author_id": 11,
+      "post_author_name": "Игорь Петров",
+      "post_author_image_url": "/storage/avatars/igor.png",
+      "post_author_profile_url": "/ru/profiles/igor-petrov",
+      "post_created_at": "2024-06-02T08:30:00.000000Z",
+      "post_title": "Тренировка дома",
+      "post_short_description": "Короткая тренировка без оборудования",
+      "post_text_md": "15 минут кардио и растяжка.",
+      "post_image_url": "/storage/posts/workout.jpg",
+      "images": [],
+      "video_embed_url": "https://www.youtube.com/embed/dQw4w9WgXcQ",
+      "post_views_count": 340,
+      "post_likes_count": 42,
+      "post_comments_count": 9,
+      "post_is_liked_by_user": true,
+      "is_entity_subscribed_by_me": true,
+      "post_url": "/ru/blog_post/2",
+      "post_state": "active",
+      "post_author_detailz": {
+        "slug": "igor-petrov",
+        "is_consultant": false
+      },
+      "created_at": "2024-06-02T08:35:00.000000Z",
+      "updated_at": "2024-06-02T09:00:00.000000Z"
+    },
+    {
+      "id": 103,
+      "post_id": 3,
+      "post_author_id": 12,
+      "post_author_name": "Мария Смирнова",
+      "post_author_image_url": null,
+      "post_author_profile_url": "/ru/profiles/maria-smirnova",
+      "post_created_at": "2024-06-03T14:15:00.000000Z",
+      "post_title": "Рецепт смузи",
+      "post_short_description": null,
+      "post_text_md": null,
+      "post_image_url": null,
+      "images": [
+        {
+          "url": "/storage/posts/smoothie.jpg",
+          "orientation": "horizontal"
+        }
+      ],
+      "video_embed_url": "https://rutube.ru/play/embed/6a62f217aa99daf00af8fa6cebebf218/",
+      "post_views_count": 50,
+      "post_likes_count": 3,
+      "post_comments_count": 1,
+      "post_is_liked_by_user": false,
+      "is_entity_subscribed_by_me": null,
+      "post_url": "/ru/blog_post/3",
+      "post_state": "active",
+      "post_author_detailz": {
+        "slug": "maria-smirnova",
+        "is_consultant": false
+      },
+      "created_at": "2024-06-03T14:20:00.000000Z",
+      "updated_at": "2024-06-03T14:20:00.000000Z"
+    }
+  ],
+  "links": {
+    "first": null,
+    "last": null,
+    "prev": null,
+    "next": "https://example.com/api/feed?cursor=eyJpZCI6MTAzfQ"
+  },
+  "meta": {
+    "path": "/api/feed", 
+    "per_page": 20,
+    "next_cursor": "eyJpZCI6MTAzfQ",
+    "prev_cursor": null
+  }
+}
diff --git a/test/fixtures/feed_fixtures.dart b/test/fixtures/feed_fixtures.dart
new file mode 100644
index 00000000..e2fa950a
--- /dev/null
+++ b/test/fixtures/feed_fixtures.dart
@@ -0,0 +1,81 @@
+import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_mapper.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_pagination_model.dart';
+
+import 'fixture_reader.dart';
+
+class FeedFixtures {
+  FeedFixtures._();
+
+  static Map<String, dynamic> postFeedResponseJson() {
+    return FixtureReader.readAsMap('feed/post_feed_response.json');
+  }
+
+  static Map<String, dynamic> postFeedNextPageResponseJson() {
+    return FixtureReader.readAsMap('feed/post_feed_next_page_response.json');
+  }
+
+  static Map<String, dynamic> postFeedEmptyResponseJson() {
+    return FixtureReader.readAsMap('feed/post_feed_empty_response.json');
+  }
+
+  static Map<String, dynamic> feedBlogPostResponseJson() {
+    return FixtureReader.readAsMap('feed/feed_blog_post_response.json');
+  }
+
+  static Map<String, dynamic> feedBlogPostGalleryResponseJson() {
+    return FixtureReader.readAsMap('feed/feed_blog_post_gallery_response.json');
+  }
+
+  static Map<String, dynamic> feedBlogPostVideoOnlyResponseJson() {
+    return FixtureReader.readAsMap('feed/feed_blog_post_video_only_response.json');
+  }
+
+  static Map<String, dynamic> feedBlogPostGalleryAndVideoResponseJson() {
+    return FixtureReader.readAsMap('feed/feed_blog_post_gallery_and_video_response.json');
+  }
+
+  static PostFeedPaginationModel postFeedPaginationModel() {
+    return PostFeedPaginationModel.fromJson(postFeedResponseJson());
+  }
+
+  static PostFeedPaginationModel postFeedNextPagePaginationModel() {
+    return PostFeedPaginationModel.fromJson(postFeedNextPageResponseJson());
+  }
+
+  static PostFeedPaginationModel postFeedEmptyPaginationModel() {
+    return PostFeedPaginationModel.fromJson(postFeedEmptyResponseJson());
+  }
+
+  static PostFeedItemModel postFeedItem({int index = 0}) {
+    return postFeedPaginationModel().data[index];
+  }
+
+  static List<FeedBlogPostModel> mappedFeedPosts({int? currentUserId}) {
+    return postFeedPaginationModel().data
+        .map((item) => PostFeedMapper.fromPostFeedItem(item, currentUserId: currentUserId))
+        .toList();
+  }
+
+  static FeedBlogPostModel feedBlogPostModel() {
+    return FeedBlogPostModel.fromJson(feedBlogPostResponseJson());
+  }
+
+  static FeedBlogPostModel feedBlogPostWithGallery() {
+    return FeedBlogPostModel.fromJson(feedBlogPostGalleryResponseJson());
+  }
+
+  static FeedBlogPostModel feedBlogPostVideoOnly() {
+    return FeedBlogPostModel.fromJson(feedBlogPostVideoOnlyResponseJson());
+  }
+
+  static FeedBlogPostModel feedBlogPostGalleryAndVideo() {
+    return FeedBlogPostModel.fromJson(feedBlogPostGalleryAndVideoResponseJson());
+  }
+
+  static List<FeedBlogPostModel> blogPostsByAuthor() {
+    return FixtureReader.readAsList('profile/blog_posts_by_author_response.json')
+        .map((item) => FeedBlogPostModel.fromJson(item as Map<String, dynamic>))
+        .toList();
+  }
+}
diff --git a/test/fixtures/profile/blog_posts_by_author_response.json b/test/fixtures/profile/blog_posts_by_author_response.json
new file mode 100644
index 00000000..a97d2e8d
--- /dev/null
+++ b/test/fixtures/profile/blog_posts_by_author_response.json
@@ -0,0 +1,80 @@
+[
+  {
+    "id": 1,
+    "state": "active",
+    "image": "media/1/cover.jpg",
+    "images": [
+      {
+        "id": 10,
+        "url": "media/1/a.jpg",
+        "position": 1,
+        "orientation": "horizontal"
+      },
+      {
+        "id": 11,
+        "url": "media/1/b.jpg",
+        "position": 2,
+        "orientation": "vertical"
+      }
+    ],
+    "description": "Описание поста профиля",
+    "author": {
+      "author_slug": "test-user",
+      "author_name": "Test User",
+      "author_profile_icon": "https://example.com/photo.jpg",
+      "author_is_me": true,
+      "is_entity_subscribed_by_me": false,
+      "author_place_in_rating": null
+    },
+    "video_url": "https://rutube.ru/video/6a62f217aa99daf00af8fa6cebebf218/",
+    "video_url_embed": "https://rutube.ru/play/embed/6a62f217aa99daf00af8fa6cebebf218/",
+    "video_url_thumb": "media/1/thumb.jpg",
+    "created_at": "2024-01-15T12:00:00Z",
+    "updated_at": "2024-01-15T12:00:00Z",
+    "title": "Пост профиля",
+    "total_likes": 10,
+    "total_views": 100,
+    "total_comments": 5,
+    "was_liked_by_me": false,
+    "is_favorite": false
+  },
+  {
+    "id": 2,
+    "state": "active",
+    "image": "media/2/a.jpg",
+    "images": [
+      {
+        "id": 20,
+        "url": "media/2/a.jpg",
+        "position": 1,
+        "orientation": "horizontal"
+      },
+      {
+        "id": 21,
+        "url": "media/2/b.jpg",
+        "position": 2,
+        "orientation": "horizontal"
+      }
+    ],
+    "description": "Галерея без видео",
+    "author": {
+      "author_slug": "test-user",
+      "author_name": "Test User",
+      "author_profile_icon": "https://example.com/photo.jpg",
+      "author_is_me": true,
+      "is_entity_subscribed_by_me": false,
+      "author_place_in_rating": null
+    },
+    "video_url": "",
+    "video_url_embed": null,
+    "video_url_thumb": null,
+    "created_at": "2024-01-16T12:00:00Z",
+    "updated_at": "2024-01-16T12:00:00Z",
+    "title": "Галерея",
+    "total_likes": 3,
+    "total_views": 40,
+    "total_comments": 1,
+    "was_liked_by_me": false,
+    "is_favorite": false
+  }
+]
diff --git a/test/fixtures/video_calls/video_call_accept_response.json b/test/fixtures/video_calls/video_call_accept_response.json
new file mode 100644
index 00000000..ec80c0fd
--- /dev/null
+++ b/test/fixtures/video_calls/video_call_accept_response.json
@@ -0,0 +1,4 @@
+{
+  "sent": true,
+  "devices_notified": 2
+}