feat(personalized_feed): added vk player state handling, separeted player logic

Reviewed-on: eatvio/eatvio_app#1000

.gitea/workflows/test-flight-cd.yaml

@@ -15,12 +15,11 @@ jobs:
         uses: https://github.com/actions/checkout@v2
 
       - name: Checkout env repository
-        uses: https://github.com/actions/checkout@v3
+        uses: https://github.com/actions/checkout@v2
         with:
-          repository: eatvio/eatvio_app_env
+          repository: mso7nueh/eatvio_app_env
           path: env_repo
-          # Здесь может быть токен любого юзера с доступом в gitea
-          token: ${{ vars.READ_USER_GITEA_TOKEN }}
+          token: ${{ vars.MSO7NUEH_TOKEN }}
           ref: main
 
       - name: Copy .env file
@@ -58,20 +57,23 @@ jobs:
 
       - name: Flutter build
         run: |
-          flutter --version
+          flutter upgrade
           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 install
+          pod update
           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://eatvio:${{ vars.READ_USER_GITEA_TOKEN }}@gitea.office.local:3000/eatvio/fastlane.git
+          MATCH_GIT_URL: http://gitea.office.local:3000/mso7nueh/fastlane
           FASTLANE_USER: eatvio2023@icloud.com
           FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ vars.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}
           API_APPSTORE_KEY: ${{ vars.API_APPSTORE_KEY }}

.gitea/workflows/test.yml

@@ -1,9 +1,6 @@
 name: Eatvio App Android Test
 
-on:
-  pull_request:
-    branches:
-      - main
+on: [pull_request]
 
 env:
   flutter_version: '3.41.2'
@@ -166,66 +163,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: |

.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:

android/app/build.gradle

@@ -69,8 +69,6 @@ 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

android/app/proguard-rules.pro

@@ -4,12 +4,6 @@
 -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.**
 

android/app/src/main/AndroidManifest.xml

@@ -1,13 +1,9 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <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"/>
@@ -17,16 +13,6 @@
         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">
@@ -47,7 +33,7 @@
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
-            android:supportsPictureInPicture="true"
+            android:taskAffinity=""
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
@@ -91,68 +77,6 @@
         <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

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

@@ -1,53 +0,0 @@
-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
-    }
-}

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

@@ -1,38 +0,0 @@
-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)
-    }
-}

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

@@ -1,29 +0,0 @@
-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)
-    }
-}

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

@@ -1,25 +0,0 @@
-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)
-    }
-}

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

@@ -1,38 +0,0 @@
-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"
-    }
-}

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

@@ -20,23 +20,17 @@ class HmsPushService : HmsMessageService() {
 
         if (message == null) return
 
-        if (VideoCallPushBridge.isEndedVideoCall(message.dataOfMap)) {
-            VideoCallPushBridge.dismissAllIncomingCalls(this)
-            return
-        }
-
-        if (VideoCallPushBridge.isIncomingVideoCall(message.dataOfMap)) {
-            VideoCallPushBridge.showIncomingCall(this, message.dataOfMap)
-            return
-        }
-
+        // Берём action_url из data-поля, если оно есть.
         val actionUrl = message.dataOfMap["action_url"]
+
+        // Строим системное уведомление, по тапу по которому откроется MainActivity с 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()) {
@@ -54,7 +48,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)
@@ -64,3 +58,5 @@ class HmsPushService : HmsMessageService() {
         NotificationManagerCompat.from(context).notify(message.messageId.hashCode(), notification)
     }
 }
+
+

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

@@ -1,16 +1,11 @@
 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
@@ -18,68 +13,13 @@ 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" -> {
@@ -135,67 +75,17 @@ 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")
 
@@ -211,19 +101,4 @@ 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)
-        }
-    }
 }

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

@@ -1,42 +0,0 @@
-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)
-        }
-    }
-}

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

@@ -1,318 +0,0 @@
-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
-        }
-    }
-}

assets/icons/video_call/vc_control_enter.svg

@@ -1,3 +0,0 @@
-<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>

ios/Runner.xcodeproj/project.pbxproj

@@ -397,7 +397,7 @@
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Eatvio;
-				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.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 = 16.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.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 = 16.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

ios/Runner/AppDelegate.swift

@@ -1,517 +1,30 @@
-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, 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"
-
+@objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
     GeneratedPluginRegistrant.register(with: self)
-    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
+    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
 
   @available(iOS 8.0, *)
-  override func application(
-    _ application: UIApplication,
-    continue userActivity: NSUserActivity,
-    restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void
+  func application(
+    _ application: UIApplication, continue userActivity: NSUserActivity,
+    restorationHandler: @escaping ([Any]?) -> Void
   ) -> Bool {
-    if YXLSdk.shared.processUserActivity(userActivity) {
-      return true
-    }
-    return super.application(
-      application,
-      continue: userActivity,
-      restorationHandler: restorationHandler
-    )
+    YXLSdk.shared.processUserActivity(userActivity)
+    return true
   }
 
   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() {}
 }

ios/Runner/Info.plist

@@ -37,18 +37,14 @@
 	<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>
@@ -142,14 +138,6 @@
 				<string>yx5399b03636104c6d920b87c1ad329254</string>
 			</array>
 		</dict>
-		<dict>
-			<key>CFBundleURLName</key>
-			<string>Eatvio</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>eatvio</string>
-			</array>
-		</dict>
 	</array>
 </dict>
 </plist>

ios/fastlane/Fastfile

@@ -75,24 +75,16 @@ 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",
-      export_team_id: "VL68C36HYS"
+      codesigning_identity: "Apple Distribution",
     )
+    
 
+    
     app_store_connect_api_key(
       key_id: "325JS9JCZH", 
       issuer_id: "dfa27d1d-2bb8-4d4d-847e-0b32f9b880b3", 
@@ -100,7 +92,6 @@ platform :ios do
       duration: 1200,
       in_house: false
     )
-  
     
     begin
       upload_to_testflight(

lib/core/app_config.dart

@@ -8,7 +8,6 @@ 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';
@@ -36,7 +35,6 @@ 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>()),

lib/core/app_initializer.dart

@@ -6,7 +6,6 @@ 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';
@@ -48,7 +47,6 @@ 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));

lib/core/const.dart

@@ -9,5 +9,4 @@ 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;

lib/core/device/device_hw_id_provider.dart

@@ -1,16 +0,0 @@
-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;
-  }
-}

lib/core/di/cubit_registrations.dart

@@ -52,8 +52,6 @@ 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';
 
@@ -74,18 +72,6 @@ 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'ов как фабрик

lib/core/di/service_registrations.dart

@@ -36,9 +36,7 @@ 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 в системе внедрения зависимостей
@@ -78,12 +76,6 @@ 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()));

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.transformTimeout:
       case DioExceptionType.connectionError:
+      case DioExceptionType.transformTimeout:
         return true;
       case DioExceptionType.unknown:
       case DioExceptionType.badResponse:

lib/core/firebase_api.dart

@@ -12,7 +12,6 @@ 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;
@@ -88,9 +87,6 @@ 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');
@@ -99,88 +95,6 @@ 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 {

lib/core/notifications/push_navigation_handler.dart

@@ -1,13 +1,6 @@
 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';
@@ -57,37 +50,7 @@ class PushNavigationHandler {
   }
 
   static void _handleMessageInternal(RemoteMessage message, {required String source}) {
-    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 data = message.data;
     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');

lib/core/routing/other_routes.dart

@@ -15,7 +15,6 @@ 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';
@@ -245,13 +244,7 @@ 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()?,
             );
@@ -265,15 +258,7 @@ class OtherRoutes {
       ),
 
       // Consultant routes
-      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.becomeConsultantScreen, name: 'becomeConsultantScreen', builder: (context, state) => const BecomeConsultantScreen()),
       GoRoute(
         path: RouteConstants.stepperBecomeConsultantScreen,
         name: 'stepperBecomeConsultantScreen',
@@ -281,12 +266,7 @@ class OtherRoutes {
           final data = state.extra as Map<String, dynamic>;
           final slug = data['slug'] as String?;
           final isCanceled = data['isCanceled'] as bool?;
-          final isNewRegistration = data['isNewRegistration'] as bool? ?? false;
-          return StepperBecomeConsultantScreen(
-            slug: slug,
-            isCanceled: isCanceled,
-            isNewRegistration: isNewRegistration,
-          );
+          return StepperBecomeConsultantScreen(slug: slug, isCanceled: isCanceled);
         },
       ),
       GoRoute(path: RouteConstants.calendarScreen, name: 'calendarScreen', builder: (context, state) => const CalendarScreen()),
@@ -359,11 +339,3 @@ class OtherRoutes {
     ];
   }
 }
-
-VideoCallEntryMode _videoCallEntryModeFromRouteExtra(Object? raw) {
-  if (raw is VideoCallEntryMode) return raw;
-  if (raw == VideoCallEntryMode.incomingAccepted.name) {
-    return VideoCallEntryMode.incomingAccepted;
-  }
-  return VideoCallEntryMode.outgoing;
-}

lib/core/theme/custom_text_style.dart

@@ -80,48 +80,6 @@ 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 {

lib/core/websockets/ws_manager.dart

@@ -26,13 +26,6 @@ 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;
@@ -182,107 +175,6 @@ class WsManager {
     );
   }
 
-  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() {
     _privateMessagesChannel?.subscribe();
     _privateNotificationChannel?.subscribe();
@@ -301,19 +193,6 @@ class WsManager {
     _privateDirectChatChannel?.unsubscribe();
   }
 
-  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 {
     await client?.disconnect();
     await _lifecycleSubscription?.cancel();
@@ -325,7 +204,6 @@ class WsManager {
     client = null;
     userId = null;
     _privateDirectChatChannel?.unsubscribe();
-    unsubscribePresenceDirectChatChannel();
     _privateMessagesChannel?.unsubscribe();
     _privateNotificationChannel?.unsubscribe();
     _privateDirectChatChannel = null;
@@ -333,13 +211,3 @@ class WsManager {
     _privateNotificationChannel = null;
   }
 }
-
-class _PresenceDirectChatListener {
-  const _PresenceDirectChatListener({
-    required this.counterpartUserId,
-    required this.onCounterpartOnlineChanged,
-  });
-
-  final int counterpartUserId;
-  final void Function(bool isOnline) onCounterpartOnlineChanged;
-}

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', unknownEnumValue: ChatMessageType.unknown) ChatMessageType? type,
+    @JsonKey(name: 'type') String? type,
     @Default(MessageState.sent) @JsonKey(includeToJson: false, includeFromJson: false) MessageState messageState,
     @Default(null) @JsonKey(includeToJson: false, includeFromJson: false) String? uuid,
   }) = _ChatMessageModel;
@@ -42,22 +42,3 @@ 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;
-}

lib/features/chat/models/chat_room_pagination_model.dart

@@ -54,8 +54,6 @@ 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);

lib/features/chat/models/chat_user_model.dart

@@ -10,8 +10,6 @@ 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);

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

@@ -16,7 +16,6 @@ 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';
@@ -35,8 +34,6 @@ 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());
@@ -196,10 +193,8 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
   Future<void> _subscribeToChatChannel({required String uuid, required String chatId}) async {
     final client = wsManager.client;
     if (client == null) return;
-    _activeChatUuid = uuid;
     await wsManager.initPrivateDirectChatChannel(chatId);
     wsManager.subscribeDirectChatChannel();
-    await _subscribeToPresenceChannel(chatId: chatId);
     messagesSubscription = wsManager.directChatStream?.listen((event) {
       AudioPlayer().play((AssetSource('audio/recive_message.wav')));
       final message = ChatMessageModel.fromJson(jsonDecode(event.data));
@@ -225,118 +220,6 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     });
   }
 
-  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();
@@ -477,10 +360,6 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
 
   @override
   Future<void> close() async {
-    if (_presenceOnlineListener != null) {
-      wsManager.removePresenceDirectChatListener(_presenceOnlineListener!);
-      _presenceOnlineListener = null;
-    }
     wsManager.unsubscribeDirectChatChannel();
     _timer?.cancel();
     messagesSubscription?.cancel();
@@ -579,5 +458,3 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     }
   }
 }
-
-enum _ChatCounterpartField { sender, receiver }

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

@@ -13,19 +13,13 @@ 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';
@@ -65,7 +59,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();
@@ -78,7 +72,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,
     );
@@ -107,7 +101,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);
@@ -168,7 +162,6 @@ 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 = [
@@ -245,31 +238,19 @@ class _ChatScreenState extends State<ChatScreen> {
                   ),
                 ),
               const SizedBox(width: 16),
-              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),
-                    ),
-                  ],
-                ),
+              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),
+                  ),
+                ],
               ),
             ],
           ),
@@ -277,7 +258,18 @@ class _ChatScreenState extends State<ChatScreen> {
         actions: [
           Padding(
             padding: const EdgeInsetsDirectional.only(end: 8),
-            child: _ChatHeaderVideoCallButton(onPressed: () => _openVideoCall(context, state, chatCounterpart)),
+            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,
+                  },
+                );
+              },
+            ),
           ),
         ],
       ),
@@ -312,7 +304,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 == ChatMessageType.planOrder;
+                                final isPlanOrderMessage = message.type == 'plan_order';
 
                                 PacketOptions? messageOption;
                                 if (isPlanOrderMessage && chosenPlan != null) {
@@ -353,13 +345,18 @@ class _ChatScreenState extends State<ChatScreen> {
                                           });
                                         }
                                       },
-                                      child: _buildMessageBubble(
-                                        context: context,
-                                        state: state,
-                                        chatCounterpart: chatCounterpart,
-                                        isCurrentUserAuthor: isCurrentUserAuthor,
-                                        message: message,
-                                        amIConsultant: amIConsultant,
+                                      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,
                                       ),
                                     ),
                                   ],
@@ -367,7 +364,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 == ChatMessageType.planOrder;
+                              final isPlanOrderMessage = message.type == 'plan_order';
 
                               PacketOptions? messageOption;
                               if (isPlanOrderMessage && chosenPlan != null) {
@@ -404,13 +401,18 @@ class _ChatScreenState extends State<ChatScreen> {
                                         });
                                       }
                                     },
-                                    child: _buildMessageBubble(
-                                      context: context,
-                                      state: state,
-                                      chatCounterpart: chatCounterpart,
-                                      isCurrentUserAuthor: isCurrentUserAuthor,
-                                      message: message,
-                                      amIConsultant: amIConsultant,
+                                    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,
                                     ),
                                   ),
                                 ],
@@ -777,52 +779,6 @@ 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,
-      },
-    );
-  }
-
-  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 {
@@ -844,7 +800,9 @@ 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),
+          ),
         ),
       ),
     );

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 ChatMessageType? messageType;
+  final String? messageType;
   final bool? isConsultant;
   final List<Map<String, dynamic>>? urlsMediaInfo;
   @override
@@ -182,36 +182,33 @@ class ChatBubbleWidget extends StatelessWidget {
                                     }
                                   }
 
-                                  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);
-                                          }
+                                  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);
                                         }
-                                      },
-                                      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),
-                                      ),
+                                      } 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),
                                     ),
                                   );
                                 }
@@ -258,7 +255,7 @@ class ChatBubbleWidget extends StatelessWidget {
   }
 
   String _getDisplayText() {
-    if (messageType == ChatMessageType.planOrder) {
+    if (messageType == 'plan_order') {
       if (isConsultant == true) {
         // Текст для консультанта
         return '1. Уточните у подопечного его цели и пожелания\n'

lib/features/chat/presentation/widgets/chat_user_online_status_line.dart

@@ -1,70 +0,0 @@
-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,
-    );
-  }
-}

lib/features/chat/presentation/widgets/video_call_chat_message_widget.dart

@@ -1,103 +0,0 @@
-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,
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/features/chat/utils/chat_counterpart_utils.dart

@@ -1,15 +0,0 @@
-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;
-}

lib/features/consultant/become_consultant/enums/alfa_scoring_status.dart

@@ -1,51 +0,0 @@
-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;
-}

lib/features/consultant/become_consultant/models/consultant_cert_photo_model.dart

@@ -18,8 +18,7 @@ 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';

lib/features/consultant/become_consultant/models/consultant_profile_model.dart

@@ -6,100 +6,27 @@ 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: '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,
+    @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,
   }) = _ConsultantProfileModel;
 
-  factory ConsultantProfileModel.fromJson(Map<String, Object?> json) =>
-      _$ConsultantProfileModelFromJson(json);
-
-  bool get hasValidPassportData {
-    final last = lastName ?? '';
-    final first = firstName ?? '';
-    final innValue = inn ?? '';
-    final snilsValue = snils ?? '';
-    final series = passportSeries ?? '';
-    final number = passportNumber ?? '';
-    final issueDate = passportIssueDate ?? '';
-    final issuer = passportIssuer ?? '';
-    final issuerCode = passportIssuerCode ?? '';
-    final birth = birthDate ?? '';
-    final birthPlaceValue = birthPlace ?? '';
-    final registration = registrationAddress ?? '';
-    final residence = residenceAddress ?? '';
-    final citizenshipValue = citizenship ?? '';
-
-    return last.trim().isNotEmpty &&
-        first.trim().isNotEmpty &&
-        RegExp(r'^\d{12}$').hasMatch(innValue) &&
-        RegExp(r'^\d{3}-\d{3}-\d{3} \d{2}$').hasMatch(snilsValue) &&
-        RegExp(r'^\d{4}$').hasMatch(series) &&
-        RegExp(r'^\d{6}$').hasMatch(number) &&
-        RegExp(r'^\d{4}-\d{2}-\d{2}$').hasMatch(issueDate) &&
-        issuer.trim().isNotEmpty &&
-        RegExp(r'^\d{3}-\d{3}$').hasMatch(issuerCode) &&
-        RegExp(r'^\d{4}-\d{2}-\d{2}$').hasMatch(birth) &&
-        birthPlaceValue.trim().isNotEmpty &&
-        registration.trim().isNotEmpty &&
-        residence.trim().isNotEmpty &&
-        RegExp(r'^[A-Za-z]{2}$').hasMatch(citizenshipValue);
-  }
+  factory ConsultantProfileModel.fromJson(Map<String, Object?> json) => _$ConsultantProfileModelFromJson(json);
 }
 
 @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
@@ -109,6 +36,5 @@ 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);
 }

lib/features/consultant/become_consultant/models/consultation_request_model.dart

@@ -1,4 +1,3 @@
-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';
 
@@ -12,81 +11,26 @@ 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: 'legal_entity_resource') LegalEntityModel? legalEntity,
+    @JsonKey(name: 'canceled_moderation') CanceledModerationModel? canceledModeration,
   }) = _ConsultationRequestModel;
 
-  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);
+  factory ConsultationRequestModel.fromJson(Map<String, dynamic> json) => _$ConsultationRequestModelFromJson(json);
 }
 
 @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 {
@@ -96,6 +40,5 @@ 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);
 }

lib/features/consultant/become_consultant/models/sbp_bank_model.dart

@@ -1,18 +0,0 @@
-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);
-}

lib/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart

@@ -1,117 +1,42 @@
-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: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;
 
-  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;
-  }
+  RegisterConsultantCubit({required this.consultantRepository})
+    : super(
+        const RegisterConsultantState(
+          consultant: ConsultantProfileModel(socialLinks: SocialLinksModel(), hasMedicalEducation: true),
+          loading: true,
+          acceptOffer: false,
+          isUpdating: false,
+        ),
+      );
 
   Future<void> getMyRequestStatus(String slug) async {
     try {
       _update = true;
-      _userSlug = slug;
-      final myRequestStatus = await consultantRepository.getMyRequestStatus(
-        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(
@@ -121,107 +46,33 @@ 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,
-            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),
+            hasMedicalEducation: myRequestStatus.educationModel.hasMedicalEducation == 1,
           ),
           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,
-        ),
-      );
+      emit(state.copyWith(loading: false, error: e.toString()));
     }
   }
 
-  String? _emptyToNull(String? value) {
-    if (value == null || value.trim().isEmpty) {
-      return null;
-    }
-    return value.trim();
-  }
-
-  Future<void> disableLoading({String? slug}) async {
+  Future<void> disableLoading() 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,
-          ),
-        ),
-      );
+      emit(state.copyWith(loading: false, certPhotos: certPhotos, error: null));
     } 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,
-        ),
-      );
+      emit(state.copyWith(loading: false, error: e.toString()));
     }
   }
 
@@ -231,325 +82,41 @@ class RegisterConsultantCubit extends Cubit<RegisterConsultantState> {
     if (slug != null) {
       await getMyRequestStatus(slug);
     } else {
-      await disableLoading(slug: _userSlug);
+      await disableLoading();
     }
   }
 
-  void updateConsultantProfileModel(
-    ConsultantProfileModel consultant, [
-    bool? acceptOffer,
-    bool? acceptFrdoAgreement,
-  ]) {
-    emit(
-      state.copyWith(
-        consultant: consultant,
-        acceptOffer: acceptOffer ?? state.acceptOffer,
-        acceptFrdoAgreement: acceptFrdoAgreement ?? state.acceptFrdoAgreement,
-        loading: false,
-        error: null,
-        fieldErrors: const <String, String>{},
-      ),
-    );
-  }
-
-  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,
-    );
+  void updateConsultantProfileModel(ConsultantProfileModel consultant, [bool acceptOffer = false]) {
+    emit(state.copyWith(consultant: consultant, acceptOffer: acceptOffer, loading: false, error: null));
   }
 
   Future<void> registerConsultant() async {
-    if (!state.consultant.hasValidPassportData) {
-      emit(state.copyWith(error: 'Заполните паспортные данные'));
-      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,
-      ),
-    );
-
+    emit(state.copyWith(error: null));
     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: 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,
-        ),
-      );
+      await consultantRepository.registerConsultant(consultant: state.consultant, update: _update);
     } catch (e, st) {
       await reportFrom(e, st, this);
       log(e.toString());
-      emit(
-        state.copyWith(
-          error: e.toString(),
-          scoringRetryInProgress: false,
-          awaitingScoringOutcome: false,
-          isScoringPolling: false,
-          alfaScoringStatus: AlfaScoringStatus.none,
-        ),
-      );
+      emit(state.copyWith(error: e.toString()));
     }
   }
 
-  Future<void> retryScoring() async {
-    if (!state.alfaScoringStatus.canRetry || state.scoringRetryInProgress) {
-      return;
-    }
-    emit(
-      state.copyWith(
-        scoringRetryInProgress: true,
-        error: null,
-        fieldErrors: const <String, String>{},
-        alfaScoringStatus: AlfaScoringStatus.beneficiaryCreating,
-        isScoringPolling: true,
-        awaitingScoringOutcome: true,
-      ),
-    );
-    _update = true;
-    try {
-      if (!state.consultant.hasValidPassportData) {
-        emit(
-          state.copyWith(
-            scoringRetryInProgress: false,
-            isScoringPolling: false,
-            awaitingScoringOutcome: false,
-            alfaScoringStatus: AlfaScoringStatus.scoringFailed,
-            error: 'Заполните паспортные данные',
-          ),
-        );
-        return;
-      }
-      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());
@@ -563,19 +130,7 @@ 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();
-  }
 }

lib/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_state.dart

@@ -1,10 +1,8 @@
 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';
@@ -14,22 +12,12 @@ 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(<SbpBankModel>[]) List<SbpBankModel> sbpBanks,
+    @Default(<ConsultantCertPhotoModel>[]) List<ConsultantCertPhotoModel> certPhotos,
     @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;
 }

lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart

@@ -8,8 +8,7 @@ class AdditionalSettingsScreen extends StatefulWidget {
   const AdditionalSettingsScreen({super.key});
 
   @override
-  State<AdditionalSettingsScreen> createState() =>
-      _AdditionalSettingsScreenState();
+  State<AdditionalSettingsScreen> createState() => _AdditionalSettingsScreenState();
 }
 
 class _AdditionalSettingsScreenState extends State<AdditionalSettingsScreen> {
@@ -18,12 +17,7 @@ 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
@@ -58,8 +52,7 @@ class _AdditionalSettingsScreenState extends State<AdditionalSettingsScreen> {
             value: publishDiplomasAndCertificatesInProfile,
             onTap: () {
               setState(() {
-                publishDiplomasAndCertificatesInProfile =
-                    !publishDiplomasAndCertificatesInProfile;
+                publishDiplomasAndCertificatesInProfile = !publishDiplomasAndCertificatesInProfile;
               });
             },
           ),
@@ -71,15 +64,11 @@ 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,
+                ),
+              );
             },
           ),
         ],

lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart

@@ -3,9 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
 class BecomeConsultantScreen extends StatefulWidget {
-  final String? slug;
-
-  const BecomeConsultantScreen({super.key, this.slug});
+  const BecomeConsultantScreen({super.key});
 
   @override
   State<BecomeConsultantScreen> createState() => _BecomeConsultantScreenState();
@@ -19,10 +17,7 @@ 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),
@@ -37,27 +32,16 @@ class _BecomeConsultantScreenState extends State<BecomeConsultantScreen> {
 
   InkWell _startRegistrationButton() {
     return InkWell(
-      onTap: () => GoRouter.of(context).pushReplacementNamed(
-        'stepperBecomeConsultantScreen',
-        extra: {'slug': widget.slug, 'isNewRegistration': true},
-      ),
+      onTap: () => GoRouter.of(context).pushReplacementNamed('stepperBecomeConsultantScreen', extra: {'slug': null}),
       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),
           ),
         ),
       ),

lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart

@@ -7,18 +7,15 @@ 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 = [
@@ -32,15 +29,9 @@ class _CertificatesAndDiplomasScreenState
   @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),
@@ -79,8 +70,7 @@ class _CertificatesAndDiplomasScreenState
           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),
@@ -103,7 +93,9 @@ class _CertificatesAndDiplomasScreenState
     );
   }
 
-  Column _diplomaInfo({required DiplomaEntity diploma}) {
+  Column _diplomaInfo({
+    required DiplomaEntity diploma,
+  }) {
     return Column(
       children: [
         CustomTextFormField(
@@ -119,9 +111,7 @@ class _CertificatesAndDiplomasScreenState
           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(
@@ -132,9 +122,7 @@ class _CertificatesAndDiplomasScreenState
                 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),
@@ -160,7 +148,9 @@ class _CertificatesAndDiplomasScreenState
                     color: const Color(0xFFF6F6F6),
                     borderRadius: BorderRadius.circular(20),
                   ),
-                  child: const Icon(Icons.delete_outline_rounded),
+                  child: const Icon(
+                    Icons.delete_outline_rounded,
+                  ),
                 ),
               ),
           ],
@@ -200,14 +190,16 @@ class _CertificatesAndDiplomasScreenState
           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(
@@ -238,19 +230,12 @@ class _CertificatesAndDiplomasScreenState
 
   void _saveState() {
     context.read<RegisterConsultantCubit>().updateConsultantProfileModel(
-      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!),
+          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,
+                    ),
               ),
-            )
-            .toList()
-            .sublist(0, diplomasList.length - 1),
-      ),
-    );
+        );
   }
 }

lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart

@@ -1,11 +1,8 @@
 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/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:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -18,29 +15,10 @@ class LastStepScreen extends StatefulWidget {
 }
 
 class _LastStepScreenState extends State<LastStepScreen> {
-  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();
-  }
+  bool checkboxState = false;
 
   @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(
@@ -49,138 +27,34 @@ 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: state.acceptOffer,
+            value: checkboxState,
             title: Text(
               hidePlans
                   ? 'Я ознакомлен и принимаю политику конфиденциальности и защиту персональных данных'
-                  : 'Я ознакомлен и принимаю публичную оферту и политику конфиденциальности',
-              style: const TextStyle(fontSize: 18, height: 1.2),
+                  : 'Я ознакомлен и принимаю договор публичной офёрты',
+              style: const TextStyle(fontSize: 18, height: 1),
             ),
-            onChanged: (value) {
-              cubit.updateAgreements(acceptOffer: value ?? false);
+            onChanged: (_) {
+              setState(() {
+                checkboxState = !checkboxState;
+              });
+              context.read<RegisterConsultantCubit>().updateConsultantProfileModel(context.read<RegisterConsultantCubit>().state.consultant, checkboxState);
             },
             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),
               ),
             ),
           ),
@@ -193,10 +67,7 @@ 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)),
     );
   }
 }

lib/features/consultant/become_consultant/presentation/pages/passport_data_screen.dart

@@ -1,591 +0,0 @@
-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_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,
-  );
-
-  @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,
-                    hasError: errors.containsKey('last_name'),
-                    onChanged: (_) => _syncToCubit(),
-                  ),
-                ),
-                const SizedBox(height: 12),
-                PassportFieldWithError(
-                  error: errors['first_name'],
-                  child: CustomTextFormField(
-                    hintText: 'Имя',
-                    controller: firstNameController,
-                    hasError: errors.containsKey('first_name'),
-                    onChanged: (_) => _syncToCubit(),
-                  ),
-                ),
-                const SizedBox(height: 12),
-                PassportFieldWithError(
-                  error: errors['middle_name'],
-                  child: CustomTextFormField(
-                    hintText: 'Отчество',
-                    controller: middleNameController,
-                    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,
-                    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,
-                          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,
-                          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,
-                  ),
-                ),
-              ],
-            ),
-          );
-        },
-      ),
-    );
-  }
-}

lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart

@@ -29,48 +29,32 @@ 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),
                           ),
                         );
@@ -88,8 +72,7 @@ class _PhotoOrScansScreenState extends State<PhotoOrScansScreen> {
                           return _LocalCertPhotoCard(
                             photo: localPhoto,
                             allPhotos: addedPhotos,
-                            onRemove: () =>
-                                _removePhoto(path: localPhoto.uri.path),
+                            onRemove: () => _removePhoto(path: localPhoto.uri.path),
                           );
                         }
                       }
@@ -116,9 +99,7 @@ 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(() {
@@ -138,11 +119,7 @@ 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) {
@@ -154,11 +131,7 @@ 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),
@@ -168,10 +141,7 @@ 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(
@@ -182,15 +152,8 @@ 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),
                   ),
                 ),
               ),
@@ -207,11 +170,7 @@ 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) {
@@ -251,15 +210,8 @@ 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),
                   ),
                 ),
               ),

lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart

@@ -1,7 +1,5 @@
 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});
@@ -13,26 +11,7 @@ class RegistrationAsScreen extends StatefulWidget {
 enum RegistrationAsType { physical, selfBusy, iP, ooo }
 
 class _RegistrationAsScreenState extends State<RegistrationAsScreen> {
-  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,
-      );
-    });
-  }
+  RegistrationAsType registrationAsType = RegistrationAsType.physical;
 
   @override
   Widget build(BuildContext context) {
@@ -44,14 +23,7 @@ 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(
@@ -64,15 +36,16 @@ class _RegistrationAsScreenState extends State<RegistrationAsScreen> {
                     groupValue: registrationAsType,
                     activeColor: appTheme.blueA400,
                     // ignore: deprecated_member_use
-                    onChanged: (_) {},
+                    onChanged: (value) {
+                      setState(() {
+                        registrationAsType = value!;
+                      });
+                    },
                   ),
                   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)),
                     ),
                   ),
                 ],
@@ -85,19 +58,16 @@ class _RegistrationAsScreenState extends State<RegistrationAsScreen> {
                     groupValue: registrationAsType,
                     activeColor: appTheme.blueA400,
                     // ignore: deprecated_member_use
-                    onChanged: null,
+                    onChanged: (value) {
+                      setState(() {
+                        registrationAsType = value!;
+                      });
+                    },
                   ),
                   const Expanded(
                     child: Padding(
                       padding: EdgeInsets.symmetric(horizontal: 8),
-                      child: Text(
-                        'Самозанятого',
-                        style: TextStyle(
-                          fontSize: 18,
-                          height: 1,
-                          color: Colors.black38,
-                        ),
-                      ),
+                      child: Text('Самозанятого', style: TextStyle(fontSize: 18, height: 1)),
                     ),
                   ),
                 ],
@@ -110,19 +80,16 @@ class _RegistrationAsScreenState extends State<RegistrationAsScreen> {
                     groupValue: registrationAsType,
                     activeColor: appTheme.blueA400,
                     // ignore: deprecated_member_use
-                    onChanged: null,
+                    onChanged: (value) {
+                      setState(() {
+                        registrationAsType = value!;
+                      });
+                    },
                   ),
                   const Expanded(
                     child: Padding(
                       padding: EdgeInsets.symmetric(horizontal: 8),
-                      child: Text(
-                        'Индивидуального предпринимателя',
-                        style: TextStyle(
-                          fontSize: 18,
-                          height: 1,
-                          color: Colors.black38,
-                        ),
-                      ),
+                      child: Text('Индивидуального предпринимателя', style: TextStyle(fontSize: 18, height: 1)),
                     ),
                   ),
                 ],
@@ -135,34 +102,26 @@ class _RegistrationAsScreenState extends State<RegistrationAsScreen> {
                     groupValue: registrationAsType,
                     activeColor: appTheme.blueA400,
                     // ignore: deprecated_member_use
-                    onChanged: null,
+                    onChanged: (value) {
+                      setState(() {
+                        registrationAsType = value!;
+                      });
+                    },
                   ),
                   const Expanded(
                     child: Padding(
                       padding: EdgeInsets.symmetric(horizontal: 8),
-                      child: Text(
-                        'Общества с ограниченной ответственностью',
-                        style: TextStyle(
-                          fontSize: 18,
-                          height: 1,
-                          color: Colors.black38,
-                        ),
-                      ),
+                      child: Text('Общества с ограниченной ответственностью', style: TextStyle(fontSize: 18, height: 1)),
                     ),
                   ),
                 ],
               ),
             ],
           ),
-          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('* На данный момент регистрация доступна только в качестве физического лица. Остальные варианты скоро появятся'),
           ),
         ],
       ),
@@ -173,10 +132,7 @@ 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)),
     );
   }
 }

lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart

@@ -19,47 +19,32 @@ 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
@@ -90,7 +75,9 @@ 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(
@@ -118,7 +105,9 @@ 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(
@@ -146,7 +135,9 @@ 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(
@@ -173,45 +164,25 @@ 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,
+                    ),
+              ),
+        );
   }
 }

lib/features/consultant/become_consultant/presentation/pages/stepper_become_consultant_screen.dart

@@ -1,13 +1,11 @@
 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';
@@ -23,145 +21,39 @@ import 'package:lottie/lottie.dart';
 class StepperBecomeConsultantScreen extends StatefulWidget {
   final String? slug;
   final bool? isCanceled;
-  final bool isNewRegistration;
-  const StepperBecomeConsultantScreen({
-    super.key,
-    this.slug,
-    this.isCanceled,
-    this.isNewRegistration = false,
-  });
+  const StepperBecomeConsultantScreen({super.key, this.slug, this.isCanceled});
 
   @override
-  State<StepperBecomeConsultantScreen> createState() =>
-      _StepperBecomeConsultantScreenState();
+  State<StepperBecomeConsultantScreen> createState() => _StepperBecomeConsultantScreenState();
 }
 
-class _StepperBecomeConsultantScreenState
-    extends State<StepperBecomeConsultantScreen> {
-  double progressValue = 0;
+class _StepperBecomeConsultantScreenState extends State<StepperBecomeConsultantScreen> {
+  double progressValue = 1 / 6;
   int step = 1;
   final pageController = PageController();
   late final RegisterConsultantCubit registrationConsultantCubit;
   bool isLoading = false;
-  bool _successSheetShown = false;
 
   @override
   void initState() {
     super.initState();
-    if (widget.isNewRegistration || widget.slug == null) {
-      registrationConsultantCubit = sl<RegisterConsultantCubit>()
-        ..disableLoading(slug: widget.slug);
+    if (widget.slug == null) {
+      registrationConsultantCubit = sl<RegisterConsultantCubit>()..disableLoading();
     } 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: BlocConsumer<RegisterConsultantCubit, RegisterConsultantState>(
-        listenWhen: (previous, current) =>
-            previous.awaitingScoringOutcome &&
-            !current.awaitingScoringOutcome &&
-            current.alfaScoringStatus.isComplete,
-        listener: (context, state) {
-          _showSuccessSheet(context);
-        },
+      child: BlocBuilder<RegisterConsultantCubit, RegisterConsultantState>(
         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) {
+          if (state.error != null) {
             return Scaffold(
               appBar: AppBar(
                 centerTitle: true,
@@ -180,320 +72,248 @@ class _StepperBecomeConsultantScreenState
                   textAlign: TextAlign.center,
                   overflow: TextOverflow.ellipsis,
                   softWrap: true,
-                  style: TextStyles.headingXLSemibold.copyWith(
-                    color: appTheme.black,
-                  ),
+                  style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
                 ),
               ),
               body: DataErrorWidget(
-                onReload: () => context
-                    .read<RegisterConsultantCubit>()
-                    .reloadData(widget.slug),
+                onReload: () => context.read<RegisterConsultantCubit>().reloadData(widget.slug),
               ),
             );
           }
-
-          if (progressValue == 0) {
-            progressValue = 1 / totalSteps;
-          }
-
-          final submitDisabled =
-              isLoading ||
-              state.isScoringPolling ||
-              state.scoringRetryInProgress;
-
           return Scaffold(
-            floatingActionButtonLocation:
-                FloatingActionButtonLocation.centerFloat,
-            floatingActionButton: Row(
-              children: [
-                Container(
-                  height: 48,
-                  width: MediaQuery.of(context).size.width * 0.2,
-                  padding: const EdgeInsets.only(left: 16, right: 4),
-                  child: FloatingActionButton.extended(
-                    heroTag: 'backButtonRegistration',
-                    highlightElevation: 0,
-                    focusElevation: 0,
-                    elevation: 0,
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(20),
-                    ),
-                    backgroundColor: const Color(0xFFEAF2FD),
-                    onPressed: () async {
-                      setState(() {
-                        pageController.previousPage(
-                          duration: const Duration(milliseconds: 350),
-                          curve: Curves.easeInOut,
-                        );
-                      });
-                    },
-                    label: Icon(
-                      Icons.arrow_back_ios_new_rounded,
-                      color: appTheme.blueA400,
+              floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
+              floatingActionButton: Row(
+                children: [
+                  Container(
+                    height: 48,
+                    width: MediaQuery.of(context).size.width * 0.2,
+                    padding: const EdgeInsets.only(left: 16, right: 4),
+                    child: FloatingActionButton.extended(
+                      heroTag: 'backButtonRegistration',
+                      highlightElevation: 0,
+                      focusElevation: 0,
+                      elevation: 0,
+                      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+                      backgroundColor: const Color(0xFFEAF2FD),
+                      onPressed: () async {
+                        setState(() {
+                          pageController.previousPage(duration: const Duration(milliseconds: 350), curve: Curves.easeInOut);
+                        });
+                      },
+                      label: Icon(Icons.arrow_back_ios_new_rounded, color: appTheme.blueA400),
                     ),
                   ),
-                ),
-                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(canceledModeration.title),
-                          content: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            mainAxisSize: MainAxisSize.min,
-                            children: [
-                              if (canceledModeration.additional != null)
-                                for (final item
-                                    in canceledModeration.additional!) ...[
-                                  Text('• $item'),
+                  if (widget.isCanceled == true)
+                    InkWell(
+                      onTap: () {
+                        showDialog(
+                          context: context,
+                          builder: (context) => AlertDialog(
+                            title: Text(state.requestModel!.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]}'),
                                 ],
-                            ],
-                          ),
-                          actions: [
-                            TextButton(
-                              onPressed: () => Navigator.pop(context),
-                              child: const Text('OK'),
+                              ],
                             ),
-                          ],
-                        ),
-                      );
-                    },
-                    borderRadius: BorderRadius.circular(20),
-                    child: Ink(
-                      height: 48,
-                      width: MediaQuery.of(context).size.width * 0.6,
-                      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,
+                            actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
+                          ),
+                        );
+                      },
+                      borderRadius: BorderRadius.circular(20),
+                      child: Ink(
+                        height: 48,
+                        width: MediaQuery.of(context).size.width * 0.6,
+                        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),
                           ),
                         ),
                       ),
                     ),
-                  ),
-                Container(
-                  height: 48,
-                  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),
-                  child: FloatingActionButton.extended(
-                    heroTag: 'nextButtonRegistration',
-                    highlightElevation: 0,
-                    elevation: 0,
-                    focusElevation: 0,
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(20),
-                    ),
-                    backgroundColor: submitDisabled
-                        ? Colors.grey
-                        : widget.isCanceled == true && step != totalSteps
-                        ? const Color(0xFFEAF2FD)
-                        : appTheme.blueA400,
-                    onPressed: submitDisabled
-                        ? null
-                        : () async {
-                            if (step == totalSteps) {
-                              if (!state.consultant.hasValidPassportData) {
-                                showDialog(
-                                  context: context,
-                                  builder: (context) => AlertDialog(
-                                    actionsPadding: const EdgeInsets.symmetric(
-                                      horizontal: 4,
-                                    ),
-                                    content: const Text(
-                                      'Заполните паспортные данные',
-                                    ),
-                                    actions: [
-                                      TextButton(
-                                        child: const Text('Ок'),
-                                        onPressed: () =>
-                                            Navigator.of(context).pop(),
+                  Container(
+                    height: 48,
+                    width: widget.isCanceled == true
+                        ? MediaQuery.of(context).size.width * 0.2
+                        : MediaQuery.of(context).size.width * 0.8,
+                    padding: const EdgeInsets.only(left: 4, right: 16),
+                    child: FloatingActionButton.extended(
+                      heroTag: 'nextButtonRegistration',
+                      highlightElevation: 0,
+                      elevation: 0,
+                      focusElevation: 0,
+                      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+                      backgroundColor: isLoading
+                          ? Colors.grey
+                          : widget.isCanceled == true
+                          ? const Color(0xFFEAF2FD)
+                          : appTheme.blueA400,
+                      onPressed: isLoading
+                          ? null
+                          : () async {
+                              if (step == 6) {
+                                if (widget.isCanceled == true) {
+                                  return;
+                                }
+                                if (registrationConsultantCubit.state.acceptOffer) {
+                                  setState(() {
+                                    isLoading = true;
+                                  });
+                                  try {
+                                    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),
+                                                  ),
+                                                ),
+                                              ),
+                                            ),
+                                          ],
+                                        ),
                                       ),
-                                    ],
-                                  ),
-                                );
-                                return;
-                              }
-                              if (registrationConsultantCubit
-                                  .hasAcceptedRequiredAgreements) {
-                                setState(() {
-                                  isLoading = true;
-                                });
-                                try {
-                                  await registrationConsultantCubit
-                                      .registerConsultant();
-                                  if (!context.mounted) return;
-                                  if (registrationConsultantCubit.state.error !=
-                                      null) {
-                                    showDialog(
+                                    );
+                                  } catch (e) {
+                                    if (!context.mounted) return;
+                                    showDialog<void>(
                                       context: context,
                                       builder: (context) => AlertDialog(
-                                        actionsPadding:
-                                            const EdgeInsets.symmetric(
-                                              horizontal: 4,
-                                            ),
-                                        content: Text(
-                                          registrationConsultantCubit
-                                              .state
-                                              .error!,
-                                        ),
+                                        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(),
                                           ),
                                         ],
                                       ),
                                     );
-                                    return;
+                                  } finally {
+                                    setState(() {
+                                      isLoading = false;
+                                    });
                                   }
-                                  // Success sheet is shown by BlocListener when scoring completes.
-                                } catch (e) {
-                                  if (!context.mounted) return;
-                                  showDialog<void>(
+                                } else {
+                                  showDialog(
                                     context: context,
                                     builder: (context) => AlertDialog(
-                                      actionsPadding:
-                                          const EdgeInsets.symmetric(
-                                            horizontal: 4,
-                                          ),
-                                      content: Text(e.toString()),
+                                      actionsPadding: const EdgeInsets.symmetric(horizontal: 4),
+                                      content: const Text('Примите договор публичной офёрты'),
                                       actions: [
                                         TextButton(
                                           child: const Text('Ок'),
-                                          onPressed: () =>
-                                              Navigator.of(context).pop(),
+                                          onPressed: () {
+                                            Navigator.of(context).pop();
+                                          },
                                         ),
                                       ],
                                     ),
                                   );
-                                } finally {
-                                  setState(() {
-                                    isLoading = false;
-                                  });
                                 }
                               } else {
-                                showDialog(
-                                  context: context,
-                                  builder: (context) => AlertDialog(
-                                    actionsPadding: const EdgeInsets.symmetric(
-                                      horizontal: 4,
-                                    ),
-                                    content: Text(
-                                      state.isUpdating
-                                          ? 'Примите договор публичной оферты'
-                                          : 'Примите оферту и согласие ФРДО',
-                                    ),
-                                    actions: [
-                                      TextButton(
-                                        child: const Text('Ок'),
-                                        onPressed: () {
-                                          Navigator.of(context).pop();
-                                        },
-                                      ),
-                                    ],
-                                  ),
-                                );
+                                FocusManager.instance.primaryFocus?.unfocus();
+                                setState(() {
+                                  pageController.nextPage(duration: const Duration(milliseconds: 350), curve: Curves.easeInOut);
+                                });
                               }
-                            } else {
-                              FocusManager.instance.primaryFocus?.unfocus();
-                              setState(() {
-                                pageController.nextPage(
-                                  duration: const Duration(milliseconds: 350),
-                                  curve: Curves.easeInOut,
-                                );
-                              });
-                            }
-                          },
-                    label: submitDisabled && step == totalSteps
-                        ? const CircularProgressIndicator()
-                        : 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,
-                            ),
-                          ),
-                  ),
-                ),
-              ],
-            ),
-            appBar: AppBar(
-              automaticallyImplyLeading: false,
-              leading: Builder(
-                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 из $totalSteps'),
-                ),
-              ],
-              bottom: PreferredSize(
-                preferredSize: Size(MediaQuery.of(context).size.width, 32),
-                child: Padding(
-                  padding: const EdgeInsets.all(16),
-                  child: TweenAnimationBuilder<double>(
-                    duration: const Duration(milliseconds: 350),
-                    curve: Curves.easeInOut,
-                    tween: Tween<double>(
-                      begin: 1 / totalSteps,
-                      end: progressValue,
+                            },
+                      label: isLoading
+                          ? const CircularProgressIndicator()
+                          : widget.isCanceled == true
+                          ? Icon(Icons.arrow_forward_ios_outlined, color: appTheme.blueA400)
+                          : Text('Продолжить', style: theme.textTheme.titleSmall!.copyWith(color: Colors.white)),
                     ),
-                    builder: (context, value, _) => LinearProgressIndicator(
-                      value: value,
-                      borderRadius: BorderRadius.circular(16),
-                      minHeight: 8,
-                      backgroundColor: Colors.grey.shade100,
-                      valueColor: AlwaysStoppedAnimation<Color>(
-                        appTheme.blueA400,
+                  ),
+                ],
+              ),
+              appBar: AppBar(
+                automaticallyImplyLeading: false,
+                leading: Builder(
+                  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'))],
+                bottom: PreferredSize(
+                  preferredSize: Size(MediaQuery.of(context).size.width, 32),
+                  child: Padding(
+                    padding: const EdgeInsets.all(16),
+                    child: TweenAnimationBuilder<double>(
+                      duration: const Duration(milliseconds: 350),
+                      curve: Curves.easeInOut,
+                      tween: Tween<double>(begin: 1 / 6, end: progressValue),
+                      builder: (context, value, _) => LinearProgressIndicator(
+                        value: value,
+                        borderRadius: BorderRadius.circular(16),
+                        minHeight: 8,
+                        backgroundColor: Colors.grey.shade100,
+                        valueColor: AlwaysStoppedAnimation<Color>(appTheme.blueA400),
                       ),
                     ),
                   ),
                 ),
               ),
-            ),
-            body: PageView(
-              physics: const NeverScrollableScrollPhysics(),
-              controller: pageController,
-              onPageChanged: (index) {
-                setState(() {
-                  step = index + 1;
-                  progressValue = step / totalSteps;
-                });
-              },
-              children: _pages(),
-            ),
-          );
+              body: PageView(
+                physics: const NeverScrollableScrollPhysics(),
+                controller: pageController,
+                onPageChanged: (index) {
+                  setState(() {
+                    step = index + 1;
+                    progressValue = step / 6;
+                  });
+                },
+                children: const [
+                  CertificatesAndDiplomasScreen(),
+                  PhotoOrScansScreen(),
+                  AdditionalSettingsScreen(),
+                  SocialNetworksScreen(),
+                  RegistrationAsScreen(),
+                  LastStepScreen(),
+                ],
+              ),
+            );
         },
       ),
     );

lib/features/consultant/become_consultant/presentation/widgets/passport_field_with_error.dart

@@ -1,28 +0,0 @@
-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),
-        ],
-      ],
-    );
-  }
-}

lib/features/consultant/become_consultant/presentation/widgets/passport_section_title.dart

@@ -1,34 +0,0 @@
-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),
-    );
-  }
-}

lib/features/consultant/become_consultant/presentation/widgets/scoring_status_widget.dart

@@ -1,218 +0,0 @@
-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,
-    };
-  }
-}

lib/features/consultant/become_consultant/repositories/consultant_repository.dart

@@ -3,7 +3,6 @@ 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';
 
@@ -12,53 +11,36 @@ 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);
     }
 
@@ -66,24 +48,22 @@ 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);
+
   }
 }

lib/features/consultant/become_consultant/services/consultant_service.dart

@@ -2,7 +2,6 @@ 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';
@@ -11,39 +10,21 @@ part 'consultant_service.g.dart';
 abstract class ConsultantService {
   factory ConsultantService(Dio dio, {String baseUrl}) = _ConsultantService;
 
-  @POST('/api/v2/consultant_request/registration')
-  Future<void> consultantRegistration({
-    @Body() required ConsultantProfileModel consultantModel,
-  });
+  @POST('/api/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});
 
-  /// Свой статус заявки для редактирования/модерации.
-  /// С паспортными полями в `legal_entity_resource`: `/api/v2/consultant_request/{slug}/status`.
-  @GET('/api/v2/consultant_request/{slug}/status')
-  Future<ConsultationRequestModel> getMyRequestStatus({
-    @Path() required String slug,
-  });
+  @GET('/api/consultant_request/{slug}/status')
+  Future<ConsultationRequestModel> getMyRequestStatus({@Path() required String slug});
 
-  @PUT('/api/v2/consultant_request/update')
-  Future<void> consultantUpdate({
-    @Body() required ConsultantProfileModel consultantModel,
-  });
-
-  @GET('/api/finances/sbp_banks')
-  Future<List<SbpBankModel>> getSbpBanks();
+  @PUT('/api/consultant_request/update')
+  Future<void> consultantUpdate({@Body() required ConsultantProfileModel consultantModel});
 
   @GET('/api/v2/consultant_request/cert_photos')
   Future<List<ConsultantCertPhotoModel>> getConsultantCertPhotos();
@@ -51,19 +32,14 @@ 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});

lib/features/consultant/become_consultant/utils/laravel_validation_errors.dart

@@ -1,167 +0,0 @@
-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' => 'Некорректный код подразделения',
-      'birth_date' => 'Некорректная дата рождения',
-      'citizenship' => 'Некорректный код гражданства',
-      'sbp_phone' => 'Некорректный телефон СБП',
-      'title' => 'Слишком короткое название курса',
-      'date' => 'Некорректная дата курса',
-      _ => 'Некорректное значение',
-    };
-  }
-
-  return 'Проверьте поле';
-}

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_embed_url") String? videoEmbedUrl,
+    @JsonKey(name: "video_url_thumb") String? videoUrlThumb,
   }) = _FeedBlogPostModel;
 
   factory FeedBlogPostModel.fromJson(Map<String, Object?> json) => _$FeedBlogPostModelFromJson(json);

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';
+  }
+}

lib/features/feed/models/post_feed_pagination_model.dart

@@ -0,0 +1,93 @@
+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,
+    required String orientation,
+  }) = _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();

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;
     }
   }
 

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();

lib/features/feed/presentation/widgets/blog_post_widget.dart

@@ -1,4 +1,7 @@
+import 'dart:async';
+
 import 'package:cached_network_image/cached_network_image.dart';
+import 'package:carousel_slider_plus/carousel_slider_plus.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 +12,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/feed_video_player/feed_video_player_widget.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 +24,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 +35,427 @@ 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) {
+    context.pushTransparentRoute(rootNavigator: true, PhotoViewScreen(imageUrls: imageUrls, index: index));
+  }
+
+  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 galleryUrls = post.images.map((e) => PostFeedMapper.resolveMediaUrl(e.url)).where((e) => e.isNotEmpty).toList();
+    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(
+              galleryUrls: galleryUrls,
+              imageUrl: imageUrl,
+              videoEmbedUrl: embedUrl != null && embedUrl.isNotEmpty ? embedUrl : null,
+              videoUrlThumb: post.videoUrlThumb,
+              currentGalleryIndex: currentGalleryIndex,
+              onOpenGallery: _openGallery,
+              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 _BlogPostMediaContent extends StatefulWidget {
+  const _BlogPostMediaContent({
+    required this.galleryUrls,
+    required this.imageUrl,
+    required this.videoEmbedUrl,
+    required this.currentGalleryIndex,
+    required this.onOpenGallery,
+    required this.onGalleryChanged,
+    required this.videoUrlThumb,
+  });
+
+  final List<String> galleryUrls;
+  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;
+
+  @override
+  State<_BlogPostMediaContent> createState() => _BlogPostMediaContentState();
+}
+
+class _BlogPostMediaContentState extends State<_BlogPostMediaContent> {
+  static const _counterDisplayDuration = Duration(seconds: 2);
+
+  bool _isCounterVisible = false;
+  Timer? _counterHideTimer;
+
+  @override
+  void dispose() {
+    _counterHideTimer?.cancel();
+    super.dispose();
+  }
+
+  bool _handleCarouselScroll(ScrollNotification notification) {
+    if (notification is ScrollStartNotification || notification is ScrollUpdateNotification) {
+      _counterHideTimer?.cancel();
+      if (!_isCounterVisible) {
+        setState(() => _isCounterVisible = true);
+      }
+    } else if (notification is ScrollEndNotification && _isCounterVisible) {
+      _counterHideTimer?.cancel();
+      _counterHideTimer = Timer(_counterDisplayDuration, () {
+        if (mounted) {
+          setState(() => _isCounterVisible = false);
+        }
+      });
+    }
+    return false;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final mediaContentCount = widget.videoEmbedUrl != null ? widget.galleryUrls.length + 1 : widget.galleryUrls.length;
+    return Column(
+      children: [
+        if (widget.galleryUrls.length > 1) ...[
+          Stack(
+            children: [
+              NotificationListener<ScrollNotification>(
+                onNotification: _handleCarouselScroll,
+                child: CarouselSlider.builder(
+                  itemCount: widget.galleryUrls.length + 1,
+                  itemBuilder: (context, itemIndex, _) {
+                    if (itemIndex == widget.galleryUrls.length) {
+                      if (widget.videoEmbedUrl != null) {
+                        return FeedVideoPlayer(embedUrl: widget.videoEmbedUrl!, videoUrlThumb: widget.videoUrlThumb);
+                      }
+                      return const SizedBox.shrink();
+                    }
+                    final itemUrl = widget.galleryUrls[itemIndex];
+                    return GestureDetector(
+                      onTap: () => widget.onOpenGallery(widget.galleryUrls, itemIndex),
+                      child: CachedNetworkImage(
+                        fit: BoxFit.cover,
+                        width: MediaQuery.of(context).size.width,
+                        imageUrl: itemUrl,
+                        errorWidget: (context, str, object) => const SizedBox.shrink(),
+                      ),
+                    );
+                  },
+                  options: CarouselOptions(
+                    viewportFraction: 1,
+                    height: 260,
+                    enableInfiniteScroll: false,
+                    onPageChanged: (index, _) => widget.onGalleryChanged(index),
+                  ),
+                ),
+              ),
+              Positioned(
+                top: 12,
+                right: 12,
+                child: IgnorePointer(
+                  child: AnimatedOpacity(
+                    opacity: _isCounterVisible ? 1 : 0,
+                    duration: const Duration(milliseconds: 150),
+                    child: _GalleryPhotoCounter(currentIndex: widget.currentGalleryIndex, total: mediaContentCount),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ] else if (widget.galleryUrls.length == 1) ...[
+          GestureDetector(
+            onTap: () => widget.onOpenGallery(widget.galleryUrls, 0),
+            child: CachedNetworkImage(
+              fit: BoxFit.cover,
+              width: MediaQuery.of(context).size.width,
+              height: 260,
+              imageUrl: widget.galleryUrls.first,
+              errorWidget: (context, str, object) => const SizedBox.shrink(),
+            ),
+          ),
+        ] else if (widget.imageUrl.isNotEmpty) ...[
+          GestureDetector(
+            onTap: () => widget.onOpenGallery([widget.imageUrl], 0),
+            child: Hero(
+              tag: widget.imageUrl,
+              child: CachedNetworkImage(
+                fit: BoxFit.fitWidth,
+                width: MediaQuery.of(context).size.width,
+                imageUrl: widget.imageUrl,
+                errorWidget: (context, str, object) => 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),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+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);
+}

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());
           }

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>
+''';
+  }
+}

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
+      })();
+    ''';
+  }
+}

lib/features/feed/presentation/widgets/feed_video_player/feed_video_player_widget.dart

@@ -0,0 +1,213 @@
+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 = SizedBox(
+      height: 220,
+      width: MediaQuery.sizeOf(context).width,
+      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);
+  }
+}

lib/features/feed/presentation/widgets/feed_video_player/feed_video_preview_placeholder.dart

@@ -0,0 +1,63 @@
+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: [
+        if (previewUrl != null && previewUrl!.isNotEmpty)
+          CachedNetworkImage(
+            imageUrl: previewUrl!,
+            fit: BoxFit.cover,
+            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),
+              ),
+            ),
+          ),
+      ],
+    );
+  }
+}

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';

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 {

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,6 +19,12 @@ abstract class FeedService {
   @GET('/api/blogPosts/index')
   Future<FeedBlogPostSettingsModel> getBlogPostList({@Query('page') required int page, @Query('query_search') String? query});
 
+  @GET('/api/feed')
+  Future<PostFeedPaginationModel> getFeed({
+    @Query('search') String? search,
+    @Query('cursor') String? cursor,
+  });
+
   @GET('/api/blogPosts/show/{postId}')
   Future<FeedBlogPostModel> getBlogPost({@Path('postId') required int postId});
 

lib/features/menu/presentation/pages/menu_screen.dart

@@ -2,7 +2,6 @@ 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';
@@ -16,7 +15,6 @@ 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';
@@ -167,13 +165,6 @@ 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) {

lib/features/settings/presentation/pages/settings_screen.dart

@@ -238,10 +238,7 @@ 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',
-            extra: {'slug': state.profile.slug},
-          ),
+          onTap: () => GoRouter.of(context).pushNamed('becomeConsultantScreen'),
           borderRadius: BorderRadius.circular(20),
           child: Ink(
             height: 52,

lib/features/user_details/presentation/widgets/expandable_bouble.dart

@@ -15,20 +15,17 @@ class ExpandableBouble extends StatelessWidget {
       child: MainBackgroundBouble(
         child: Theme(
           data: Theme.of(context).copyWith(dividerColor: Colors.transparent),
-          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,
+          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,
           ),
         ),
       ),

lib/features/video_calls/managers/video_call_manager_snapshot.dart

@@ -1,59 +0,0 @@
-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,
-    );
-  }
-}

lib/features/video_calls/models/video_call_models.dart

@@ -35,14 +35,3 @@ 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);
-}

lib/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart

@@ -1,599 +0,0 @@
-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();
-  }
-}

lib/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart

@@ -1,53 +0,0 @@
-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;
-}

lib/features/video_calls/presentation/pages/video_call_screen.dart

@@ -2,35 +2,24 @@ 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/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/features/video_calls/repositories/video_call_repository.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,
   });
@@ -40,13 +29,7 @@ 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;
 
@@ -55,151 +38,437 @@ class VideoCallScreen extends StatefulWidget {
 }
 
 class _VideoCallScreenState extends State<VideoCallScreen> {
-  static const SystemUiOverlayStyle _videoCallOverlayStyle =
-      SystemUiOverlayStyle(
-        statusBarColor: Colors.transparent,
-        statusBarIconBrightness: Brightness.light,
-        statusBarBrightness: Brightness.dark,
-        systemNavigationBarColor: Colors.transparent,
-        systemNavigationBarIconBrightness: Brightness.light,
-        systemNavigationBarContrastEnforced: false,
-      );
+  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;
 
-  VideoCallSessionCubit get _cubit => sl<VideoCallSessionCubit>();
-  WsManager get _wsManager => sl<WsManager>();
+  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();
 
-  bool _counterpartIsOnline = false;
-  String _counterpartLastSeenText = '';
-  void Function(bool isOnline)? _presenceOnlineListener;
+  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,
+    );
+  }
 
   @override
   void initState() {
     super.initState();
-    _counterpartIsOnline = widget.counterpartIsOnline ?? false;
-    _counterpartLastSeenText = widget.counterpartLastSeenText ?? '';
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (!mounted) return;
-      unawaited(_initCounterpartMetadata());
+    _attachRoomEventListeners();
+    _mutedMicPollTimer = Timer.periodic(_mutedMicPollInterval, (_) {
+      if (!mounted || _liveKitDisposed || _micEnabled || _mutedMicStatsInFlight) return;
+      if (_room.connectionState != lk.ConnectionState.connected) return;
+      _mutedMicStatsInFlight = true;
       unawaited(
-        _cubit.onCallScreenVisible(
-          conversationUuid: widget.conversationUuid,
-          counterpartName: widget.counterpartName,
-          localParticipantName: widget.localParticipantName,
-          counterpartIsConsultant: widget.counterpartIsConsultant,
-          entryMode: widget.entryMode,
-        ),
+        _pollMutedMicFromWebRtcStats().whenComplete(() {
+          _mutedMicStatsInFlight = false;
+        }),
       );
     });
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+      unawaited(_applyVideoCallSystemUi());
+      _scheduleRecordingNoticeOnce();
+    });
+    unawaited(_connectLiveKit());
   }
 
-  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;
-          }
+  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();
         }
-      } catch (_) {}
-    }
+      });
+  }
 
-    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!,
+  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),
     );
   }
 
-  Future<void> _refreshCounterpartOnlineStatus() async {
-    try {
-      final chatRoom = await sl<ChatRepository>().getChatRoom(
-        widget.conversationUuid,
-      );
-      final counterpart = resolveChatCounterpart(
-        users: chatRoom.users,
-        currentUserId: _wsManager.userId,
-      );
+  void _syncPoorConnectionOverlay(lk.ConnectionQuality q) {
+    final bad = q == lk.ConnectionQuality.poor || q == lk.ConnectionQuality.lost;
+    if (bad) {
+      if (_poorConnectionEntry != null) return;
       if (!mounted) return;
-      setState(() {
-        _counterpartIsOnline = counterpart.isOnline;
-        _counterpartLastSeenText = counterpart.lastSeenText;
-      });
+      _poorConnectionEntry = VideoCallTopOverlay.insertBanner(
+        context,
+        message: S.of(context).video_call_poor_connection,
+        backgroundColor: appTheme.strongRed,
+        svgAsset: VideoCallTopOverlay.poorConnectionSvg,
+      );
+    } 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;
+    }
+    _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),
+    );
+  }
+
+  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;
+    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,
+      ]);
+      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();
+      }
+    } 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() {
-    if (_presenceOnlineListener != null) {
-      _wsManager.removePresenceDirectChatListener(_presenceOnlineListener!);
-      _presenceOnlineListener = null;
+    _mutedMicPollTimer?.cancel();
+    final listener = _roomEventsListener;
+    _roomEventsListener = null;
+    if (listener != null) {
+      unawaited(listener.dispose());
     }
-    _cubit.onCallScreenDisposed();
+    final poor = _poorConnectionEntry;
+    _poorConnectionEntry = null;
+    if (poor != null && poor.mounted) {
+      poor.remove();
+    }
+    unawaited(_cleanupLiveKitAndNotifyBackend());
+    unawaited(_restoreSystemUiAfterCall());
     super.dispose();
   }
 
   Future<void> _handleBackToChat() async {
     widget.onBackToChat?.call();
-    await _cubit.leaveCallRoute();
+    await _cleanupLiveKitAndNotifyBackend();
     if (!mounted) return;
     if (context.canPop()) context.pop();
   }
 
   Future<void> _handleHangUp() async {
     widget.onHangUp?.call();
-    await _cubit.endCall();
+    await _cleanupLiveKitAndNotifyBackend();
     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);
@@ -207,202 +476,56 @@ class _VideoCallScreenState extends State<VideoCallScreen> {
     final topInset = viewPadding.top > 0 ? viewPadding.top : 16.0;
     final bottomInset = viewPadding.bottom;
 
-    final controlLabelStyle = TextStyles.textSMedium.copyWith(
-      color: appTheme.whiteA700,
-      height: 20 / 14,
-    );
+    final counterpartFallback = s.video_call_counterpart_default;
+    final controlLabelStyle = TextStyles.textSMedium.copyWith(color: appTheme.whiteA700, height: 20 / 14);
 
-    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()),
-                ),
-              ),
+    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,
             );
-          }
-
-          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() ??
-        '';
-  }
 }

lib/features/video_calls/presentation/widgets/video_call_app_shell.dart

@@ -1,56 +0,0 @@
-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(),
-        );
-      },
-    );
-  }
-}

lib/features/video_calls/presentation/widgets/video_call_banner_overlay.dart

@@ -1,10 +0,0 @@
-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;
-}

lib/features/video_calls/presentation/widgets/video_call_connecting_entrance_screen.dart

@@ -1,352 +0,0 @@
-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();
-  }
-}

lib/features/video_calls/presentation/widgets/video_call_flow_placeholder_screens.dart

@@ -1,305 +0,0 @@
-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,
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/features/video_calls/presentation/widgets/video_call_global_pip_layer.dart

@@ -1,160 +0,0 @@
-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,
-                          ),
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
-              );
-            },
-          ),
-        );
-      },
-    );
-  }
-}

lib/features/video_calls/presentation/widgets/video_call_livekit_track_utils.dart

@@ -8,9 +8,6 @@ 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;
@@ -40,6 +37,4 @@ abstract final class VideoCallLiveKitTrackUtils {
       room.localParticipant?.getTrackPublicationBySource(lk.TrackSource.camera),
     );
   }
-
-  static bool isSoloInRoom(lk.Room room) => room.remoteParticipants.isEmpty;
 }

lib/features/video_calls/presentation/widgets/video_call_name_chips.dart

@@ -2,74 +2,40 @@ 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,
-    this.isConsultant = false,
-  });
+  const VideoCallParticipantNameLabel({super.key, required this.name});
 
   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: 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: 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),
               ),
-              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,
-                  ),
-                ),
+              child: Text(
+                name,
+                style: TextStyles.textMMedium.copyWith(color: appTheme.whiteA700),
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
               ),
             ),
-          ],
+          ),
         ),
       ),
     );

lib/features/video_calls/presentation/widgets/video_call_pip_video_preview.dart

@@ -1,73 +0,0 @@
-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);
-  }
-}

lib/features/video_calls/presentation/widgets/video_call_remote_video_stage.dart

@@ -2,7 +2,6 @@ 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;
 
@@ -11,34 +10,25 @@ 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: videoCallRoomTracksListenable(room),
+      listenable: room,
       builder: (context, _) {
         final remote = VideoCallLiveKitTrackUtils.remoteCameraVideoTrack(room);
         if (remote != null) {
-          return lk.VideoTrackRenderer(
-            remote,
-            key: ValueKey(remote.sid),
-            fit: lk.VideoViewFit.cover,
-          );
+          return lk.VideoTrackRenderer(remote, fit: lk.VideoViewFit.cover);
         }
-        final showConnectError =
-            connectError != null &&
-            room.connectionState != lk.ConnectionState.connected;
         return Stack(
           fit: StackFit.expand,
           children: [
-            VideoCallNoVideoBackground(logoSize: noVideoLogoSize),
-            if (showConnectError)
+            const VideoCallNoVideoBackground(),
+            if (connectError != null)
               Center(
                 child: Padding(
                   padding: const EdgeInsets.all(24),

lib/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart

@@ -1,11 +0,0 @@
-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!,
-  ]);
-}

lib/features/video_calls/presentation/widgets/video_call_stage_layout.dart

@@ -5,7 +5,6 @@ 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;
@@ -25,7 +24,6 @@ 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,
@@ -50,7 +48,6 @@ 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;
@@ -86,8 +83,6 @@ 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;
@@ -95,6 +90,13 @@ 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(
@@ -108,17 +110,15 @@ class _VideoCallStageLayoutState extends State<VideoCallStageLayout> {
   }
 
   Widget _buildSplitLayout(BoxConstraints constraints) {
-    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),
+    return Stack(
+      fit: StackFit.expand,
+      children: [
+        Positioned.fill(
+          child: Padding(
+            padding: EdgeInsets.fromLTRB(_edgeInset, widget.topInset + _edgeInset, _edgeInset, _edgeInset),
+            child: Column(
+              children: [
+                Expanded(
                   child: _SplitParticipantPane(
                     room: widget.room,
                     displayName: widget.localDisplayName,
@@ -128,73 +128,40 @@ class _VideoCallStageLayoutState extends State<VideoCallStageLayout> {
                     useFrontCamera: widget.useFrontCamera,
                     onExpand: widget.onExpandLocal,
                     onSwitchCamera: widget.onSwitchCamera,
-                    borderRadius: BorderRadius.circular(_mainStageCornerRadius),
+                    borderRadius: const BorderRadius.only(
+                      topLeft: Radius.circular(_mainStageCornerRadius),
+                      topRight: Radius.circular(_mainStageCornerRadius),
+                      bottomLeft: Radius.zero,
+                      bottomRight: Radius.zero,
+                    ),
                   ),
                 ),
-              ),
-              ..._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(
+                  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),
                     ),
-                    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(),
+      ],
     );
   }
 
@@ -209,106 +176,99 @@ 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 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,
-                      ),
-                    ],
+    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,
+                          ),
                   ),
                 ),
               ),
-            ),
-            ..._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,
-                            ),
-                    ),
-                  ),
-                ),
-              ),
-          ],
-        );
-      },
+            );
+          },
+        ),
+      ],
     );
   }
 
@@ -372,7 +332,6 @@ class _SplitParticipantPane extends StatelessWidget {
   const _SplitParticipantPane({
     required this.room,
     required this.displayName,
-    this.isConsultant = false,
     required this.isLocal,
     required this.connectError,
     required this.videoEnabled,
@@ -384,7 +343,6 @@ class _SplitParticipantPane extends StatelessWidget {
 
   final lk.Room room;
   final String displayName;
-  final bool isConsultant;
   final bool isLocal;
   final String? connectError;
   final bool videoEnabled;
@@ -404,7 +362,7 @@ class _SplitParticipantPane extends StatelessWidget {
         children: [
           Positioned.fill(
             child: ListenableBuilder(
-              listenable: videoCallRoomTracksListenable(room),
+              listenable: room,
               builder: (context, _) {
                 if (isLocal) {
                   if (!videoEnabled) {
@@ -413,12 +371,7 @@ class _SplitParticipantPane extends StatelessWidget {
                   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,
-                      ),
+                      child: lk.VideoTrackRenderer(local, fit: lk.VideoViewFit.cover, mirrorMode: lk.VideoViewMirrorMode.auto),
                     );
                   }
                   return const VideoCallNoVideoBackground();
@@ -427,10 +380,7 @@ class _SplitParticipantPane extends StatelessWidget {
               },
             ),
           ),
-          VideoCallParticipantNameLabel(
-            name: displayName,
-            isConsultant: !isLocal && isConsultant,
-          ),
+          VideoCallParticipantNameLabel(name: displayName),
           Positioned(
             left: 0,
             top: _VideoCallStageLayoutState._splitExpandButtonTop,
@@ -471,7 +421,7 @@ class _VideoCallMainStage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ListenableBuilder(
-      listenable: videoCallRoomTracksListenable(room),
+      listenable: room,
       builder: (context, _) {
         if (mainShowsLocal) {
           if (!videoEnabled) {
@@ -480,12 +430,7 @@ class _VideoCallMainStage extends StatelessWidget {
           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,
-              ),
+              child: lk.VideoTrackRenderer(local, fit: lk.VideoViewFit.cover, mirrorMode: lk.VideoViewMirrorMode.auto),
             );
           }
           return const VideoCallNoVideoBackground();
@@ -503,13 +448,7 @@ class _VideoCallPipRemoteContent extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return IgnorePointer(
-      child: VideoCallRemoteVideoStage(
-        room: room,
-        connectError: null,
-        noVideoLogoSize: 56,
-      ),
-    );
+    return IgnorePointer(child: VideoCallRemoteVideoStage(room: room, connectError: null));
   }
 }
 
@@ -531,12 +470,7 @@ class _VideoCallPipLocalContent extends StatelessWidget {
           const VideoCallNoVideoBackground(logoSize: 56)
         else if (local != null)
           IgnorePointer(
-            child: lk.VideoTrackRenderer(
-              local,
-              key: ValueKey(local.sid),
-              fit: lk.VideoViewFit.cover,
-              mirrorMode: lk.VideoViewMirrorMode.auto,
-            ),
+            child: lk.VideoTrackRenderer(local, fit: lk.VideoViewFit.cover, mirrorMode: lk.VideoViewMirrorMode.auto),
           )
         else
           const VideoCallNoVideoBackground(logoSize: 56),

lib/features/video_calls/presentation/widgets/video_call_system_pip_content.dart

@@ -1,66 +0,0 @@
-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,
-            ),
-          ),
-        );
-      },
-    );
-  }
-}

lib/features/video_calls/presentation/widgets/video_call_system_pip_listener.dart

@@ -1,117 +0,0 @@
-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();
-}