Merge pull request 'feat(vidoe_calls)' (#983) from misha/eatvio_app:issue-975 into main

Reviewed-on: eatvio/eatvio_app#983

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

@@ -8,15 +8,19 @@ jobs:
   build:
     runs-on: [macos-arm64]
     steps:
+      - name: Fastlane version
+        run: fastlane --version
+
       - name: Checkout
         uses: https://github.com/actions/checkout@v2
 
       - name: Checkout env repository
-        uses: https://github.com/actions/checkout@v2
+        uses: https://github.com/actions/checkout@v3
         with:
-          repository: mso7nueh/eatvio_app_env
+          repository: eatvio/eatvio_app_env
           path: env_repo
-          token: ${{ vars.MSO7NUEH_TOKEN }}
+          # Здесь может быть токен любого юзера с доступом в gitea
+          token: ${{ vars.READ_USER_GITEA_TOKEN }}
           ref: main
 
       - name: Copy .env file
@@ -54,23 +58,20 @@ jobs:
 
       - name: Flutter build
         run: |
-          flutter upgrade
+          flutter --version
           flutter clean
           flutter pub get
-          flutter pub upgrade
           flutter pub run build_runner build --delete-conflicting-outputs
-          # Configure Flutter for release mode
-          pod repo update
           flutter build ios --config-only --release
           cd ios
-          pod update
+          pod install
           fastlane beta
         env:
           LANG: en_US.UTF-8
           LC_ALL: en_US.UTF-8
           MATCH_PASSWORD: ${{ vars.IOS_RUNNER_CI_PASSWORD }}
           FASTLANE_PASSWORD: ${{ vars.FASTLANE_PASSWORD }}
-          MATCH_GIT_URL: http://gitea.office.local:3000/mso7nueh/fastlane
+          MATCH_GIT_URL: http://eatvio:${{ vars.READ_USER_GITEA_TOKEN }}@gitea.office.local:3000/eatvio/fastlane.git
           FASTLANE_USER: eatvio2023@icloud.com
           FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ vars.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}
           API_APPSTORE_KEY: ${{ vars.API_APPSTORE_KEY }}

.gitea/workflows/test.yml

@@ -1,6 +1,9 @@
 name: Eatvio App Android Test
 
-on: [pull_request]
+on:
+  pull_request:
+    branches:
+      - main
 
 env:
   flutter_version: '3.41.2'
@@ -152,9 +155,10 @@ jobs:
 
       - name: Get dependencies
         run: |
-          flutter clean
-          flutter pub get
-          dart run build_runner build --delete-conflicting-outputs
+            flutter clean
+            flutter pub cache repair
+            flutter pub get
+            dart run build_runner build --delete-conflicting-outputs
 
       - name: Native Analyze
         run: flutter analyze
@@ -162,66 +166,66 @@ jobs:
       - name: Test
         run: flutter test --coverage
 
-      - name: Test coverage
-        run: |
-          echo "📊 Analyzing test coverage..."
-          echo ""
-          awk -F: '
-            /^SF:/ {
-              file = $0
-              sub(/^SF:/, "", file)
-              sub(/^[[:space:]]+/, "", file)
-              is_generated = 0
-              if (file ~ /\.(g|freezed|gr|mocks)\.dart$/) {
-                is_generated = 1
-                generated_files++
-              } else if (file ~ /\/(build|\.dart_tool)\//) {
-                is_generated = 1
-                generated_files++
-              } else {
-                source_files++
-              }
-            }
-            /^LF:/ {
-              if (!is_generated) {
-                total += $2
-              } else {
-                generated_lines += $2
-              }
-            }
-            /^LH:/ {
-              if (!is_generated) {
-                covered += $2
-              } else {
-                generated_covered += $2
-              }
-            }
-            END {
-              print "📁 Files:"
-              printf "   Source files:    %d\n", source_files
-              printf "   Generated files: %d (excluded)\n", generated_files
-              print ""
-              print "📝 Lines:"
-              printf "   Total lines:     %d\n", total
-              printf "   Covered lines:   %d\n", covered
-              printf "   Uncovered lines: %d\n", total - covered
-              print ""
-              if (total == 0) {
-                print "⚠️  Coverage: 0%"
-                exit 1
-              } else {
-                percentage = (covered / total) * 100
-                printf "✅ Coverage: %.2f%%\n", percentage
-                print ""
-                if (percentage < 70) {
-                  printf "❌ FAIL: Coverage is below 70%%\n"
-                  exit 1
-                } else {
-                  printf "💚 Excellent: Coverage is above 70%%\n"
-                }
-              }
-            }
-          ' coverage/lcov.info
+      # - name: Test coverage
+      #   run: |
+      #     echo "📊 Analyzing test coverage..."
+      #     echo ""
+      #     awk -F: '
+      #       /^SF:/ {
+      #         file = $0
+      #         sub(/^SF:/, "", file)
+      #         sub(/^[[:space:]]+/, "", file)
+      #         is_generated = 0
+      #         if (file ~ /\.(g|freezed|gr|mocks)\.dart$/) {
+      #           is_generated = 1
+      #           generated_files++
+      #         } else if (file ~ /\/(build|\.dart_tool)\//) {
+      #           is_generated = 1
+      #           generated_files++
+      #         } else {
+      #           source_files++
+      #         }
+      #       }
+      #       /^LF:/ {
+      #         if (!is_generated) {
+      #           total += $2
+      #         } else {
+      #           generated_lines += $2
+      #         }
+      #       }
+      #       /^LH:/ {
+      #         if (!is_generated) {
+      #           covered += $2
+      #         } else {
+      #           generated_covered += $2
+      #         }
+      #       }
+      #       END {
+      #         print "📁 Files:"
+      #         printf "   Source files:    %d\n", source_files
+      #         printf "   Generated files: %d (excluded)\n", generated_files
+      #         print ""
+      #         print "📝 Lines:"
+      #         printf "   Total lines:     %d\n", total
+      #         printf "   Covered lines:   %d\n", covered
+      #         printf "   Uncovered lines: %d\n", total - covered
+      #         print ""
+      #         if (total == 0) {
+      #           print "⚠️  Coverage: 0%"
+      #           exit 1
+      #         } else {
+      #           percentage = (covered / total) * 100
+      #           printf "✅ Coverage: %.2f%%\n", percentage
+      #           print ""
+      #           if (percentage < 70) {
+      #             printf "❌ FAIL: Coverage is below 70%%\n"
+      #             exit 1
+      #           } else {
+      #             printf "💚 Excellent: Coverage is above 70%%\n"
+      #           }
+      #         }
+      #       }
+      #     ' coverage/lcov.info
 
       - name: Build apk
         run: |

Makefile

@@ -10,4 +10,4 @@ build-generated-files:
 	dart run build_runner build --delete-conflicting-outputs
 
 clean-coverage:
-	@./scripts/remove_generated_from_coverage.sh
+	@./scripts/remove_generated_from_coverage.sh

android/app/build.gradle

@@ -69,6 +69,8 @@ android {
 }
 
 dependencies {
+    implementation platform('com.google.firebase:firebase-bom:34.4.0')
+    implementation 'com.google.firebase:firebase-messaging'
     implementation 'com.huawei.agconnect:agconnect-core:1.9.5.300'
     implementation 'com.huawei.hms:push:6.13.0.301'
     // Huawei Analytics dependency to satisfy com.huawei.hianalytics.* references during R8

android/app/proguard-rules.pro

@@ -4,6 +4,12 @@
 -keep class org.bouncycastle.** { *; }
 -dontwarn org.bouncycastle.**
 
+-keep class com.hiennv.flutter_callkit_incoming.** { *; }
+-dontwarn com.hiennv.flutter_callkit_incoming.**
+
+-keep class com.pravera.flutter_foreground_task.** { *; }
+-dontwarn com.pravera.flutter_foreground_task.**
+
 -keep class io.flutter.** { *; }
 -dontwarn io.flutter.**
 

android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,13 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
@@ -11,6 +17,16 @@
         android:usesCleartextTraffic="true"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+        <service
+            android:name=".EatvioFcmMessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+        <service
+            android:name="io.flutter.plugins.firebase.messaging.FlutterFirebaseMessagingService"
+            tools:node="remove" />
         <service
             android:name=".HmsPushService"
             android:exported="false">
@@ -31,7 +47,7 @@
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
-            android:taskAffinity=""
+            android:supportsPictureInPicture="true"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
@@ -75,6 +91,68 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+
+        <!-- Tap on notification body opens CallkitIncomingActivity via PendingIntent.
+             Replace it with a bridge that routes to the same accept flow as Answer. -->
+        <activity
+            android:name="com.hiennv.flutter_callkit_incoming.CallkitIncomingActivity"
+            tools:node="remove" />
+
+        <activity
+            android:name=".EatvioCallkitIncomingBridgeActivity"
+            android:exported="false"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:turnScreenOn="true"
+            android:launchMode="singleTop"
+            android:configChanges="orientation" />
+
+        <activity-alias
+            android:name="com.hiennv.flutter_callkit_incoming.CallkitIncomingActivity"
+            android:targetActivity=".EatvioCallkitIncomingBridgeActivity"
+            android:exported="true"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:turnScreenOn="true"
+            android:launchMode="singleTop"
+            android:configChanges="orientation"
+            android:permission="${applicationId}.PERMISSION_CALL">
+            <intent-filter>
+                <action android:name="${applicationId}.com.hiennv.flutter_callkit_incoming.ACTION_CALL_INCOMING" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity-alias>
+
+        <activity
+            android:name="com.hiennv.flutter_callkit_incoming.TransparentActivity"
+            tools:node="remove" />
+
+        <activity
+            android:name=".EatvioCallkitTransparentBridgeActivity"
+            android:exported="false"
+            android:theme="@style/TranslucentTheme"
+            android:showWhenLocked="true"
+            android:turnScreenOn="true"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:launchMode="singleTop" />
+
+        <activity-alias
+            android:name="com.hiennv.flutter_callkit_incoming.TransparentActivity"
+            android:targetActivity=".EatvioCallkitTransparentBridgeActivity"
+            android:exported="false"
+            android:theme="@style/TranslucentTheme"
+            android:showWhenLocked="true"
+            android:turnScreenOn="true"
+            android:excludeFromRecents="true"
+            android:noHistory="true"
+            android:launchMode="singleTop" />
+        <service
+            android:name="com.pravera.flutter_foreground_task.service.ForegroundService"
+            android:foregroundServiceType="microphone"
+            android:exported="false"
+            android:stopWithTask="true" />
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
@@ -86,5 +164,168 @@
             <action android:name="android.intent.action.PROCESS_TEXT"/>
             <data android:mimeType="text/plain"/>
         </intent>
+        <!-- SBP bank packages for СБП payment detection -->
+        <package android:name="ru.sberbankmobile" />
+        <package android:name="com.idamob.tinkoff.android" />
+        <package android:name="ru.vtb24.mobilebanking.android" />
+        <package android:name="ru.alfabank.mobile.android" />
+        <package android:name="ru.raiffeisennews" />
+        <package android:name="com.openbank" />
+        <package android:name="ru.gazprombank.android.mobilebank.app" />
+        <package android:name="com.logo.mbanking" />
+        <package android:name="ru.sovcomcard.halva.v1" />
+        <package android:name="ru.rosbank.android" />
+        <package android:name="ru.rshb.dbo" />
+        <package android:name="ru.mkb.mobile" />
+        <package android:name="ru.ucb.android" />
+        <package android:name="ru.unicredit.android" />
+        <package android:name="ru.skbbank.ib" />
+        <package android:name="ru.gebank.ib" />
+        <package android:name="ru.avangard.sbpent" />
+        <package android:name="ru.elplat.elplat2" />
+        <package android:name="com.bifit.rncbbeta" />
+        <package android:name="ru.ftc.faktura.expobank" />
+        <package android:name="com.bssys.vbrrretail" />
+        <package android:name="ru.wildberries.razz" />
+        <package android:name="ru.artsofte.russiafl" />
+        <package android:name="ru.ftc.faktura.multibank" />
+        <package android:name="ru.bank_hlynov.xbank" />
+        <package android:name="ru.ftc.faktura.vesta" />
+        <package android:name="com.isimplelab.ibank.solidarnost" />
+        <package android:name="com.bssys.roscapretail" />
+        <package android:name="ru.ftc.faktura.kbhmb" />
+        <package android:name="ru.mts.money" />
+        <package android:name="ru.ftc.faktura.pskb" />
+        <package android:name="ru.ftc.faktura.nskbl" />
+        <package android:name="ru.akbars.mobile" />
+        <package android:name="ru.ftc.faktura.rostfinance" />
+        <package android:name="ru.ilb.bbmobile" />
+        <package android:name="ru.mcbankrus.MCBankRus" />
+        <package android:name="ru.albank.online.aebit" />
+        <package android:name="com.bifit.mobile.citizen.icbru" />
+        <package android:name="ru.ftc.faktura.orbank" />
+        <package android:name="ru.ftc.faktura.agropromkredit" />
+        <package android:name="com.energobank.digital" />
+        <package android:name="com.bifit.mobile.citizen.kbnk" />
+        <package android:name="ru.ftc.faktura.sdm" />
+        <package android:name="com.bifit.mobile.citizen.mbb" />
+        <package android:name="ru.ftc.faktura.absolutbank" />
+        <package android:name="ru.ftc.faktura.akcept" />
+        <package android:name="ru.faktura.etbank.person" />
+        <package android:name="ru.ftc.faktura.razvitiestolica" />
+        <package android:name="ru.ftc.faktura.resokreditbank" />
+        <package android:name="ru.yoo.money" />
+        <package android:name="ru.bspb" />
+        <package android:name="com.isimplelab.ibank.kubankredit" />
+        <package android:name="com.tochka.bank" />
+        <package android:name="com.bssys.novikomretail" />
+        <package android:name="ru.rosdorbank.physical" />
+        <package android:name="ru.ftc.faktura.primsoc" />
+        <package android:name="ru.ftc.faktura.banksaratov" />
+        <package android:name="ru.ftc.faktura.tavrich" />
+        <package android:name="com.bifit.mobile.citizen.thbank" />
+        <package android:name="ru.ftc.faktura.kremlevskiy" />
+        <package android:name="ru.ftc.faktura.tkbbank" />
+        <package android:name="ru.chelyabinvestbank.investpay" />
+        <package android:name="ru.ftc.faktura.derzhava" />
+        <package android:name="ru.nbd.android" />
+        <package android:name="ru.sngb.dbo.client.android" />
+        <package android:name="ru.ftc.faktura.united" />
+        <package android:name="ru.ftc.faktura.venetsbank" />
+        <package android:name="ru.letobank.Prometheus" />
+        <package android:name="ru.simpls.brs2.mobbank" />
+        <package android:name="com.bifit.dvbank" />
+        <package android:name="ru.ftc.faktura.intesabank" />
+        <package android:name="com.mmonline.mobile" />
+        <package android:name="cb.ibank.vuz" />
+        <package android:name="ru.uralprombank.mobilebanknew.googleplay" />
+        <package android:name="ru.ftc.faktura.nsbank" />
+        <package android:name="ru.emb.android" />
+        <package android:name="ru.ftc.faktura.maritimebank" />
+        <package android:name="com.credituralbank.CUBmobilenew" />
+        <package android:name="com.isimplelab.isimpleceo.uglemet" />
+        <package android:name="com.bssys.stroylesretail" />
+        <package android:name="ru.ftc.faktura.iturup" />
+        <package android:name="ru.ftc.faktura.finbank" />
+        <package android:name="ru.faktura.gaztransbank.person" />
+        <package android:name="com.isimplelab.ibank.chelind" />
+        <package android:name="ru.ftc.faktura.nokss" />
+        <package android:name="ru.ftc.faktura.vlbb" />
+        <package android:name="ru.ftc.faktura.kbb" />
+        <package android:name="ru.faktura.avtograd.person" />
+        <package android:name="ru.ftc.faktura.forshtadt" />
+        <package android:name="ru.ftc.faktura.solidbank" />
+        <package android:name="ru.ftc.faktura.alexbank" />
+        <package android:name="ru.ftc.faktura.akibank" />
+        <package android:name="ru.ftc.faktura.nipbank" />
+        <package android:name="ru.ftc.faktura.alefbank" />
+        <package android:name="com.bifit.vfbank" />
+        <package android:name="com.bssys.uralfdretail" />
+        <package android:name="com.snb.online" />
+        <package android:name="com.bifit.mobile.citizen.okbank" />
+        <package android:name="com.tatsotsbank.dbomobile" />
+        <package android:name="ru.vtkbank.android" />
+        <package android:name="ru.faktura.jtbank.person" />
+        <package android:name="ru.ftc.faktura.ns" />
+        <package android:name="ru.ftc.faktura.zemskybank" />
+        <package android:name="com.bssys.aversretail" />
+        <package android:name="ru.rusnarbank.correqts.retail" />
+        <package android:name="ru.ftc.faktura.baikalinvestbank" />
+        <package android:name="ru.sbi.android" />
+        <package android:name="com.metkombank.mobile" />
+        <package android:name="com.isimplelab.ionic.kazan.fl" />
+        <package android:name="com.intervale.sbpas" />
+        <package android:name="com.bifit.mobile.citizen.zarech" />
+        <package android:name="ru.centrinvest.mobilebanking2018" />
+        <package android:name="com.mifors.izhcombank" />
+        <package android:name="com.bifit.pmobile.isbank" />
+        <package android:name="ru.zenit.android" />
+        <package android:name="ru.briginvest.sense" />
+        <package android:name="com.bifit.mobile.citizen.cfb" />
+        <package android:name="com.isimplelab.ionic.gorbank.prod" />
+        <package android:name="ru.ftc.faktura.moscombank" />
+        <package android:name="com.timerbank.retail" />
+        <package android:name="com.mob.android" />
+        <package android:name="com.citibank.mobile.ru" />
+        <package android:name="com.bifit.atbbank" />
+        <package android:name="ru.mw" />
+        <package android:name="ru.bankuralsib.mb.android" />
+        <package android:name="com.banksoyuz.artsofte" />
+        <package android:name="ru.rubank.ubsmobile" />
+        <package android:name="cb.ibank" />
+        <package android:name="ru.ipb.ubsmobile" />
+        <package android:name="com.openwaygroup.ic.panda.poidem" />
+        <package android:name="com.bifit.mobile.citizen.tenderbank" />
+        <package android:name="ru.otpbank.mobile" />
+        <package android:name="ru.krk.ubsmobile" />
+        <package android:name="ru.homecredit.mycredit" />
+        <package android:name="cz.bsc.rc" />
+        <package android:name="com.bifit.mobile.citizen.belsocbank" />
+        <package android:name="com.hicebank.android" />
+        <package android:name="com.bpc.crossplatform_trading.bpc_trading" />
+        <package android:name="com.bifit.nrb" />
+        <package android:name="com.bifit.mobile.citizen.moskb" />
+        <package android:name="ru.isfront.android.kt" />
+        <package android:name="ru.ftc.faktura.novobank" />
+        <package android:name="com.smp.android" />
+        <package android:name="com.bifit.mobile.citizen.nkbank" />
+        <package android:name="com.isimplelab.ibank.toyota" />
+        <package android:name="com.bifit.mobile.private.bbr" />
+        <package android:name="ru.ftc.faktura.lanta" />
+        <package android:name="com.yandex.bank" />
+        <package android:name="ru.ftc.faktura.bgfbank" />
+        <package android:name="com.idamobile.android.LockoBank" />
+        <package android:name="com.bifit.mobile.citizen.MCBank" />
+        <package android:name="com.cetelem.cetelem_android" />
+        <package android:name="com.bssys.gutaretail" />
+        <package android:name="ru.ftc.faktura.siab" />
+        <package android:name="com.isimplelab.ionic.round.prod" />
+        <package android:name="com.priobank.prio" />
+        <package android:name="com.inbank.mobilebank" />
+        <package android:name="com.isimplelab.isimplemobile.payjet" />
+        <package android:name="ru.ftc.faktura.agroros" />
+        <package android:name="com.bifit.mobile.citizen.invb" />
+        <package android:name="com.compassplus.mobicash.customer" />
+        <package android:name="ru.finambank.app" />
     </queries>
 </manifest>

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

@@ -0,0 +1,53 @@
+package com.eatvioapp.app
+
+import android.content.Intent
+import android.os.Bundle
+import com.hiennv.flutter_callkit_incoming.CallkitConstants
+import com.hiennv.flutter_callkit_incoming.FlutterCallkitIncomingPlugin
+
+object CallKitAcceptIntentMapper {
+    fun payloadFromBundle(data: Bundle, action: String): Map<String, Any?>? {
+        if (!action.contains(CallkitConstants.ACTION_CALL_ACCEPT) &&
+            !action.contains(CallkitConstants.ACTION_CALL_CALLBACK)
+        ) {
+            return null
+        }
+
+        return hashMapOf(
+            "action" to action,
+            "id" to data.getString(CallkitConstants.EXTRA_CALLKIT_ID, ""),
+            "handle" to data.getString(CallkitConstants.EXTRA_CALLKIT_HANDLE, ""),
+            "nameCaller" to data.getString(CallkitConstants.EXTRA_CALLKIT_NAME_CALLER, ""),
+            "avatar" to data.getString(CallkitConstants.EXTRA_CALLKIT_AVATAR, ""),
+            "extra" to data.getSerializable(CallkitConstants.EXTRA_CALLKIT_EXTRA),
+        )
+    }
+
+    fun payloadFromIntent(intent: Intent?): Map<String, Any?>? {
+        if (intent == null) return null
+
+        val data = intent.getBundleExtra(FlutterCallkitIncomingPlugin.EXTRA_CALLKIT_CALL_DATA)
+            ?: return null
+        val action = intent.action ?: return null
+        if (!action.contains(CallkitConstants.ACTION_CALL_ACCEPT) &&
+            !action.contains(CallkitConstants.ACTION_CALL_CALLBACK)
+        ) {
+            return null
+        }
+
+        return hashMapOf(
+            "action" to action,
+            "id" to data.getString(CallkitConstants.EXTRA_CALLKIT_ID, ""),
+            "handle" to data.getString(CallkitConstants.EXTRA_CALLKIT_HANDLE, ""),
+            "nameCaller" to data.getString(CallkitConstants.EXTRA_CALLKIT_NAME_CALLER, ""),
+            "avatar" to data.getString(CallkitConstants.EXTRA_CALLKIT_AVATAR, ""),
+            "extra" to data.getSerializable(CallkitConstants.EXTRA_CALLKIT_EXTRA),
+        )
+    }
+
+    fun clearCallKitLaunchIntent(intent: Intent?) {
+        if (intent == null) return
+        intent.removeExtra(FlutterCallkitIncomingPlugin.EXTRA_CALLKIT_CALL_DATA)
+        intent.action = null
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.eatvioapp.app
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import com.hiennv.flutter_callkit_incoming.AppUtils
+import com.hiennv.flutter_callkit_incoming.CallkitIncomingBroadcastReceiver
+
+object CallKitIntentBridge {
+    fun dispatchCallKitAction(context: Context, action: String, data: Bundle?) {
+        if (data != null) {
+            CallKitAcceptIntentMapper.payloadFromBundle(data, action)?.let { payload ->
+                PendingCallKitAcceptBridge.store(payload)
+            }
+        }
+
+        val broadcastIntent = CallkitIncomingBroadcastReceiver.getIntent(context, action, data)
+        broadcastIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND)
+        context.sendBroadcast(broadcastIntent)
+
+        val shouldLaunchMainActivity =
+            action == com.hiennv.flutter_callkit_incoming.CallkitConstants.ACTION_CALL_ACCEPT ||
+                action == com.hiennv.flutter_callkit_incoming.CallkitConstants.ACTION_CALL_CALLBACK ||
+                !MainActivity.isInForeground
+
+        if (!shouldLaunchMainActivity) {
+            return
+        }
+
+        val activityIntent = AppUtils.getAppIntent(context, action, data) ?: return
+        activityIntent.addFlags(
+            Intent.FLAG_ACTIVITY_NEW_TASK or
+                Intent.FLAG_ACTIVITY_SINGLE_TOP or
+                Intent.FLAG_ACTIVITY_REORDER_TO_FRONT,
+        )
+        context.startActivity(activityIntent)
+    }
+}

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

@@ -0,0 +1,29 @@
+package com.eatvioapp.app
+
+import android.app.Activity
+import android.os.Bundle
+import com.hiennv.flutter_callkit_incoming.CallkitConstants
+
+/// Redirects notification body / full-screen intent taps to the same accept path as
+/// the Answer button, instead of showing the native Callkit incoming UI.
+class EatvioCallkitIncomingBridgeActivity : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val data = intent.extras?.getBundle(CallkitConstants.EXTRA_CALLKIT_INCOMING_DATA)
+        if (data == null) {
+            finish()
+            return
+        }
+
+        CallKitIntentBridge.dispatchCallKitAction(
+            this,
+            CallkitConstants.ACTION_CALL_ACCEPT,
+            data,
+        )
+
+        finish()
+        @Suppress("DEPRECATION")
+        overridePendingTransition(0, 0)
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.eatvioapp.app
+
+import android.app.Activity
+import android.os.Bundle
+
+/// Replaces plugin TransparentActivity: forwards CallKit actions without relaunching
+/// MainActivity when the Flutter app is already in the foreground.
+class EatvioCallkitTransparentBridgeActivity : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val action = intent.action
+        if (action.isNullOrBlank()) {
+            finish()
+            return
+        }
+
+        val data = intent.getBundleExtra("data")
+        CallKitIntentBridge.dispatchCallKitAction(this, action, data)
+
+        finish()
+        @Suppress("DEPRECATION")
+        overridePendingTransition(0, 0)
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.eatvioapp.app
+
+import android.util.Log
+import com.google.firebase.messaging.FirebaseMessagingService
+import com.google.firebase.messaging.RemoteMessage
+import io.flutter.plugins.firebase.messaging.FlutterFirebaseTokenLiveData
+
+class EatvioFcmMessagingService : FirebaseMessagingService() {
+    override fun onNewToken(token: String) {
+        super.onNewToken(token)
+        FlutterFirebaseTokenLiveData.getInstance().postToken(token)
+        Log.i(TAG, "onNewToken")
+    }
+
+    override fun onMessageReceived(message: RemoteMessage) {
+        Log.i(TAG, "onMessageReceived: ${message.data}")
+
+        if (VideoCallPushBridge.isEndedVideoCall(message.data)) {
+            VideoCallPushBridge.dismissAllIncomingCalls(this)
+            return
+        }
+
+        if (!VideoCallPushBridge.isIncomingVideoCall(message.data)) {
+            return
+        }
+
+        if (MainActivity.isInForeground) {
+            Log.i(TAG, "App in foreground, deferring incoming call to Flutter handler")
+            return
+        }
+
+        VideoCallPushBridge.showIncomingCall(this, message.data)
+    }
+
+    companion object {
+        private const val TAG = "EatvioFCM"
+    }
+}

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

@@ -20,17 +20,23 @@ class HmsPushService : HmsMessageService() {
 
         if (message == null) return
 
-        // Берём action_url из data-поля, если оно есть.
-        val actionUrl = message.dataOfMap["action_url"]
+        if (VideoCallPushBridge.isEndedVideoCall(message.dataOfMap)) {
+            VideoCallPushBridge.dismissAllIncomingCalls(this)
+            return
+        }
 
-        // Строим системное уведомление, по тапу по которому откроется MainActivity с action_url.
+        if (VideoCallPushBridge.isIncomingVideoCall(message.dataOfMap)) {
+            VideoCallPushBridge.showIncomingCall(this, message.dataOfMap)
+            return
+        }
+
+        val actionUrl = message.dataOfMap["action_url"]
         showNotification(message, actionUrl)
     }
 
     private fun showNotification(message: RemoteMessage, actionUrl: String?) {
         val context = applicationContext
 
-        // Интент для запуска Flutter-активити.
         val intent = Intent(context, MainActivity::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
             if (!actionUrl.isNullOrBlank()) {
@@ -48,7 +54,7 @@ class HmsPushService : HmsMessageService() {
         val channelId = "hms_push_channel"
 
         val notification = NotificationCompat.Builder(context, channelId)
-            .setSmallIcon(R.mipmap.ic_launcher) // используем иконку приложения
+            .setSmallIcon(R.mipmap.ic_launcher)
             .setContentTitle(message.notification?.title ?: context.getString(R.string.app_name))
             .setContentText(message.notification?.body ?: "")
             .setAutoCancel(true)
@@ -58,5 +64,3 @@ class HmsPushService : HmsMessageService() {
         NotificationManagerCompat.from(context).notify(message.messageId.hashCode(), notification)
     }
 }
-
-

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

@@ -1,11 +1,16 @@
 package com.eatvioapp.app
 
+import android.app.PictureInPictureParams
 import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import android.util.Rational
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel
+import com.hiennv.flutter_callkit_incoming.FlutterCallkitIncomingPlugin
 import com.huawei.agconnect.config.AGConnectServicesConfig
 import com.huawei.hms.aaid.HmsInstanceId
 import kotlinx.coroutines.CoroutineScope
@@ -13,13 +18,68 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 class MainActivity: FlutterActivity() {
+    companion object {
+        @JvmStatic
+        var isInForeground: Boolean = false
+            private set
+    }
+
     private val channelName = "com.eatvioapp/hms_push"
+    private val videoCallPipChannelName = "com.eatvioapp/video_call_pip"
+    private val videoCallPushChannelName = "com.eatvioapp/video_call_push"
     private var methodChannel: MethodChannel? = null
+    private var videoCallPipChannel: MethodChannel? = null
+    private var videoCallPushChannel: MethodChannel? = null
+    private var videoCallPipEnabled: Boolean = false
+
+    override fun onResume() {
+        super.onResume()
+        isInForeground = true
+        captureCallKitLaunchIntent(intent)
+        if (PendingCallKitAcceptBridge.peek() != null) {
+            scheduleDeliverPendingCallKitAccept()
+        }
+    }
+
+    override fun onPause() {
+        isInForeground = false
+        super.onPause()
+    }
 
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
 
         methodChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, channelName)
+        videoCallPipChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, videoCallPipChannelName)
+        videoCallPushChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, videoCallPushChannelName)
+        videoCallPushChannel?.setMethodCallHandler { call, result ->
+            when (call.method) {
+                "dismissIncomingCalls" -> {
+                    try {
+                        VideoCallPushBridge.dismissAllIncomingCalls(applicationContext)
+                        result.success(null)
+                    } catch (e: Exception) {
+                        result.error("DISMISS_INCOMING_CALLS_FAILED", e.message, null)
+                    }
+                }
+                "drainPendingCallKitAccept" -> {
+                    result.success(PendingCallKitAcceptBridge.drain())
+                }
+                "peekPendingCallKitAccept" -> {
+                    result.success(PendingCallKitAcceptBridge.peekPending())
+                }
+                else -> result.notImplemented()
+            }
+        }
+        videoCallPipChannel?.setMethodCallHandler { call, result ->
+            when (call.method) {
+                "setPipEnabled" -> {
+                    videoCallPipEnabled = call.arguments as? Boolean ?: false
+                    result.success(null)
+                }
+                else -> result.notImplemented()
+            }
+        }
         methodChannel?.setMethodCallHandler { call, result ->
                 when (call.method) {
                     "getHuaweiToken" -> {
@@ -75,17 +135,67 @@ class MainActivity: FlutterActivity() {
 
         // Обрабатываем возможный action_url, с которым была открыта Activity (например, из HMS уведомления).
         handleIntentForActionUrl(intent)
+        captureCallKitLaunchIntent(intent)
+    }
+
+    override fun onUserLeaveHint() {
+        super.onUserLeaveHint()
+        enterVideoCallPictureInPictureIfNeeded()
+        videoCallPipChannel?.invokeMethod("onUserLeaveHint", null)
     }
 
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
+        setIntent(intent)
+        captureCallKitLaunchIntent(intent)
         // Обработка нового интента, когда Activity уже запущена (тап по уведомлению).
         handleIntentForActionUrl(intent)
     }
 
+    private fun captureCallKitLaunchIntent(intent: Intent?) {
+        val payload = CallKitAcceptIntentMapper.payloadFromIntent(intent) ?: return
+
+        android.util.Log.i(
+            "VideoCallPush",
+            "captureCallKitLaunchIntent: action=${payload["action"]} id=${payload["id"]}",
+        )
+
+        PendingCallKitAcceptBridge.store(payload)
+        CallKitAcceptIntentMapper.clearCallKitLaunchIntent(intent)
+        scheduleDeliverPendingCallKitAccept()
+    }
+
+    private fun scheduleDeliverPendingCallKitAccept() {
+        PendingCallKitAcceptBridge.scheduleDeliverToFlutter(
+            deliver = { deliverPendingCallKitAcceptToFlutter() },
+        )
+    }
+
+    private fun deliverPendingCallKitAcceptToFlutter() {
+        val payload = PendingCallKitAcceptBridge.peek() ?: return
+        val channel = videoCallPushChannel
+        if (channel == null) {
+            android.util.Log.w(
+                "VideoCallPush",
+                "deliverPendingCallKitAcceptToFlutter: channel not ready",
+            )
+            return
+        }
+
+        android.util.Log.i(
+            "VideoCallPush",
+            "deliverPendingCallKitAcceptToFlutter: id=${payload["id"]}",
+        )
+        channel.invokeMethod("onCallKitLaunchIntent", payload)
+    }
+
     private fun handleIntentForActionUrl(intent: Intent?) {
         if (intent == null) return
 
+        if (intent.hasExtra(FlutterCallkitIncomingPlugin.EXTRA_CALLKIT_CALL_DATA)) {
+            return
+        }
+
         // Вариант 1: action_url лежит в extras.
         val fromExtras = intent.extras?.getString("action_url")
 
@@ -101,4 +211,19 @@ class MainActivity: FlutterActivity() {
         // Проксируем URL во Flutter, где уже есть общая логика навигации по диплинкам.
         methodChannel?.invokeMethod("openActionUrl", actionUrl)
     }
+
+    private fun enterVideoCallPictureInPictureIfNeeded() {
+        if (!videoCallPipEnabled) return
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
+        if (isInPictureInPictureMode) return
+
+        try {
+            val params = PictureInPictureParams.Builder()
+                .setAspectRatio(Rational(2, 3))
+                .build()
+            enterPictureInPictureMode(params)
+        } catch (e: Exception) {
+            android.util.Log.w("VideoCallPiP", "Unable to enter PiP from onUserLeaveHint", e)
+        }
+    }
 }

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

@@ -0,0 +1,42 @@
+package com.eatvioapp.app
+
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+
+/// Stores accepted call payloads until the Flutter engine is ready to drain them.
+object PendingCallKitAcceptBridge {
+    private const val TAG = "PendingCallKitAccept"
+
+    @Volatile
+    private var pendingPayload: Map<String, Any?>? = null
+
+    private val mainHandler = Handler(Looper.getMainLooper())
+
+    fun store(payload: Map<String, Any?>) {
+        pendingPayload = payload
+        Log.i(TAG, "stored pending accept id=${payload["id"]}")
+    }
+
+    fun peek(): Map<String, Any?>? = pendingPayload
+
+    fun drain(): Map<String, Any?>? {
+        val payload = pendingPayload
+        pendingPayload = null
+        if (payload != null) {
+            Log.i(TAG, "drained pending accept id=${payload["id"]}")
+        }
+        return payload
+    }
+
+    fun peekPending(): Map<String, Any?>? = pendingPayload
+
+    fun scheduleDeliverToFlutter(
+        deliver: () -> Unit,
+        delaysMs: LongArray = longArrayOf(0L, 250L, 700L, 1500L, 2800L, 4200L, 6000L),
+    ) {
+        for (delayMs in delaysMs) {
+            mainHandler.postDelayed({ deliver() }, delayMs)
+        }
+    }
+}

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

@@ -0,0 +1,318 @@
+package com.eatvioapp.app
+
+import android.content.Context
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import com.hiennv.flutter_callkit_incoming.CallkitConstants
+import com.hiennv.flutter_callkit_incoming.CallkitNotificationManager
+import com.hiennv.flutter_callkit_incoming.CallkitNotificationService
+import com.hiennv.flutter_callkit_incoming.CallkitSoundPlayerManager
+import com.hiennv.flutter_callkit_incoming.Data
+import com.hiennv.flutter_callkit_incoming.FlutterCallkitIncomingPlugin
+import com.hiennv.flutter_callkit_incoming.addCall
+import com.hiennv.flutter_callkit_incoming.getDataActiveCalls
+import com.hiennv.flutter_callkit_incoming.removeAllCalls
+import java.util.HashMap
+
+object VideoCallPushBridge {
+    private const val TAG = "VideoCallPushBridge"
+    private const val ANDROID_ACCENT_COLOR = "#2787F5"
+    private const val MISSED_CALL_CLEANUP_DELAY_MS = 250L
+
+    private var activeSoundManager: CallkitSoundPlayerManager? = null
+    private var activeNotificationManager: CallkitNotificationManager? = null
+
+    fun isIncomingVideoCall(data: Map<String, String>): Boolean {
+        val rawType = data["type"]
+            ?: data["notification_type"]
+            ?: data["event"]
+            ?: data["action"]
+            ?: data["push_type"]
+            ?: data["call_type"]
+
+        if (rawType != null) {
+            val normalized = rawType.lowercase().replace("-", "_")
+            if (normalized.contains("video_call")) {
+                return !normalized.contains("end") && !normalized.contains("ended")
+            }
+            if (normalized == "incoming_call" ||
+                normalized == "video_call_incoming" ||
+                normalized == "incoming_video_call"
+            ) {
+                return true
+            }
+        }
+
+        if (isTruthy(data["is_video_call"]) ||
+            isTruthy(data["incoming_call"]) ||
+            isTruthy(data["is_incoming_call"])
+        ) {
+            return conversationUuid(data) != null
+        }
+
+        val actionUrl = data["action_url"]
+        if (!actionUrl.isNullOrBlank() &&
+            (actionUrl.contains("video-call") || actionUrl.contains("videoCall"))
+        ) {
+            return true
+        }
+
+        return false
+    }
+
+    fun isEndedVideoCall(data: Map<String, String>): Boolean {
+        val rawType = data["type"]
+            ?: data["notification_type"]
+            ?: data["event"]
+            ?: data["action"]
+            ?: data["push_type"]
+            ?: data["call_type"]
+
+        if (rawType != null) {
+            val normalized = rawType.lowercase().replace("-", "_")
+            if (normalized == "video_call_ended" || normalized == "video_call_end") {
+                return true
+            }
+            if (normalized.contains("video_call") &&
+                (normalized.contains("ended") || normalized.endsWith("_end"))
+            ) {
+                return true
+            }
+        }
+
+        return false
+    }
+
+    fun showIncomingCall(context: Context, data: Map<String, String>) {
+        val appContext = context.applicationContext
+        val callData = buildCallDataBundle(data)
+        if (callData == null) {
+            Log.w(TAG, "showIncomingCall: missing conversation uuid, data=$data")
+            return
+        }
+
+        Log.i(TAG, "showIncomingCall: conversation=${callData.getString(CallkitConstants.EXTRA_CALLKIT_ID)}")
+
+        val soundManager = CallkitSoundPlayerManager(appContext)
+        val notificationManager = CallkitNotificationManager(appContext, soundManager)
+        activeSoundManager = soundManager
+        activeNotificationManager = notificationManager
+        notificationManager.createNotificationChanel(callData)
+        notificationManager.showIncomingNotification(callData)
+
+        try {
+            addCall(appContext, Data.fromBundle(callData))
+        } catch (error: Exception) {
+            Log.w(TAG, "showIncomingCall: failed to persist active call", error)
+        }
+    }
+
+    fun dismissAllIncomingCalls(context: Context) {
+        val appContext = context.applicationContext
+        val calls = getDataActiveCalls(appContext)
+        Log.i(TAG, "dismissAllIncomingCalls: active calls=${calls.size}")
+
+        stopIncomingRingtone(appContext)
+
+        val notificationManager = resolveNotificationManager(appContext)
+        val bundles = calls.map { it.toBundle() }
+
+        for (bundle in bundles) {
+            try {
+                dismissIncomingCallNotification(appContext, notificationManager, bundle)
+            } catch (error: Exception) {
+                Log.w(
+                    TAG,
+                    "dismissAllIncomingCalls: failed for call ${bundle.getString(CallkitConstants.EXTRA_CALLKIT_ID)}",
+                    error,
+                )
+            }
+        }
+
+        try {
+            CallkitNotificationService.stopService(appContext)
+        } catch (error: Exception) {
+            Log.w(TAG, "dismissAllIncomingCalls: failed to stop callkit service", error)
+        }
+
+        try {
+            removeAllCalls(appContext)
+        } catch (error: Exception) {
+            Log.w(TAG, "dismissAllIncomingCalls: failed to remove persisted calls", error)
+        }
+
+        stopIncomingRingtone(appContext)
+        scheduleMissedCallCleanup(notificationManager, bundles)
+        activeSoundManager = null
+        activeNotificationManager = null
+    }
+
+    private fun resolveNotificationManager(context: Context): CallkitNotificationManager {
+        activeNotificationManager?.let { return it }
+        FlutterCallkitIncomingPlugin.getInstance()
+            ?.getCallkitNotificationManager()
+            ?.let { return it }
+
+        val soundManager = CallkitSoundPlayerManager(context)
+        return CallkitNotificationManager(context, soundManager)
+    }
+
+    private fun stopIncomingRingtone(context: Context) {
+        activeSoundManager?.stop()
+        FlutterCallkitIncomingPlugin.getInstance()
+            ?.getCallkitSoundPlayerManager()
+            ?.stop()
+    }
+
+    /**
+     * Replaces the incoming notification before cancel so Android does not fire the
+     * timeout delete intent (which would show a missed-call notification).
+     */
+    private fun dismissIncomingCallNotification(
+        context: Context,
+        notificationManager: CallkitNotificationManager,
+        bundle: Bundle,
+    ) {
+        val notificationId = incomingNotificationId(bundle)
+
+        val silentNotification = NotificationCompat.Builder(
+            context,
+            CallkitNotificationManager.NOTIFICATION_CHANNEL_ID_INCOMING,
+        )
+            .setSmallIcon(context.applicationInfo.icon)
+            .setContentTitle("")
+            .setSilent(true)
+            .setOngoing(false)
+            .setPriority(NotificationCompat.PRIORITY_MIN)
+            .build()
+
+        val notificationManagerCompat = NotificationManagerCompat.from(context)
+        notificationManagerCompat.notify(notificationId, silentNotification)
+        notificationManagerCompat.cancel(notificationId)
+
+        bundle.putBoolean(CallkitConstants.EXTRA_CALLKIT_MISSED_CALL_SHOW, false)
+        notificationManager.clearIncomingNotification(bundle, isAccepted = true)
+        notificationManager.clearMissCallNotification(bundle)
+    }
+
+    private fun scheduleMissedCallCleanup(
+        notificationManager: CallkitNotificationManager,
+        bundles: List<Bundle>,
+    ) {
+        if (bundles.isEmpty()) return
+
+        Handler(Looper.getMainLooper()).postDelayed({
+            for (bundle in bundles) {
+                try {
+                    notificationManager.clearMissCallNotification(bundle)
+                } catch (error: Exception) {
+                    Log.w(TAG, "dismissAllIncomingCalls: delayed missed-call cleanup failed", error)
+                }
+            }
+        }, MISSED_CALL_CLEANUP_DELAY_MS)
+    }
+
+    private fun incomingNotificationId(bundle: Bundle): Int {
+        return bundle.getString(CallkitConstants.EXTRA_CALLKIT_ID, "callkit_incoming").hashCode()
+    }
+
+    private fun buildCallDataBundle(data: Map<String, String>): Bundle? {
+        val conversationUuid = conversationUuid(data) ?: return null
+        val callerName = data["counterpartName"]
+            ?: data["counterpart_name"]
+            ?: data["caller_name"]
+            ?: data["callerName"]
+            ?: data["nameCaller"]
+            ?: data["caller"]
+            ?: "Итвио"
+        val avatarUrl = data["counterpartAvatarUrl"]
+            ?: data["counterpart_avatar_url"]
+            ?: data["avatar"]
+            ?: data["avatarUrl"]
+            ?: data["avatar_url"]
+            ?: data["caller_avatar"]
+            ?: ""
+        val localParticipantName = data["localParticipantName"]
+            ?: data["local_participant_name"]
+        val counterpartIsConsultant = isTruthy(
+            data["counterpartIsConsultant"]
+                ?: data["counterpart_is_consultant"]
+                ?: data["is_consultant"]
+                ?: data["isConsultant"]
+        )
+
+        val extra = HashMap<String, Any?>()
+        extra["conversationUuid"] = conversationUuid
+        extra["counterpartName"] = callerName
+        if (avatarUrl.isNotBlank()) {
+            extra["counterpartAvatarUrl"] = avatarUrl
+        }
+        if (!localParticipantName.isNullOrBlank()) {
+            extra["localParticipantName"] = localParticipantName
+        }
+        if (counterpartIsConsultant) {
+            extra["counterpartIsConsultant"] = true
+        }
+
+        return Bundle().apply {
+            putString(CallkitConstants.EXTRA_CALLKIT_ID, conversationUuid)
+            putString(CallkitConstants.EXTRA_CALLKIT_NAME_CALLER, callerName)
+            putString(CallkitConstants.EXTRA_CALLKIT_APP_NAME, "Итвио")
+            putString(CallkitConstants.EXTRA_CALLKIT_HANDLE, conversationUuid)
+            putString(CallkitConstants.EXTRA_CALLKIT_AVATAR, avatarUrl)
+            putInt(CallkitConstants.EXTRA_CALLKIT_TYPE, 0)
+            putLong(CallkitConstants.EXTRA_CALLKIT_DURATION, 45000L)
+            putString(CallkitConstants.EXTRA_CALLKIT_TEXT_ACCEPT, "Answer")
+            putString(CallkitConstants.EXTRA_CALLKIT_TEXT_DECLINE, "Decline")
+            putSerializable(CallkitConstants.EXTRA_CALLKIT_EXTRA, extra)
+            putSerializable(CallkitConstants.EXTRA_CALLKIT_HEADERS, HashMap<String, Any?>())
+            putBoolean(CallkitConstants.EXTRA_CALLKIT_IS_CUSTOM_NOTIFICATION, true)
+            putBoolean(CallkitConstants.EXTRA_CALLKIT_IS_CUSTOM_SMALL_EX_NOTIFICATION, false)
+            putBoolean(CallkitConstants.EXTRA_CALLKIT_IS_SHOW_LOGO, false)
+            putBoolean(CallkitConstants.EXTRA_CALLKIT_IS_SHOW_CALL_ID, false)
+            putString(CallkitConstants.EXTRA_CALLKIT_RINGTONE_PATH, "system_ringtone_default")
+            putString(CallkitConstants.EXTRA_CALLKIT_BACKGROUND_COLOR, ANDROID_ACCENT_COLOR)
+            putString(CallkitConstants.EXTRA_CALLKIT_ACTION_COLOR, ANDROID_ACCENT_COLOR)
+            putString(CallkitConstants.EXTRA_CALLKIT_TEXT_COLOR, "#ffffff")
+            putBoolean(CallkitConstants.EXTRA_CALLKIT_IS_SHOW_FULL_LOCKED_SCREEN, false)
+            putBoolean(CallkitConstants.EXTRA_CALLKIT_IS_FULL_SCREEN, false)
+            putBoolean(CallkitConstants.EXTRA_CALLKIT_CALLING_SHOW, false)
+        }
+    }
+
+    private fun conversationUuid(data: Map<String, String>): String? {
+        val fromData = data["conversationUuid"]
+            ?: data["conversation_uuid"]
+            ?: data["conversation_id"]
+            ?: data["chat_uuid"]
+            ?: data["uuid"]
+        if (!fromData.isNullOrBlank()) {
+            return fromData
+        }
+
+        val actionUrl = data["action_url"] ?: return null
+        val uuidFromQuery = Regex("""[?&](?:uuid|conversationUuid|conversation_uuid)=([^&]+)""")
+            .find(actionUrl)
+            ?.groupValues
+            ?.getOrNull(1)
+            ?.trim()
+        if (!uuidFromQuery.isNullOrEmpty()) {
+            return uuidFromQuery
+        }
+
+        val pathMatch = Regex("""/video-call/([^/?#]+)""").find(actionUrl)
+        return pathMatch?.groupValues?.getOrNull(1)?.trim()?.takeIf { it.isNotEmpty() }
+    }
+
+    private fun isTruthy(value: String?): Boolean {
+        if (value.isNullOrBlank()) return false
+        return when (value.trim().lowercase()) {
+            "1", "true", "yes" -> true
+            else -> false
+        }
+    }
+}

assets/icons/video_call/poor_connection.svg

@@ -0,0 +1,3 @@
+<svg width="18" height="14" viewBox="0 0 18 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 12.0833V7.91666C0 7.56944 0.121528 7.2743 0.364583 7.03125C0.607639 6.78819 0.902778 6.66666 1.25 6.66666C1.59722 6.66666 1.89236 6.78819 2.13542 7.03125C2.37847 7.2743 2.5 7.56944 2.5 7.91666V12.0833C2.5 12.4306 2.37847 12.7257 2.13542 12.9687C1.89236 13.2118 1.59722 13.3333 1.25 13.3333C0.902778 13.3333 0.607639 13.2118 0.364583 12.9687C0.121528 12.7257 0 12.4306 0 12.0833ZM5 12.0833V5.83333C5 5.48611 5.12153 5.19097 5.36458 4.94791C5.60764 4.70486 5.90278 4.58333 6.25 4.58333C6.59722 4.58333 6.89236 4.70486 7.13542 4.94791C7.37847 5.19097 7.5 5.48611 7.5 5.83333V12.0833C7.5 12.4306 7.37847 12.7257 7.13542 12.9687C6.89236 13.2118 6.59722 13.3333 6.25 13.3333C5.90278 13.3333 5.60764 13.2118 5.36458 12.9687C5.12153 12.7257 5 12.4306 5 12.0833ZM10 12.0833V3.75C10 3.40278 10.1215 3.10764 10.3646 2.86458C10.6076 2.62153 10.9028 2.5 11.25 2.5C11.5972 2.5 11.8924 2.62153 12.1354 2.86458C12.3785 3.10764 12.5 3.40278 12.5 3.75V12.0833C12.5 12.4306 12.3785 12.7257 12.1354 12.9687C11.8924 13.2118 11.5972 13.3333 11.25 13.3333C10.9028 13.3333 10.6076 13.2118 10.3646 12.9687C10.1215 12.7257 10 12.4306 10 12.0833ZM15 6.8125V1.25C15 0.902777 15.1215 0.607639 15.3646 0.364583C15.6076 0.121528 15.9028 0 16.25 0C16.5972 0 16.8924 0.121528 17.1354 0.364583C17.3785 0.607639 17.5 0.902777 17.5 1.25V6.54166C17.3611 6.51389 17.2257 6.49305 17.0938 6.47916C16.9618 6.46528 16.8194 6.45833 16.6667 6.45833C16.375 6.45833 16.0868 6.48958 15.8021 6.55208C15.5174 6.61458 15.25 6.70139 15 6.8125ZM16.0729 13.0937C15.9132 12.934 15.8333 12.7361 15.8333 12.5C15.8333 12.2639 15.9132 12.066 16.0729 11.9062C16.2326 11.7465 16.4306 11.6667 16.6667 11.6667C16.9028 11.6667 17.1007 11.7465 17.2604 11.9062C17.4201 12.066 17.5 12.2639 17.5 12.5C17.5 12.7361 17.4201 12.934 17.2604 13.0937C17.1007 13.2535 16.9028 13.3333 16.6667 13.3333C16.4306 13.3333 16.2326 13.2535 16.0729 13.0937ZM15.8333 10V8.75C15.8333 8.51389 15.9132 8.31597 16.0729 8.15625C16.2326 7.99652 16.4306 7.91666 16.6667 7.91666C16.9028 7.91666 17.1007 7.99652 17.2604 8.15625C17.4201 8.31597 17.5 8.51389 17.5 8.75V10C17.5 10.2361 17.4201 10.434 17.2604 10.5937C17.1007 10.7535 16.9028 10.8333 16.6667 10.8333C16.4306 10.8333 16.2326 10.7535 16.0729 10.5937C15.9132 10.434 15.8333 10.2361 15.8333 10Z" fill="white"/>
+</svg>

assets/icons/video_call/vc_cam_off.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.292969 2.29289C0.683493 1.90237 1.31651 1.90237 1.70703 2.29289L3.41406 3.99992H11.4424C12.3865 3.99991 13.1558 3.99969 13.7803 4.05071C14.4257 4.10345 15.0042 4.21564 15.543 4.49016C16.3897 4.92159 17.0783 5.61023 17.5098 6.45696C17.7843 6.99573 17.8965 7.57424 17.9492 8.21965C17.9518 8.25175 17.9517 8.28444 17.9541 8.31731L22.4189 5.12981C23.0808 4.65704 24 5.12991 24 5.94328V18.0566C24 18.8699 23.0808 19.3428 22.4189 18.87L18 15.7138V18.5859L19.707 20.2929C20.0976 20.6834 20.0976 21.3164 19.707 21.707C19.3165 22.0975 18.6835 22.0975 18.293 21.707L0.292969 3.70696C-0.097555 3.31643 -0.0975551 2.68342 0.292969 2.29289ZM1 7.99895C1.55212 7.99895 1.99974 8.44689 2 8.99895V13.3993C2 14.3959 2.00036 15.0836 2.04395 15.6171C2.08658 16.1387 2.16554 16.4249 2.27246 16.6347C2.51215 17.105 2.89491 17.4868 3.36523 17.7265C3.57511 17.8334 3.86102 17.9124 4.38281 17.955C4.91619 17.9986 5.60333 17.9989 6.59961 17.9989H11C11.5521 17.9989 11.9997 18.4469 12 18.9989C12 19.5512 11.5523 19.9989 11 19.9989H6.55762C5.61342 19.999 4.84421 19.9992 4.21973 19.9482C3.57428 19.8954 2.99583 19.7832 2.45703 19.5087C1.61035 19.0773 0.921646 18.3886 0.490235 17.5419C0.215871 17.0032 0.103504 16.4245 0.0507818 15.7792C-0.000207456 15.1548 -1.10191e-05 14.3854 5.0477e-07 13.4413V8.99895C0.00026378 8.44689 0.447878 7.99895 1 7.99895ZM16 16.5859V10.5995C16 9.60324 15.9986 8.91611 15.9551 8.38274C15.9125 7.86113 15.8344 7.57502 15.7275 7.36516C15.4879 6.89475 15.1052 6.51207 14.6348 6.27239C14.4249 6.16547 14.1389 6.0865 13.6172 6.04387C13.0837 6.00029 12.396 5.99992 11.3994 5.99992H5.41406L16 16.5859Z" fill="white"/>
+</svg>

assets/icons/video_call/vc_control_enter.svg

@@ -0,0 +1,3 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.3438 5.34375C14.9405 5.34375 15.5128 5.5808 15.9347 6.00276C16.3567 6.42472 16.5938 6.99701 16.5938 7.59375M14.3438 0.84375C16.134 0.84375 17.8509 1.55491 19.1167 2.82078C20.3826 4.08665 21.0938 5.80354 21.0938 7.59375M3.09375 1.96875H7.59375L9.84375 7.59375L7.03125 9.28125C8.23608 11.7242 10.2133 13.7014 12.6562 14.9062L14.3438 12.0938L19.9688 14.3438V18.8438C19.9688 19.4405 19.7317 20.0128 19.3097 20.4347C18.8878 20.8567 18.3155 21.0938 17.7188 21.0938C13.3304 20.8271 9.19142 18.9636 6.08268 15.8548C2.97394 12.7461 1.11043 8.60708 0.84375 4.21875C0.84375 3.62201 1.0808 3.04972 1.50276 2.62776C1.92472 2.2058 2.49701 1.96875 3.09375 1.96875Z" stroke="white" stroke-width="1.6875" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

assets/icons/video_call/vc_expand.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.83398 9.03418C6.1464 8.72177 6.6534 8.72178 6.96582 9.03418C7.27824 9.3466 7.27824 9.8536 6.96582 10.166L2.73047 14.4004H5.59961C6.04144 14.4004 6.40039 14.7584 6.40039 15.2002C6.40032 15.642 6.04139 16 5.59961 16H0.799805C0.750353 16 0.702243 15.994 0.655273 15.9854C0.650431 15.9845 0.645453 15.9844 0.640625 15.9834C0.632394 15.9817 0.624348 15.9795 0.616211 15.9775C0.599845 15.9737 0.583526 15.9697 0.567383 15.9648C0.525709 15.9522 0.485753 15.936 0.447266 15.917C0.370564 15.8792 0.298188 15.8294 0.234375 15.7656C0.170233 15.7015 0.119834 15.6289 0.0820312 15.5518C0.0522722 15.4911 0.0292924 15.4265 0.015625 15.3584C0.0146554 15.3536 0.0145519 15.3486 0.0136719 15.3438C0.0052094 15.2971 7.59671e-06 15.2493 0 15.2002V10.4004C0 9.95863 0.358067 9.59972 0.799805 9.59961C1.24163 9.59961 1.59961 9.95856 1.59961 10.4004V13.2686L5.83398 9.03418ZM15.2002 0C15.2493 1.2747e-05 15.2971 0.0052045 15.3438 0.0136719C15.3486 0.0145519 15.3536 0.0146554 15.3584 0.015625C15.3666 0.017277 15.3747 0.0195822 15.3828 0.0214844C15.3992 0.0253083 15.4155 0.0293148 15.4316 0.0341797C15.4733 0.0467652 15.5133 0.0631386 15.5518 0.0820312C15.6289 0.119834 15.7015 0.170233 15.7656 0.234375C15.8294 0.298188 15.8792 0.370564 15.917 0.447266C15.9252 0.463964 15.9334 0.480716 15.9404 0.498047C15.9612 0.549032 15.9755 0.601773 15.9854 0.655273C15.994 0.702239 16 0.750358 16 0.799805V5.59961C16 6.04137 15.6419 6.40028 15.2002 6.40039C14.7584 6.40039 14.4004 6.04144 14.4004 5.59961V2.73047L10.166 6.96582C9.8536 7.27824 9.3466 7.27824 9.03418 6.96582C8.72178 6.6534 8.72177 6.1464 9.03418 5.83398L13.2695 1.59961H10.4004C9.95856 1.59961 9.59961 1.24163 9.59961 0.799805C9.59972 0.358067 9.95863 0 10.4004 0H15.2002Z" fill="#EFF0FA"/>
+</svg>

assets/icons/video_call/vc_mic_off.svg

@@ -0,0 +1,9 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 6.3V6C16 3.79 14.21 2 12 2C9.79 2 8 3.79 8 6V11" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.04004 14.19C9.77004 15 10.83 15.5 12 15.5C14.21 15.5 16 13.71 16 11.5V11" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.77979 16.9499C8.14979 18.2199 9.97978 18.9999 11.9998 18.9999C16.2198 18.9999 19.6498 15.5699 19.6498 11.3499V9.6499" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.3501 9.6499V11.3499C4.3501 12.4099 4.5601 13.4099 4.9501 14.3299" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20.0702 2.83984L3.93018 18.9898" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11 3V6" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 19V22" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

assets/icons/video_call/vc_mic_on.svg

@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 15.5C14.21 15.5 16 13.71 16 11.5V6C16 3.79 14.21 2 12 2C9.79 2 8 3.79 8 6V11.5C8 13.71 9.79 15.5 12 15.5Z" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.35059 9.6499V11.3499C4.35059 15.5699 7.78059 18.9999 12.0006 18.9999C16.2206 18.9999 19.6506 15.5699 19.6506 11.3499V9.6499" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 19V22" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

assets/icons/video_call/vc_shrink.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.40023 8.79965C6.44894 8.79967 6.49651 8.80496 6.54281 8.81332C6.54796 8.81425 6.5533 8.81424 6.55844 8.81527C6.56666 8.81692 6.57472 8.81923 6.58285 8.82113C6.5992 8.82496 6.61555 8.82896 6.63168 8.83383C6.64056 8.83651 6.64929 8.83963 6.65805 8.84262C6.69881 8.85648 6.73865 8.87374 6.77719 8.89437C6.80436 8.90894 6.83012 8.9257 6.85531 8.9432C6.89387 8.97001 6.93129 8.99965 6.96566 9.03402C6.9997 9.06805 7.02889 9.10526 7.05551 9.1434C7.05897 9.14836 7.06289 9.153 7.06625 9.15804C7.12722 9.24979 7.16631 9.35128 7.18539 9.4559C7.19389 9.50255 7.20001 9.55035 7.20004 9.59945V14.4002C7.19984 14.8418 6.84178 15.1998 6.40023 15.2C5.95852 15.2 5.59964 14.8419 5.59945 14.4002V11.5311L1.36508 15.7655C1.05264 16.0777 0.546577 16.0778 0.234217 15.7655C-0.0781257 15.4531 -0.0780189 14.947 0.234217 14.6346L4.46762 10.4002H1.59945C1.15782 10.4 0.799647 10.0411 0.799647 9.59945C0.799876 9.15796 1.15796 8.79988 1.59945 8.79965H6.40023ZM14.6346 0.234217C14.947 -0.0780189 15.4531 -0.0781257 15.7655 0.234217C16.0778 0.546577 16.0777 1.05264 15.7655 1.36508L11.5321 5.59945H14.4002C14.8419 5.59964 15.2 5.95852 15.2 6.40023C15.1998 6.84178 14.8418 7.19984 14.4002 7.20004H9.59945C9.55035 7.20001 9.50255 7.19389 9.4559 7.18539C9.45074 7.18445 9.44541 7.18448 9.44027 7.18344C9.43204 7.18177 9.42399 7.17949 9.41586 7.17758C9.3995 7.17372 9.38317 7.16978 9.36703 7.16488C9.35943 7.16257 9.35207 7.1596 9.34457 7.15707C9.30221 7.14282 9.2605 7.12587 9.22054 7.10433C9.19365 7.08982 9.16833 7.0729 9.1434 7.05551C9.10526 7.02889 9.06805 6.9997 9.03402 6.96566C8.99965 6.93129 8.97001 6.89387 8.9432 6.85531C8.9257 6.83012 8.90894 6.80436 8.89437 6.77719C8.85465 6.70298 8.82796 6.62378 8.81332 6.54281C8.80496 6.49651 8.79967 6.44894 8.79965 6.40023V1.59945C8.79988 1.15796 9.15796 0.799876 9.59945 0.799647C10.0411 0.799647 10.4 1.15782 10.4002 1.59945V4.46762L14.6346 0.234217Z" fill="#EFF0FA"/>
+</svg>

assets/icons/video_call/warning.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 0C15.523 0 20 4.477 20 10C20 15.523 15.523 20 10 20C4.477 20 0 15.523 0 10C0 4.477 4.477 0 10 0ZM10 2C7.87827 2 5.84344 2.84285 4.34315 4.34315C2.84285 5.84344 2 7.87827 2 10C2 12.1217 2.84285 14.1566 4.34315 15.6569C5.84344 17.1571 7.87827 18 10 18C12.1217 18 14.1566 17.1571 15.6569 15.6569C17.1571 14.1566 18 12.1217 18 10C18 7.87827 17.1571 5.84344 15.6569 4.34315C14.1566 2.84285 12.1217 2 10 2ZM10 13C10.2652 13 10.5196 13.1054 10.7071 13.2929C10.8946 13.4804 11 13.7348 11 14C11 14.2652 10.8946 14.5196 10.7071 14.7071C10.5196 14.8946 10.2652 15 10 15C9.73478 15 9.48043 14.8946 9.29289 14.7071C9.10536 14.5196 9 14.2652 9 14C9 13.7348 9.10536 13.4804 9.29289 13.2929C9.48043 13.1054 9.73478 13 10 13ZM10 4C10.2652 4 10.5196 4.10536 10.7071 4.29289C10.8946 4.48043 11 4.73478 11 5V11C11 11.2652 10.8946 11.5196 10.7071 11.7071C10.5196 11.8946 10.2652 12 10 12C9.73478 12 9.48043 11.8946 9.29289 11.7071C9.10536 11.5196 9 11.2652 9 11V5C9 4.73478 9.10536 4.48043 9.29289 4.29289C9.48043 4.10536 9.73478 4 10 4Z" fill="white"/>
+</svg>

ios/Runner.xcodeproj/project.pbxproj

@@ -397,7 +397,7 @@
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Eatvio;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -548,7 +548,7 @@
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Eatvio;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -587,7 +587,7 @@
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Eatvio;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

ios/Runner/AppDelegate.swift

@@ -1,30 +1,517 @@
+import AVFAudio
+import CallKit
 import Flutter
+import PushKit
 import UIKit
+import UserNotifications
 import YandexLoginSDK
+import flutter_callkit_incoming
+import flutter_foreground_task
 
 @main
-@objc class AppDelegate: FlutterAppDelegate {
+@objc class AppDelegate: FlutterAppDelegate, PKPushRegistryDelegate, CallkitIncomingAppDelegate {
+  private var voipRegistry: PKPushRegistry?
+  private var voipDiagnosticsChannel: FlutterMethodChannel?
+  private let voipDiagnosticsStorageKey = "EatvioVoipDiagnostics"
+  private let pendingAcceptedVoipCallKey = "EatvioPendingAcceptedVoipCall"
+  private let voipDiagnosticsChannelName = "com.eatvioapp/voip_diagnostics"
+  private let appUrlScheme = "eatvio"
+
   override func application(
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
     GeneratedPluginRegistrant.register(with: self)
-    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+    SwiftFlutterForegroundTaskPlugin.setPluginRegistrantCallback { registry in
+      GeneratedPluginRegistrant.register(with: registry)
+    }
+
+    let mainQueue = DispatchQueue.main
+    voipRegistry = PKPushRegistry(queue: mainQueue)
+    voipRegistry?.delegate = self
+    voipRegistry?.desiredPushTypes = [PKPushType.voIP]
+
+    if #available(iOS 10.0, *) {
+      UNUserNotificationCenter.current().delegate = self
+    }
+
+    let launched = super.application(application, didFinishLaunchingWithOptions: launchOptions)
+
+    if let controller = window?.rootViewController as? FlutterViewController {
+      let channel = FlutterMethodChannel(
+        name: voipDiagnosticsChannelName,
+        binaryMessenger: controller.binaryMessenger
+      )
+      voipDiagnosticsChannel = channel
+      channel.setMethodCallHandler { [weak self] call, result in
+        guard let self else {
+          result(nil)
+          return
+        }
+        switch call.method {
+        case "drainVoipDiagnostics":
+          result(self.drainVoipDiagnostics())
+        case "drainPendingAcceptedVoipCall":
+          result(self.drainPendingAcceptedVoipCall())
+        default:
+          result(FlutterMethodNotImplemented)
+        }
+      }
+    }
+
+    return launched
   }
 
   @available(iOS 8.0, *)
-  func application(
-    _ application: UIApplication, continue userActivity: NSUserActivity,
-    restorationHandler: @escaping ([Any]?) -> Void
+  override func application(
+    _ application: UIApplication,
+    continue userActivity: NSUserActivity,
+    restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void
   ) -> Bool {
-    YXLSdk.shared.processUserActivity(userActivity)
-    return true
+    if YXLSdk.shared.processUserActivity(userActivity) {
+      return true
+    }
+    return super.application(
+      application,
+      continue: userActivity,
+      restorationHandler: restorationHandler
+    )
   }
 
   override public func application(
-    _ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]
+    _ app: UIApplication,
+    open url: URL,
+    options: [UIApplication.OpenURLOptionsKey: Any] = [:]
   ) -> Bool {
+    if url.scheme == appUrlScheme {
+      let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
+      let queryItems = components?.queryItems ?? []
+      let conversationUuid = queryItems.first { $0.name == "conversationUuid" }?.value?
+        .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+      let callKitId = queryItems.first { $0.name == "callKitId" }?.value?
+        .trimmingCharacters(in: .whitespacesAndNewlines)
+      recordVoipDiagnostic(
+        "accepted_call_url_opened",
+        data: [
+          "callKitId": callKitId ?? "",
+          "hasCallKitId": callKitId != nil,
+          "conversationUuid": conversationUuid,
+          "url": url.absoluteString,
+        ]
+      )
+      if let callKitId, !callKitId.isEmpty, !conversationUuid.isEmpty {
+        voipDiagnosticsChannel?.invokeMethod(
+          "acceptedVoipCall",
+          arguments: [
+            "id": callKitId,
+            "handle": conversationUuid,
+            "extra": [
+              "conversationUuid": conversationUuid
+            ],
+          ]
+        )
+      }
+      return true
+    }
+
     return YXLSdk.shared.handleOpen(
-      url, sourceApplication: options[UIApplication.OpenURLOptionsKey.sourceApplication] as? String)
+      url,
+      sourceApplication: options[UIApplication.OpenURLOptionsKey.sourceApplication] as? String
+    )
   }
+
+  private func conversationUuid(fromActionUrl actionUrl: String?) -> String? {
+    guard
+      let actionUrl = actionUrl,
+      let components = URLComponents(string: actionUrl)
+    else {
+      return nil
+    }
+
+    let queryItems = components.queryItems ?? []
+    for key: String in ["uuid", "conversationUuid", "conversation_uuid"] {
+      if let value = queryItems.first(where: { $0.name == key })?.value,
+        !value.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+      {
+        return value.trimmingCharacters(in: .whitespacesAndNewlines)
+      }
+    }
+
+    let segments = components.path.split(separator: "/").map(String.init)
+    for index in segments.indices where segments[index] == "video-call" {
+      let nextIndex = segments.index(after: index)
+      if segments.indices.contains(nextIndex), !segments[nextIndex].isEmpty {
+        return segments[nextIndex]
+      }
+    }
+
+    return nil
+  }
+
+  private func conversationUuid(fromCall call: Call) -> String? {
+    let extra = call.data.extra as? [String: Any] ?? [:]
+    for key in ["conversationUuid", "conversation_uuid", "conversation_id", "chat_uuid", "uuid"] {
+      if let value = extra[key] as? String {
+        let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines)
+        if !trimmed.isEmpty {
+          return trimmed
+        }
+      }
+    }
+
+    let handle = call.data.handle.trimmingCharacters(in: .whitespacesAndNewlines)
+    if !handle.isEmpty {
+      return handle
+    }
+
+    return nil
+  }
+
+  private func storePendingAcceptedCall(_ call: Call) {
+    let payload = sanitizedDiagnosticValue(call.data.toJSON()) as? [String: Any] ?? [:]
+    UserDefaults.standard.set(payload, forKey: pendingAcceptedVoipCallKey)
+  }
+
+  private func drainPendingAcceptedVoipCall() -> [String: Any]? {
+    let defaults = UserDefaults.standard
+    guard let payload = defaults.dictionary(forKey: pendingAcceptedVoipCallKey) else {
+      return nil
+    }
+    defaults.removeObject(forKey: pendingAcceptedVoipCallKey)
+    return payload
+  }
+
+  private func bringAppToForeground() {
+    DispatchQueue.main.async {
+      for scene in UIApplication.shared.connectedScenes {
+        guard let windowScene = scene as? UIWindowScene else { continue }
+        for window in windowScene.windows {
+          window.makeKeyAndVisible()
+        }
+      }
+      self.window?.makeKeyAndVisible()
+    }
+  }
+
+  private func openAppForAcceptedCall(_ call: Call) {
+    guard let conversationUuid = conversationUuid(fromCall: call), !conversationUuid.isEmpty else {
+      recordVoipDiagnostic(
+        "accepted_call_missing_conversation_uuid",
+        data: ["callKitId": call.data.uuid]
+      )
+      return
+    }
+
+    var components = URLComponents()
+    components.scheme = appUrlScheme
+    components.host = "video-call"
+    components.queryItems = [
+      URLQueryItem(name: "callKitId", value: call.data.uuid),
+      URLQueryItem(name: "conversationUuid", value: conversationUuid)
+    ]
+
+    guard let url = components.url else {
+      recordVoipDiagnostic(
+        "accepted_call_url_build_failed",
+        data: [
+          "callKitId": call.data.uuid,
+          "conversationUuid": conversationUuid,
+        ]
+      )
+      return
+    }
+
+    recordVoipDiagnostic(
+      "accepted_call_open_app_requested",
+      data: [
+        "callKitId": call.data.uuid,
+        "conversationUuid": conversationUuid,
+        "url": url.absoluteString,
+        "appState": UIApplication.shared.applicationState.rawValue,
+      ]
+    )
+
+    bringAppToForeground()
+
+    UIApplication.shared.open(url, options: [:]) { [weak self] success in
+      self?.recordVoipDiagnostic(
+        success ? "accepted_call_open_app_succeeded" : "accepted_call_open_app_failed",
+        data: [
+          "callKitId": call.data.uuid,
+          "conversationUuid": conversationUuid,
+          "url": url.absoluteString,
+        ]
+      )
+    }
+  }
+
+  private func sanitizedDiagnosticValue(_ value: Any?) -> Any {
+    guard let value = value else {
+      return ""
+    }
+    if let string = value as? String {
+      return string
+    }
+    if let number = value as? NSNumber {
+      return number
+    }
+    if let bool = value as? Bool {
+      return bool
+    }
+    if let dictionary = value as? [AnyHashable: Any] {
+      return dictionary.reduce(into: [String: Any]()) { result, entry in
+        result[String(describing: entry.key)] = sanitizedDiagnosticValue(entry.value)
+      }
+    }
+    if let array = value as? [Any] {
+      return array.map { sanitizedDiagnosticValue($0) }
+    }
+    return String(describing: value)
+  }
+
+  private func recordVoipDiagnostic(_ name: String, data: [String: Any]) {
+    let defaults = UserDefaults.standard
+    var events = defaults.array(forKey: voipDiagnosticsStorageKey) as? [[String: Any]] ?? []
+    var event: [String: Any] = [
+      "name": name,
+      "timestamp": ISO8601DateFormatter().string(from: Date()),
+      "appState": UIApplication.shared.applicationState.rawValue,
+    ]
+    event["data"] = sanitizedDiagnosticValue(data)
+    events.append(event)
+    if events.count > 20 {
+      events = Array(events.suffix(20))
+    }
+    defaults.set(events, forKey: voipDiagnosticsStorageKey)
+    voipDiagnosticsChannel?.invokeMethod("voipDiagnosticsUpdated", arguments: nil)
+  }
+
+  private func drainVoipDiagnostics() -> [[String: Any]] {
+    let defaults = UserDefaults.standard
+    let events = defaults.array(forKey: voipDiagnosticsStorageKey) as? [[String: Any]] ?? []
+    defaults.removeObject(forKey: voipDiagnosticsStorageKey)
+    return events
+  }
+
+
+  func pushRegistry(
+    _ registry: PKPushRegistry,
+    didUpdate credentials: PKPushCredentials,
+    for type: PKPushType
+  ) {
+    let deviceToken = credentials.token.map { String(format: "%02x", $0) }.joined()
+    SwiftFlutterCallkitIncomingPlugin.sharedInstance?.setDevicePushTokenVoIP(deviceToken)
+  }
+
+  func pushRegistry(_ registry: PKPushRegistry, didInvalidatePushTokenFor type: PKPushType) {
+    SwiftFlutterCallkitIncomingPlugin.sharedInstance?.setDevicePushTokenVoIP("")
+  }
+
+  func pushRegistry(
+    _ registry: PKPushRegistry,
+    didReceiveIncomingPushWith payload: PKPushPayload,
+    for type: PKPushType,
+    completion: @escaping () -> Void
+  ) {
+    guard type == .voIP else {
+      completion()
+      return
+    }
+
+    let dict = payload.dictionaryPayload
+    let pushMarkers = [
+      dict["type"] as? String,
+      dict["notification_type"] as? String,
+      dict["event"] as? String,
+      dict["action"] as? String,
+      dict["push_type"] as? String,
+      dict["call_type"] as? String,
+    ]
+      .compactMap { $0?.lowercased().replacingOccurrences(of: "-", with: "_") }
+
+    if pushMarkers.contains(where: { $0.contains("video_call") })
+      && pushMarkers.contains(where: { $0.contains("end") || $0.contains("cancel") }) {
+      recordVoipDiagnostic(
+        "voip_end_or_cancel_received",
+        data: [
+          "markers": pushMarkers,
+          "payload": dict,
+        ]
+      )
+      SwiftFlutterCallkitIncomingPlugin.sharedInstance?.endAllCalls()
+      completion()
+      return
+    }
+
+    let nameCaller = (dict["nameCaller"] as? String)
+      ?? (dict["counterpartName"] as? String)
+      ?? (dict["counterpart_name"] as? String)
+      ?? (dict["caller_name"] as? String)
+      ?? (dict["callerName"] as? String)
+      ?? (dict["caller"] as? String)
+      ?? ""
+    let conversationUuid = (dict["conversation_uuid"] as? String)
+      ?? (dict["conversationUuid"] as? String)
+      ?? (dict["conversation_id"] as? String)
+      ?? (dict["chat_uuid"] as? String)
+      ?? (dict["uuid"] as? String)
+      ?? conversationUuid(fromActionUrl: dict["action_url"] as? String)
+      ?? (dict["handle"] as? String)
+      ?? ""
+    let callKitIdSource = [
+      (key: "call_id", value: dict["call_id"] as? String),
+      (key: "id", value: dict["id"] as? String),
+      (key: "message_id", value: dict["message_id"] as? String),
+    ]
+      .first { item in
+        guard let trimmed = item.value?.trimmingCharacters(in: .whitespacesAndNewlines) else {
+          return false
+        }
+        return !trimmed.isEmpty && UUID(uuidString: trimmed) != nil
+      }
+    let id = callKitIdSource?.value?.trimmingCharacters(in: .whitespacesAndNewlines) ?? UUID().uuidString
+    let callKitIdSourceName = callKitIdSource?.key ?? "generated"
+    let isVideo = (dict["isVideo"] as? Bool)
+      ?? (dict["is_video"] as? Bool)
+      ?? true
+
+    var extra: [String: Any] = [:]
+    if !conversationUuid.isEmpty {
+      extra["conversationUuid"] = conversationUuid
+    }
+    if let avatar = dict["caller_avatar"] as? String ?? dict["avatar"] as? String
+      ?? dict["avatarUrl"] as? String
+      ?? dict["avatar_url"] as? String
+      ?? dict["counterpartAvatarUrl"] as? String
+      ?? dict["counterpart_avatar_url"] as? String
+    {
+      extra["counterpartAvatarUrl"] = avatar
+    }
+    if let messageId = dict["message_id"] as? String {
+      extra["messageId"] = messageId
+    }
+    if let roomName = dict["room_name"] as? String {
+      extra["roomName"] = roomName
+    }
+    if let localName = dict["localParticipantName"] as? String
+      ?? dict["local_participant_name"] as? String
+    {
+      extra["localParticipantName"] = localName
+    }
+    if let counterpartName = dict["counterpartName"] as? String {
+      extra["counterpartName"] = counterpartName
+    } else if let counterpartName = dict["counterpart_name"] as? String {
+      extra["counterpartName"] = counterpartName
+    } else if !nameCaller.isEmpty {
+      extra["counterpartName"] = nameCaller
+    }
+
+    let data = flutter_callkit_incoming.Data(
+      id: id,
+      nameCaller: nameCaller,
+      handle: conversationUuid.isEmpty ? nameCaller : conversationUuid,
+      type: isVideo ? 1 : 0
+    )
+    data.extra = extra as NSDictionary
+
+    NSLog(
+      "[EatvioVoIP] report incoming call id=\(id) conversation=\(conversationUuid) state=\(UIApplication.shared.applicationState.rawValue) markers=\(pushMarkers.joined(separator: ",")) payload=\(dict)"
+    )
+    recordVoipDiagnostic(
+      "voip_incoming_received",
+      data: [
+        "callKitId": id,
+        "callKitIdSource": callKitIdSourceName,
+        "conversationUuid": conversationUuid,
+        "nameCaller": nameCaller,
+        "isVideo": isVideo,
+        "markers": pushMarkers,
+        "payload": dict,
+      ]
+    )
+
+    guard let callkitPlugin = SwiftFlutterCallkitIncomingPlugin.sharedInstance else {
+      NSLog("[EatvioVoIP] CallKit plugin missing id=\(id)")
+      recordVoipDiagnostic(
+        "callkit_plugin_missing",
+        data: [
+          "callKitId": id,
+          "conversationUuid": conversationUuid,
+        ]
+      )
+      completion()
+      return
+    }
+
+    callkitPlugin.showCallkitIncoming(
+      data,
+      fromPushKit: true
+    ) {
+      let activeCalls = callkitPlugin.activeCalls()
+      let activeIds = activeCalls.compactMap { $0["id"] as? String }.joined(separator: ",")
+      NSLog(
+        "[EatvioVoIP] report incoming completed id=\(id) activeCallIds=\(activeIds)"
+      )
+      self.recordVoipDiagnostic(
+        "callkit_report_completed",
+        data: [
+          "callKitId": id,
+          "callKitIdSource": callKitIdSourceName,
+          "conversationUuid": conversationUuid,
+          "activeCallIds": activeIds,
+          "activeCallsCount": activeCalls.count,
+        ]
+      )
+      DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+        let delayedActiveCalls = callkitPlugin.activeCalls()
+        let delayedActiveIds = delayedActiveCalls.compactMap { $0["id"] as? String }.joined(separator: ",")
+        self.recordVoipDiagnostic(
+          "callkit_active_calls_delayed",
+          data: [
+            "callKitId": id,
+            "callKitIdSource": callKitIdSourceName,
+            "conversationUuid": conversationUuid,
+            "activeCallIds": delayedActiveIds,
+            "activeCallsCount": delayedActiveCalls.count,
+          ]
+        )
+      }
+      completion()
+    }
+  }
+
+
+  func onAccept(_ call: Call, _ action: CXAnswerCallAction) {
+    storePendingAcceptedCall(call)
+    recordVoipDiagnostic(
+      "callkit_accept_native",
+      data: [
+        "callKitId": call.data.uuid,
+        "conversationUuid": conversationUuid(fromCall: call) ?? "",
+        "data": call.data.toJSON(),
+      ]
+    )
+    voipDiagnosticsChannel?.invokeMethod("acceptedVoipCall", arguments: call.data.toJSON())
+    DispatchQueue.main.async { [weak self] in
+      self?.bringAppToForeground()
+      self?.openAppForAcceptedCall(call)
+    }
+    action.fulfill()
+  }
+
+  func onDecline(_ call: Call, _ action: CXEndCallAction) {
+    action.fulfill()
+  }
+
+  func onEnd(_ call: Call, _ action: CXEndCallAction) {
+    action.fulfill()
+  }
+
+  func onTimeOut(_ call: Call) {}
+
+  func didActivateAudioSession(_ audioSession: AVAudioSession) {}
+
+  func didDeactivateAudioSession(_ audioSession: AVAudioSession) {}
+
+  func providerDidReset() {}
 }

ios/Runner/Info.plist

@@ -35,14 +35,20 @@
 	<string>This permission is not needed by the app, but it is required by an underlying API. If you see this dialog, contact us.</string>
 	<key>NSCameraUsageDescription</key>
 	<string>Предоставление доступа позволит Вам делать фотографии и добавлять к записям</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>Нужен для звука в видеозвонках с консультантом</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>Может использоваться для стабильного поддержания связи во время звонка.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string></string>
+	<string>Может использоваться для стабильного поддержания связи во время звонка.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Предоставление доступа позволит Вам добавлять фото к записям</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UIBackgroundModes</key>
 	<array>
+		<string>audio</string>
+		<string>voip</string>
 		<string>fetch</string>
 		<string>remote-notification</string>
 	</array>
@@ -72,6 +78,57 @@
 		<string>yandexauth</string>
 		<string>yandexauth2</string>
 		<string>yandexauth4</string>
+		<!-- SBP bank schemes (top ~50 by popularity, iOS 15+ caps at 50) -->
+		<string>bank100000000111</string>
+		<string>bank100000000004</string>
+		<string>bank100000000005</string>
+		<string>bank100000000008</string>
+		<string>bank100000000007</string>
+		<string>bank100000000015</string>
+		<string>bank100000000001</string>
+		<string>bank100000000010</string>
+		<string>bank100000000013</string>
+		<string>bank100000000012</string>
+		<string>bank100000000020</string>
+		<string>bank100000000025</string>
+		<string>bank100000000030</string>
+		<string>bank100000000030_new</string>
+		<string>bank100000000003</string>
+		<string>bank100000000043</string>
+		<string>bank100000000028</string>
+		<string>bank100000000086</string>
+		<string>bank100000000011</string>
+		<string>bank100000000044</string>
+		<string>bank100000000049</string>
+		<string>bank100000000500</string>
+		<string>bank100000000095</string>
+		<string>bank100000000900</string>
+		<string>bank100000000056</string>
+		<string>bank100000000053</string>
+		<string>bank100000000121</string>
+		<string>bank100000000082</string>
+		<string>bank100000000127</string>
+		<string>bank100000000017</string>
+		<string>bank100000000087</string>
+		<string>bank100000000052</string>
+		<string>bank100000000006</string>
+		<string>bank100000000098</string>
+		<string>bank100000000092</string>
+		<string>bank100000000229</string>
+		<string>bank100000000027</string>
+		<string>bank100000000080</string>
+		<string>bank100000000122</string>
+		<string>bank100000000124</string>
+		<string>bank100000000118</string>
+		<string>bank100000000159</string>
+		<string>bank100000000146</string>
+		<string>bank100000000069</string>
+		<string>bank100000000140</string>
+		<string>bank100000000047</string>
+		<string>bank100000000099</string>
+		<string>bank100000000135</string>
+		<string>bank100000000139</string>
+		<string>bank100000000022</string>
 	</array>
 	<key>YAClientId</key>
 	<string>5399b03636104c6d920b87c1ad329254</string>
@@ -85,6 +142,14 @@
 				<string>yx5399b03636104c6d920b87c1ad329254</string>
 			</array>
 		</dict>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>Eatvio</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>eatvio</string>
+			</array>
+		</dict>
 	</array>
 </dict>
 </plist>

ios/fastlane/Fastfile

@@ -75,16 +75,24 @@ platform :ios do
       xcodeproj: "Runner.xcodeproj",
       build_number: flutter_build_number
     )
+
+    update_code_signing_settings(
+      use_automatic_signing: false,
+      path: "Runner.xcodeproj",
+      team_id: "VL68C36HYS",
+      targets: ["Runner"],
+      code_sign_identity: "Apple Distribution",
+      profile_name: "match AppStore com.eatvioapp.app 1781098260"
+    )
     
     build_app(
       workspace: "Runner.xcworkspace", 
       scheme: "Runner", 
       export_method: "app-store", 
-      codesigning_identity: "Apple Distribution",
+      # codesigning_identity: "Apple Distribution",
+      export_team_id: "VL68C36HYS"
     )
-    
 
-    
     app_store_connect_api_key(
       key_id: "325JS9JCZH", 
       issuer_id: "dfa27d1d-2bb8-4d4d-847e-0b32f9b880b3", 
@@ -92,6 +100,7 @@ platform :ios do
       duration: 1200,
       in_house: false
     )
+  
     
     begin
       upload_to_testflight(

lib/core/app_config.dart

@@ -8,6 +8,7 @@ import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/new_
 import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_cubit.dart';
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
 import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
@@ -35,6 +36,7 @@ class AppConfig {
   /// Список глобальных BlocProvider'ов
   /// Используются lazy: true для отложенной инициализации, чтобы не блокировать старт приложения
   List<BlocProvider> get globalBlocProviders => [
+    BlocProvider<VideoCallSessionCubit>.value(value: sl<VideoCallSessionCubit>()),
     BlocProvider<NewMessagesCubit>(lazy: true, create: (context) => sl<NewMessagesCubit>()),
     BlocProvider<NotificationsCubit>(lazy: true, create: (context) => sl<NotificationsCubit>()),
     BlocProvider<FeedCubit>(lazy: true, create: (context) => sl<FeedCubit>()),

lib/core/app_initializer.dart

@@ -6,6 +6,7 @@ import 'package:eatvio_app/core/env_config.dart';
 import 'package:eatvio_app/core/error_reporting/error_report_policy.dart';
 import 'package:eatvio_app/core/locator_service.dart' as di;
 import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_fcm_handler.dart';
 import 'package:eatvio_app/firebase_options.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
@@ -47,6 +48,7 @@ class AppInitializer {
         throw TimeoutException('Firebase initialization timeout');
       },
     );
+    VideoCallFcmHandler.registerBackgroundHandler();
     if (sl<AppConfig>().buildType == AppBuildType.prod) {
       try {
         await FirebaseMessaging.instance.requestPermission().timeout(const Duration(seconds: 5));

lib/core/app_router.dart

@@ -123,7 +123,21 @@ class AppRouter {
     return '${InfoByOrderScreen.path}?planId=$consultationId';
   }
 
-  static String? _resolveDeepLinkUri(Uri uri) {
+  /// Deep link после оплаты Alfa: `finance/alfa/return/{orderId}` → чат с query `orderId`.
+  static String? _resolveFinanceAlfaReturnDeepLink(List<String> effectiveSegments) {
+    if (effectiveSegments.length != 4 ||
+        effectiveSegments[1] != 'alfa' ||
+        effectiveSegments[2] != 'return') {
+      return null;
+    }
+    final orderId = effectiveSegments[3];
+    if (orderId.isEmpty) return null;
+    developer.log('Deep link: finance/alfa/return/$orderId', name: 'AppRouter');
+    return '${RouteConstants.chatScreen}?orderId=$orderId';
+  }
+
+  /// Разбирает deep link URI в внутренний route target (или null, если host не наш).
+  static String? resolveDeepLinkTarget(Uri uri) {
     final host = uri.host.toLowerCase();
     final segments = uri.pathSegments;
 
@@ -189,6 +203,10 @@ class AppRouter {
         final target = _resolveConsultationsDeepLink(effectiveSegments);
         if (target != null) return target;
         break;
+      case 'finance':
+        final target = _resolveFinanceAlfaReturnDeepLink(effectiveSegments);
+        if (target != null) return target;
+        break;
     }
 
     developer.log('Unknown deep link format: ${effectiveSegments.length} effective segments, type=$type, redirecting to feed', name: 'AppRouter');
@@ -196,7 +214,7 @@ class AppRouter {
   }
 
   static String? _handleRedirect(BuildContext context, GoRouterState state) {
-    return _resolveDeepLinkUri(state.uri);
+    return resolveDeepLinkTarget(state.uri);
   }
 
   static void navigateByDeepLinkUrl(String url) {
@@ -230,7 +248,7 @@ class AppRouter {
       );
     }
 
-    final target = _resolveDeepLinkUri(uri);
+    final target = resolveDeepLinkTarget(uri);
     FlutterNativeSplash.remove();
     if (target != null) {
       appRouter.go(target);

lib/core/const.dart

@@ -9,4 +9,5 @@ const List<String> planTypeValues = ['fit', 'slim', 'wellness', 'behavior'];
 const newMessagesChannelName = 'private-new-chat-messages';
 const newNotificationsChannelName = 'private-message-events';
 const directChatChannelName = 'private-direct-chat';
+const presenceDirectChatChannelName = 'presence-direct-chat';
 const thresholdForPagination = 150;

lib/core/device/device_hw_id_provider.dart

@@ -0,0 +1,16 @@
+import 'dart:io';
+
+import 'package:device_info_plus/device_info_plus.dart';
+
+abstract final class DeviceHwIdProvider {
+  static Future<String?> current() async {
+    final deviceInfo = DeviceInfoPlugin();
+    if (Platform.isIOS) {
+      return (await deviceInfo.iosInfo).identifierForVendor;
+    }
+    if (Platform.isAndroid) {
+      return (await deviceInfo.androidInfo).id;
+    }
+    return null;
+  }
+}

lib/core/di/cubit_registrations.dart

@@ -39,6 +39,7 @@ import 'package:eatvio_app/features/my_finance/presentation/cubit/user_cards_cub
 import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.dart';
 import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_cubit.dart';
 import 'package:eatvio_app/features/order_info/cubit/order_info_cubit.dart';
+import 'package:eatvio_app/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_cubit.dart';
 import 'package:eatvio_app/features/personal_diet_suggestion/cubit/personal_diet_suggestion_cubit.dart';
 import 'package:eatvio_app/features/plans/presentation/cubit/about_plan_cubit.dart';
 import 'package:eatvio_app/features/profile/presentation/bloc/plans_cubit/plans_cubit.dart' as profile_plans;
@@ -51,6 +52,8 @@ import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_
 import 'package:eatvio_app/features/registration_v2/cubit/registration_cubit.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart';
 import 'package:eatvio_app/features/user_details/presentation/cubit/user_details_cubit.dart';
+import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
 import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart';
 import 'package:get_it/get_it.dart';
 
@@ -71,6 +74,18 @@ class CubitRegistrations {
     sl.registerLazySingleton<ProfileAvatarCubit>(() => ProfileAvatarCubit(profileRepository: sl()));
     sl.registerLazySingleton<ChatsCubit>(() => ChatsCubit(chatRepository: sl(), wsManager: sl(), profileRepository: sl()));
     sl.registerLazySingleton<InternetConnectionCubit>(() => InternetConnectionCubit());
+    sl.registerLazySingleton<VideoCallManager>(
+      () => VideoCallManager(
+        videoCallRepository: sl(),
+        profileRepository: sl(),
+      ),
+    );
+    sl.registerLazySingleton<VideoCallSessionCubit>(
+      () => VideoCallSessionCubit(
+        videoCallManager: sl(),
+        systemPipCoordinator: sl(),
+      ),
+    );
   }
 
   /// Регистрация Cubit'ов как фабрик
@@ -135,6 +150,9 @@ class CubitRegistrations {
     sl.registerFactory<ComplainingCubit>(() => ComplainingCubit(repository: sl()));
     sl.registerFactory<UserCardsCubit>(() => UserCardsCubit(cardsRepository: sl()));
     sl.registerFactory<OrderInfoCubit>(() => OrderInfoCubit(chatRepository: sl(), profileRepository: sl()));
+    sl.registerFactory<ConsultationPaymentCubit>(
+      () => ConsultationPaymentCubit(paymentRepository: sl(), sbpRepository: sl()),
+    );
     sl.registerFactory<ConsultationsCubit>(() => ConsultationsCubit(consultationsRepository: sl()));
     sl.registerFactory<ConsultantCommentsCubit>(() => ConsultantCommentsCubit(diaryRepository: sl()));
     sl.registerFactory<CancelPlanCubit>(() => CancelPlanCubit(cancelPlanRepository: sl()));

lib/core/di/repository_registrations.dart

@@ -24,6 +24,8 @@ import 'package:eatvio_app/features/my_diets/repositories/my_diets_repository.da
 import 'package:eatvio_app/features/my_finance/repositories/cards_repository.dart';
 import 'package:eatvio_app/features/my_plans/repositories/my_diets_repository.dart';
 import 'package:eatvio_app/features/notifications/repository/notifications_repository.dart';
+import 'package:eatvio_app/features/payment/repositories/payment_repository.dart';
+import 'package:eatvio_app/features/payment/repositories/sbp_repository.dart';
 import 'package:eatvio_app/features/personal_diet_suggestion/repository/personal_diet_suggestion_repository.dart';
 import 'package:eatvio_app/features/plans/repositories/plan_repository.dart';
 import 'package:eatvio_app/features/plans/repositories/plans_repository.dart';
@@ -33,6 +35,7 @@ import 'package:eatvio_app/features/recipe/repositories/my_recipes_repository.da
 import 'package:eatvio_app/features/registration/repositories/registration_repository.dart';
 import 'package:eatvio_app/features/registration_v2/repositories/registration_repository_v2.dart';
 import 'package:eatvio_app/features/settings/repositories/service_repository.dart';
+import 'package:eatvio_app/features/video_calls/repositories/video_call_repository.dart';
 import 'package:get_it/get_it.dart';
 
 /// Регистрация всех Repository в системе внедрения зависимостей
@@ -49,6 +52,7 @@ class RepositoryRegistrations {
   static void _registerSingletonRepositories() {
     // Core repositories
     sl.registerLazySingleton<ChatRepository>(() => ChatRepository(chatService: sl()));
+    sl.registerLazySingleton<VideoCallRepository>(() => VideoCallRepository(videoCallService: sl()));
     sl.registerLazySingleton<FeedRepository>(() => FeedRepository(feedService: sl()));
     sl.registerLazySingleton<ProfileRepository>(() => ProfileRepository(profileService: sl()));
     sl.registerLazySingleton<CalendarRepository>(() => CalendarRepository(calendarService: sl()));
@@ -72,6 +76,8 @@ class RepositoryRegistrations {
     sl.registerLazySingleton<BlockedUsersRepository>(() => BlockedUsersRepository(blockedUserService: sl()));
     sl.registerLazySingleton<CommentsRepository>(() => CommentsRepository(service: sl()));
     sl.registerLazySingleton<NotificationSettingsRepository>(() => NotificationSettingsRepository(sl()));
+    sl.registerLazySingleton<SbpRepository>(() => SbpRepository(sbpService: sl()));
+    sl.registerLazySingleton<PaymentRepository>(() => PaymentRepository(chatService: sl()));
     sl.registerLazySingleton<PersonalDietSuggestionRepository>(() => PersonalDietSuggestionRepository(personalDietSuggestionService: sl()));
     sl.registerLazySingleton<RegistrationRepositoryV2>(() => RegistrationRepositoryV2(registrationService: sl()));
 

lib/core/di/service_registrations.dart

@@ -26,6 +26,7 @@ import 'package:eatvio_app/features/my_diets/services/my_diets_service.dart';
 import 'package:eatvio_app/features/my_finance/services/cards_service.dart';
 import 'package:eatvio_app/features/my_plans/services/my_plans_service.dart';
 import 'package:eatvio_app/features/notifications/service/notifications_service.dart';
+import 'package:eatvio_app/features/payment/services/sbp_service.dart';
 import 'package:eatvio_app/features/personal_diet_suggestion/services/personal_diet_suggestion_service.dart';
 import 'package:eatvio_app/features/plans/services/plan_service.dart';
 import 'package:eatvio_app/features/plans/services/plans_service.dart';
@@ -35,6 +36,9 @@ import 'package:eatvio_app/features/recipe/services/my_recipes_service.dart';
 import 'package:eatvio_app/features/registration/services/registration_service.dart';
 import 'package:eatvio_app/features/registration_v2/services/registration_service_v2.dart';
 import 'package:eatvio_app/features/settings/services/settings_service.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_callkit_coordinator.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_service.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_system_pip_coordinator.dart';
 import 'package:get_it/get_it.dart';
 
 /// Регистрация всех Service в системе внедрения зависимостей
@@ -50,6 +54,7 @@ class ServiceRegistrations {
   static void _registerSingletonServices() {
     // Core services
     sl.registerLazySingleton<ChatService>(() => ChatService(sl()));
+    sl.registerLazySingleton<VideoCallService>(() => VideoCallService(sl()));
     sl.registerLazySingleton<FeedService>(() => FeedService(sl()));
     sl.registerLazySingleton<ProfileService>(() => ProfileService(sl()));
     sl.registerLazySingleton<CalendarService>(() => CalendarService(sl()));
@@ -73,6 +78,12 @@ class ServiceRegistrations {
     sl.registerLazySingleton<CreatePlanService>(() => CreatePlanService(sl()));
     sl.registerLazySingleton<NotificationsService>(() => NotificationsService(sl()));
     sl.registerLazySingleton<FirebaseApi>(() => FirebaseApi(errorReporter: sl()));
+    sl.registerLazySingleton<VideoCallCallKitCoordinator>(
+      () => VideoCallCallKitCoordinator(firebaseApi: sl()),
+    );
+    sl.registerLazySingleton<VideoCallSystemPipCoordinator>(
+      () => VideoCallSystemPipCoordinator(),
+    );
     sl.registerLazySingleton<ResetPasswordService>(() => ResetPasswordService(sl()));
     sl.registerLazySingleton<BlockedUserService>(() => BlockedUserService(sl()));
     sl.registerLazySingleton<CommentsService>(() => CommentsService(sl()));
@@ -80,6 +91,7 @@ class ServiceRegistrations {
     sl.registerLazySingleton<ConsultantRatingService>(() => ConsultantRatingService(sl()));
     sl.registerLazySingleton<NotificationSettingsService>(() => NotificationSettingsService(sl()));
     sl.registerLazySingleton<ViewsService>(() => ViewsService(sl()));
+    sl.registerLazySingleton<SbpService>(() => const SbpServiceImpl());
     sl.registerLazySingleton<PersonalDietSuggestionService>(() => PersonalDietSuggestionService(sl()));
     sl.registerLazySingleton<RegistrationServiceV2>(() => RegistrationServiceV2(sl()));
 

lib/core/error_reporting/error_report_policy.dart

@@ -44,6 +44,7 @@ class ErrorReportPolicy {
       case DioExceptionType.connectionTimeout:
       case DioExceptionType.sendTimeout:
       case DioExceptionType.receiveTimeout:
+      case DioExceptionType.transformTimeout:
       case DioExceptionType.connectionError:
         return true;
       case DioExceptionType.unknown:

lib/core/firebase_api.dart

@@ -12,6 +12,7 @@ import 'package:eatvio_app/core/token_storage.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/services.dart' show MethodChannel, PlatformException;
 import 'package:eatvio_app/core/error_reporting/error_reporter.dart';
+import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart';
 
 class FirebaseApi {
   final ErrorReporter _errorReporter;
@@ -87,6 +88,9 @@ class FirebaseApi {
             throw TimeoutException('registerPushToken timeout');
           },
         );
+        if (Platform.isIOS) {
+          await _registerIosVoipPushToken();
+        }
       } catch (e, st) {
         log(e.toString(), stackTrace: st);
         await _errorReporter.report(e, st, origin: 'FirebaseApi');
@@ -95,6 +99,88 @@ class FirebaseApi {
     }
   }
 
+
+  Future<void> unregisterPushTokens() async {
+    if (!await TokenStorage.haveTokenInStorage()) return;
+    try {
+      await unregisterPushToken();
+    } catch (_) {}
+    if (Platform.isIOS) {
+      try {
+        await _unregisterIosVoipPushToken();
+      } catch (_) {}
+    }
+  }
+
+  Future<void> unregisterPushToken() async {
+    if (!await TokenStorage.haveTokenInStorage()) return;
+    try {
+      final isHuawei = Platform.isAndroid ? await _isHuaweiDevice() : false;
+      final platform = Platform.isIOS ? 'ios' : (isHuawei ? 'huawei' : 'android');
+      final token = (await getToken()) ?? '';
+      await sl<Dio>().post(
+        '/api/profile/notification/token/unregister',
+        data: {
+          'platform': platform,
+          'token': token,
+        },
+      ).timeout(
+        const Duration(seconds: 10),
+        onTimeout: () {
+          throw TimeoutException('unregisterPushToken timeout');
+        },
+      );
+    } catch (e, st) {
+      log(e.toString(), stackTrace: st);
+      await _errorReporter.report(e, st, origin: 'FirebaseApi');
+    }
+  }
+
+  Future<void> _registerIosVoipPushToken() async {
+    try {
+      final token = (await FlutterCallkitIncoming.getDevicePushTokenVoIP())?.trim();
+      if (token == null || token.isEmpty) return;
+
+      final deviceInfo = DeviceInfoPlugin();
+      await sl<Dio>().post(
+        '/api/profile/notification/token/voip/register',
+        data: {
+          'platform': 'ios',
+          'hw_id': (await deviceInfo.iosInfo).identifierForVendor,
+          'token': token,
+        },
+      ).timeout(
+        const Duration(seconds: 10),
+        onTimeout: () {
+          throw TimeoutException('registerPushToken voip timeout');
+        },
+      );
+    } catch (e, st) {
+      log(e.toString(), stackTrace: st);
+      await _errorReporter.report(e, st, origin: 'FirebaseApi');
+    }
+  }
+
+  Future<void> _unregisterIosVoipPushToken() async {
+    try {
+      final token = (await FlutterCallkitIncoming.getDevicePushTokenVoIP())?.trim() ?? '';
+      await sl<Dio>().post(
+        '/api/profile/notification/token/voip/unregister',
+        data: {
+          'token': token,
+        },
+      ).timeout(
+        const Duration(seconds: 10),
+        onTimeout: () {
+          throw TimeoutException('unregisterPushToken voip timeout');
+        },
+      );
+    } catch (e, st) {
+      log(e.toString(), stackTrace: st);
+      await _errorReporter.report(e, st, origin: 'FirebaseApi');
+    }
+  }
+
   Future<bool> _isHuaweiDevice() async {
     if (!Platform.isAndroid) return false;
     try {

lib/core/notifications/push_navigation_handler.dart

@@ -1,6 +1,13 @@
 import 'dart:developer' as developer;
 
+import 'dart:async';
+
 import 'package:eatvio_app/core/app_router.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_ended_push_handler.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_ended_push_payload.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_notification_navigator.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_push_payload.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
@@ -50,7 +57,37 @@ class PushNavigationHandler {
   }
 
   static void _handleMessageInternal(RemoteMessage message, {required String source}) {
-    final data = message.data;
+    final data = Map<String, dynamic>.from(message.data);
+
+    final endedPayload = VideoCallEndedPushPayload.tryParse(data);
+    if (endedPayload != null) {
+      developer.log(
+        'PushNavigationHandler: dismiss incoming call UI, source=$source',
+        name: 'PushNavigationHandler',
+      );
+      unawaited(VideoCallEndedPushHandler.dismissIncomingCallUi());
+      return;
+    }
+
+    final videoCallPayload = VideoCallPushPayload.tryParse(data);
+    if (videoCallPayload != null) {
+      developer.log(
+        'PushNavigationHandler: opening incoming video call, source=$source, conversation=${videoCallPayload.conversationUuid}',
+        name: 'PushNavigationHandler',
+      );
+      unawaited(
+        VideoCallNotificationNavigator.openIncomingCall(
+          conversationUuid: videoCallPayload.conversationUuid,
+          counterpartName: videoCallPayload.counterpartName,
+          counterpartAvatarUrl: videoCallPayload.counterpartAvatarUrl,
+          localParticipantName: videoCallPayload.localParticipantName,
+          counterpartIsConsultant: videoCallPayload.counterpartIsConsultant,
+          entryMode: VideoCallEntryMode.incomingAccepted,
+        ),
+      );
+      return;
+    }
+
     final actionUrl = data['action_url'] as String?;
     if (actionUrl == null || actionUrl.isEmpty) {
       developer.log('PushNavigationHandler: no action_url in message data, source=$source, data=$data', name: 'PushNavigationHandler');

lib/core/routing/other_routes.dart

@@ -14,6 +14,8 @@ import 'package:eatvio_app/features/diary/presentation/pages/diary_screen.dart';
 import 'package:eatvio_app/features/chat/presentation/pages/empty_chat_screen.dart';
 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';
@@ -210,13 +212,23 @@ class OtherRoutes {
         name: 'chatScreen',
         builder: (context, state) {
           final uuidFromQuery = state.uri.queryParameters['uuid'];
-          if (uuidFromQuery != null) {
-            return ChatScreen(uuid: uuidFromQuery, sendInitialMessage: false);
+          final orderIdFromQuery = state.uri.queryParameters['orderId'];
+          if (uuidFromQuery != null || orderIdFromQuery != null) {
+            return ChatScreen(
+              uuid: uuidFromQuery,
+              orderId: orderIdFromQuery,
+              sendInitialMessage: false,
+            );
           }
           final data = state.extra as Map<String, dynamic>;
-          final uuid = data['uuid'] as String;
+          final uuid = data['uuid'] as String?;
+          final orderId = data['orderId'] as String?;
           final sendInitialMessage = data['sendInitialMessage'] as bool?;
-          return ChatScreen(uuid: uuid, sendInitialMessage: sendInitialMessage);
+          return ChatScreen(
+            uuid: uuid,
+            orderId: orderId,
+            sendInitialMessage: sendInitialMessage,
+          );
         },
       ),
       GoRoute(
@@ -224,6 +236,33 @@ class OtherRoutes {
         name: 'emptyChatScreen',
         builder: (context, state) => EmptyChatScreen(user: state.extra as ProfileModel),
       ),
+      GoRoute(
+        path: RouteConstants.videoCallScreen,
+        name: VideoCallScreen.name,
+        builder: (context, state) {
+          final extra = state.extra;
+          if (extra is Map<String, dynamic>) {
+            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()?,
+            );
+          }
+          final uuid = state.uri.queryParameters['uuid'];
+          if (uuid != null) {
+            return VideoCallScreen(conversationUuid: uuid);
+          }
+          throw ArgumentError('VideoCallScreen: pass extra Map with conversationUuid or query uuid');
+        },
+      ),
 
       // Consultant routes
       GoRoute(path: RouteConstants.becomeConsultantScreen, name: 'becomeConsultantScreen', builder: (context, state) => const BecomeConsultantScreen()),
@@ -307,3 +346,11 @@ 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/routing/route_constants.dart

@@ -53,6 +53,7 @@ class RouteConstants {
   static const String photoViewScreen = '/photo-view-screen';
   static const String chatScreen = '/chat-screen';
   static const String emptyChatScreen = '/empty-chat-screen';
+  static const String videoCallScreen = '/video-call-screen';
   static const String glossaryScreen = '/glossary-screen';
   static const String blockedUsersScreen = '/blocked-users-screen';
   static const String notificationsSettingsScreen = '/notifications-settings-screen';

lib/core/theme/custom_text_style.dart

@@ -80,6 +80,48 @@ class CustomTextStyles {
   static TextStyle get titleSmallSecondaryContainer_1 => theme.textTheme.titleSmall!.copyWith(color: theme.colorScheme.secondaryContainer);
 
   static TextStyle get titleSmallSegoeUIOnPrimary => theme.textTheme.titleSmall!.segoeUI.copyWith(color: theme.colorScheme.onPrimary);
+
+  static TextStyle get videoCallFlowPlaceholderTitle => theme.textTheme.headlineSmall!.copyWith(
+        fontWeight: FontWeight.w600,
+        height: 32 / 24,
+        color: appTheme.black900,
+      );
+
+  static TextStyle get videoCallFlowPlaceholderConnectionLostBody => theme.textTheme.bodyLarge!.copyWith(
+        fontWeight: FontWeight.w400,
+        fontSize: 16,
+        height: 24 / 16,
+        letterSpacing: 0.5,
+        color: appTheme.black900,
+      );
+
+  static TextStyle get videoCallFlowPlaceholderConnectingSubtitle => theme.textTheme.bodyMedium!.copyWith(
+        fontSize: 13,
+        fontWeight: FontWeight.w400,
+        height: 24 / 13,
+        letterSpacing: 0.5,
+        color: appTheme.black900,
+      );
+
+  static TextStyle get videoCallFlowPlaceholderReconnectingSubtitle => theme.textTheme.bodyMedium!.copyWith(
+        fontSize: 14,
+        fontWeight: FontWeight.w500,
+        height: 24 / 14,
+        color: appTheme.gray600,
+      );
+
+  static TextStyle get videoCallFlowPlaceholderConnectionLostDetail => theme.textTheme.bodyMedium!.copyWith(
+        fontSize: 13,
+        fontWeight: FontWeight.w400,
+        height: 1.35,
+        color: appTheme.red,
+      );
+
+  static TextStyle get videoCallFlowPlaceholderFilledButtonLabel => theme.textTheme.titleMedium!.copyWith(
+        fontSize: 16,
+        fontWeight: FontWeight.w600,
+        color: appTheme.whiteA700,
+      );
 }
 
 extension on TextStyle {

lib/core/theme/theme_helper.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
-
 /// Helper class for managing themes and colors.
 class ThemeHelper {
   // The current app theme
@@ -200,6 +199,12 @@ class PrimaryColors {
   Color get grey7B => const Color(0xFF7B7B7B);
 
   Color get greyD9 => const Color(0xFFD9D9D9);
+
+  Color get videoCallControlOffBackground => const Color(0xFFED2F2F);
+
+  Color get videoCallPipIconBackground => const Color(0xFF565656);
+
+  Color get videoCallNoticeBannerBackground => const Color(0xFF9D9D9D);
 }
 
 PrimaryColors get appTheme => ThemeHelper().themeColor();

lib/core/websockets/ws_manager.dart

@@ -26,6 +26,13 @@ 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;
@@ -175,6 +182,107 @@ 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();
@@ -193,6 +301,19 @@ 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();
@@ -204,6 +325,7 @@ class WsManager {
     client = null;
     userId = null;
     _privateDirectChatChannel?.unsubscribe();
+    unsubscribePresenceDirectChatChannel();
     _privateMessagesChannel?.unsubscribe();
     _privateNotificationChannel?.unsubscribe();
     _privateDirectChatChannel = null;
@@ -211,3 +333,13 @@ 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') String? type,
+    @JsonKey(name: 'type', unknownEnumValue: ChatMessageType.unknown) ChatMessageType? type,
     @Default(MessageState.sent) @JsonKey(includeToJson: false, includeFromJson: false) MessageState messageState,
     @Default(null) @JsonKey(includeToJson: false, includeFromJson: false) String? uuid,
   }) = _ChatMessageModel;
@@ -42,3 +42,22 @@ abstract class ChatMessageModel with _$ChatMessageModel {
 }
 
 enum MessageState { loading, sent, error }
+
+enum ChatMessageType {
+  @JsonValue('text')
+  text,
+  @JsonValue('system')
+  system,
+  @JsonValue('attachment')
+  attachment,
+  @JsonValue('image')
+  image,
+  @JsonValue('plan_order')
+  planOrder,
+  @JsonValue('video_call_started')
+  videoCallStarted,
+  @JsonValue('video_call_ended')
+  videoCallEnded,
+  @JsonValue('unknown')
+  unknown;
+}

lib/features/chat/models/chat_room_pagination_model.dart

@@ -54,6 +54,8 @@ abstract class ChatUser with _$ChatUser {
     @JsonKey(name: "name") required String name,
     @JsonKey(name: "profile_photo_path") required String? profilePhotoPath,
     @JsonKey(name: "profile_photo_url") required String profilePhotoUrl,
+    @Default(false) @JsonKey(name: 'is_online') bool isOnline,
+    @Default('') @JsonKey(name: 'last_seen_text') String lastSeenText,
   }) = _ChatUser;
 
   factory ChatUser.fromJson(Map<String, dynamic> json) => _$ChatUserFromJson(json);

lib/features/chat/models/chat_user_model.dart

@@ -10,6 +10,8 @@ abstract class ChatUserModel with _$ChatUserModel {
     required String name,
     required String slug,
     @JsonKey(name: 'profile_photo_url') String? profilePhotoUrl,
+    @Default(false) @JsonKey(name: 'is_online') bool isOnline,
+    @Default('') @JsonKey(name: 'last_seen_text') String lastSeenText,
   }) = _ChatUserModel;
 
   factory ChatUserModel.fromJson(Map<String, Object?> json) => _$ChatUserModelFromJson(json);

lib/features/chat/models/order_id_to_conversation_model.dart

@@ -0,0 +1,15 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'order_id_to_conversation_model.freezed.dart';
+part 'order_id_to_conversation_model.g.dart';
+
+@freezed
+abstract class OrderIdToConversationModel with _$OrderIdToConversationModel {
+  factory OrderIdToConversationModel({
+    @JsonKey(name: 'chosen_plan_id') required int chosenPlanId,
+    @JsonKey(name: 'conversation_uuid') required String conversationUuid,
+  }) = _OrderIdToConversationModel;
+
+  factory OrderIdToConversationModel.fromJson(Map<String, dynamic> json) =>
+      _$OrderIdToConversationModelFromJson(json);
+}

lib/features/chat/models/payment_model.dart

@@ -5,10 +5,12 @@ part 'payment_model.g.dart';
 
 @freezed
 abstract class PaymentModel with _$PaymentModel {
-
   factory PaymentModel({
     @JsonKey(name: 'checkout_url') required String paymentUrl,
+    @JsonKey(name: 'order_id') String? orderId,
+    @JsonKey(name: 'payment_provider') String? paymentProvider,
   }) = _PaymentModel;
 
-  factory PaymentModel.fromJson(Map<String, dynamic> json) => _$PaymentModelFromJson(json);
-}
+  factory PaymentModel.fromJson(Map<String, dynamic> json) =>
+      _$PaymentModelFromJson(json);
+}

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

@@ -16,6 +16,7 @@ import 'package:eatvio_app/features/chat/models/plan_complain_model.dart';
 import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.dart';
 import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
 import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
+import 'package:eatvio_app/features/chat/utils/chat_counterpart_utils.dart';
 import 'package:eatvio_app/features/my_finance/models/card_model.dart';
 import 'package:eatvio_app/features/my_finance/repositories/cards_repository.dart';
 import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
@@ -34,6 +35,8 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
   late int lastPage;
   bool isLoading = false;
   Timer? _timer;
+  String? _activeChatUuid;
+  void Function(bool isOnline)? _presenceOnlineListener;
   var uuid = const Uuid();
 
   ChatRoomCubit({required this.chatRepository, required this.wsManager, required this.cardsRepository}) : super(const ChatRoomState.loading());
@@ -91,17 +94,38 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     }
   }
 
-  Future<void> initChat(String uuid, {bool sendInitialMessage = false}) async {
+  /// Инициализирует чат по [uuid] либо по [orderId] (resolve → conversation_uuid).
+  ///
+  /// При наличии [orderId] сначала вызывается
+  /// `GET /api/consultation/resolve/order_id_to_conversation/{orderId}`.
+  ///
+  /// Возвращает conversation uuid, которым инициализировали чат (для reload без повторного resolve).
+  Future<String?> initChat(String? uuid, {String? orderId, bool sendInitialMessage = false}) async {
     try {
       emit(const ChatRoomState.loading());
-      final chatRoom = await chatRepository.getChatRoom(uuid);
-      ChosenPlanModel? chosenPlan;
-      if (chatRoom.chosenPlanId != null) {
-        chosenPlan = await chatRepository.getChosenPlan(id: chatRoom.chosenPlanId!);
+
+      String? resolvedUuid = uuid;
+      int? resolvedChosenPlanId;
+
+      if (orderId != null && orderId.isNotEmpty) {
+        final resolved = await chatRepository.resolveOrderIdToConversation(orderId: orderId);
+        resolvedUuid = resolved.conversationUuid;
+        resolvedChosenPlanId = resolved.chosenPlanId;
       }
-      final chatMessages = await chatRepository.getChatMessages(uuid, currentPage);
+
+      if (resolvedUuid == null || resolvedUuid.isEmpty) {
+        throw ArgumentError('initChat requires uuid or orderId');
+      }
+
+      final chatRoom = await chatRepository.getChatRoom(resolvedUuid);
+      ChosenPlanModel? chosenPlan;
+      final planId = resolvedChosenPlanId ?? chatRoom.chosenPlanId;
+      if (planId != null) {
+        chosenPlan = await chatRepository.getChosenPlan(id: planId);
+      }
+      final chatMessages = await chatRepository.getChatMessages(resolvedUuid, currentPage);
       lastPage = chatMessages.meta.lastPage;
-      await _subscribeToChatChannel(uuid: uuid, chatId: chatRoom.id);
+      await _subscribeToChatChannel(uuid: resolvedUuid, chatId: chatRoom.id);
       emit(
         ChatRoomState.loaded(
           chatRoom: chatRoom.copyWith(chosenPlan: chosenPlan),
@@ -115,6 +139,7 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
       if (chosenPlan?.consultantId == chatRoom.users.sender.id) {
         await checkCards();
       }
+      return resolvedUuid;
     } catch (e, st) {
       await reportFrom(e, st, this);
       log(e.toString());
@@ -122,6 +147,7 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
       messagesSubscription?.cancel();
       wsManager.unsubscribeDirectChatChannel();
       emit(const ChatRoomState.error(errorMessage: 'Ошибка получеия данных'));
+      return null;
     }
   }
 
@@ -170,8 +196,10 @@ 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));
@@ -197,6 +225,118 @@ 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();
@@ -297,7 +437,7 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     try {
       final planId = (state as ChatRoomStateLoaded).chatRoom.chosenPlan?.id;
       if (planId == null) return null;
-      final paymentModel = await chatRepository.getPaymentLink(id: planId);
+      final paymentModel = await chatRepository.getPaymentLink(id: planId, paymentProvider: 'alfa-bank');
       return paymentModel.paymentUrl;
     } catch (e, st) {
       await reportFrom(e, st, this);
@@ -337,6 +477,10 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
 
   @override
   Future<void> close() async {
+    if (_presenceOnlineListener != null) {
+      wsManager.removePresenceDirectChatListener(_presenceOnlineListener!);
+      _presenceOnlineListener = null;
+    }
     wsManager.unsubscribeDirectChatChannel();
     _timer?.cancel();
     messagesSubscription?.cancel();
@@ -435,3 +579,5 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     }
   }
 }
+
+enum _ChatCounterpartField { sender, receiver }

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

@@ -13,17 +13,24 @@ 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';
 import 'package:eatvio_app/features/user_details/presentation/user_details_screen.dart';
+import 'package:eatvio_app/features/video_calls/presentation/pages/video_call_screen.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/cupertino.dart';
@@ -35,10 +42,11 @@ import 'package:intl/intl.dart';
 import 'package:visibility_detector/visibility_detector.dart';
 
 class ChatScreen extends StatefulWidget {
-  final String uuid;
+  final String? uuid;
+  final String? orderId;
   final bool? sendInitialMessage;
 
-  const ChatScreen({required this.uuid, super.key, required this.sendInitialMessage});
+  const ChatScreen({this.uuid, this.orderId, super.key, required this.sendInitialMessage});
 
   @override
   State<ChatScreen> createState() => _ChatScreenState();
@@ -54,6 +62,11 @@ class _ChatScreenState extends State<ChatScreen> {
   late AppLifecycleListener _listener;
   List<File> pickedFiles = [];
 
+  /// Conversation uuid после успешного init (в т.ч. после resolve по orderId).
+  String? _effectiveUuid;
+
+  String? get conversationUuid => _effectiveUuid ?? widget.uuid;
+
   void _onHide() {
     chatRoomCubit.cancelTimer();
   }
@@ -63,26 +76,41 @@ class _ChatScreenState extends State<ChatScreen> {
     chatRoomCubit.setTimer();
   }
 
+  Future<void> _initChatRoom() async {
+    final uuid = await chatRoomCubit.initChat(
+      conversationUuid,
+      orderId: _effectiveUuid == null ? widget.orderId : null,
+      sendInitialMessage: widget.sendInitialMessage ?? false,
+    );
+    if (uuid != null && mounted) {
+      setState(() => _effectiveUuid = uuid);
+    }
+  }
+
   @override
   void didUpdateWidget(ChatScreen oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (oldWidget.uuid != widget.uuid) {
-      chatRoomCubit.initChat(widget.uuid, sendInitialMessage: widget.sendInitialMessage ?? false);
+    if (oldWidget.uuid != widget.uuid || oldWidget.orderId != widget.orderId) {
+      _effectiveUuid = widget.uuid;
+      _initChatRoom();
     }
   }
 
   @override
   void initState() {
     super.initState();
+    _effectiveUuid = widget.uuid;
     scrollController.addListener(_onScroll);
-    chatRoomCubit.initChat(widget.uuid, sendInitialMessage: widget.sendInitialMessage ?? false);
+    _initChatRoom();
     chatRoomCubit.setTimer();
     _listener = AppLifecycleListener(onHide: _onHide, onResume: _onResume);
   }
 
   void _onScroll() {
+    final uuid = conversationUuid;
+    if (uuid == null) return;
     if (scrollController.offset >= scrollController.position.maxScrollExtent && !scrollController.position.outOfRange) {
-      chatRoomCubit.loadNextPage(widget.uuid);
+      chatRoomCubit.loadNextPage(uuid);
     }
   }
 
@@ -116,7 +144,7 @@ class _ChatScreenState extends State<ChatScreen> {
                   },
                 ),
               ),
-              body: DataErrorWidget(onReload: () => chatRoomCubit.initChat(widget.uuid)),
+              body: DataErrorWidget(onReload: _initChatRoom),
             );
           } else {
             return Scaffold(
@@ -140,6 +168,7 @@ class _ChatScreenState extends State<ChatScreen> {
   }
 
   Scaffold _buildChat(BuildContext context, ChatRoomStateLoaded state) {
+    final chatCounterpart = resolveChatCounterpart(users: state.chatRoom.users, currentUserId: sl<WsManager>().userId);
     final chosenPlan = state.chatRoom.chosenPlan;
     final amIConsultant = chosenPlan?.consultantId == state.chatRoom.users.sender.id;
     final showUserDetailsButton = [
@@ -216,23 +245,41 @@ class _ChatScreenState extends State<ChatScreen> {
                   ),
                 ),
               const SizedBox(width: 16),
-              Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(state.chatRoom.users.receiver.name, style: CustomTextStyles.titleSmallBold.copyWith(color: PrimaryColors().black)),
-                  AnimatedCrossFade(
-                    firstChild: Text('Печатает...', style: CustomTextStyles.bodySmallMulishPrimary),
-                    firstCurve: Curves.easeIn,
-                    secondCurve: Curves.easeOut,
-                    secondChild: const SizedBox.shrink(),
-                    crossFadeState: state.isTyping ? CrossFadeState.showFirst : CrossFadeState.showSecond,
-                    duration: const Duration(milliseconds: 150),
-                  ),
-                ],
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      state.chatRoom.users.receiver.name,
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                      style: CustomTextStyles.titleSmallBold.copyWith(color: PrimaryColors().black),
+                    ),
+                    AnimatedCrossFade(
+                      firstChild: Text('Печатает...', maxLines: 1, overflow: TextOverflow.ellipsis, style: CustomTextStyles.bodySmallMulishPrimary),
+                      firstCurve: Curves.easeIn,
+                      secondCurve: Curves.easeOut,
+                      secondChild: ChatUserOnlineStatusLine(
+                        isOnline: chatCounterpart.isOnline,
+                        lastSeenText: chatCounterpart.lastSeenText,
+                        style: CustomTextStyles.bodySmallMulishPrimary,
+                        showOnlineDot: false,
+                      ),
+                      crossFadeState: state.isTyping ? CrossFadeState.showFirst : CrossFadeState.showSecond,
+                      duration: const Duration(milliseconds: 150),
+                    ),
+                  ],
+                ),
               ),
             ],
           ),
         ),
+        actions: [
+          Padding(
+            padding: const EdgeInsetsDirectional.only(end: 8),
+            child: _ChatHeaderVideoCallButton(onPressed: () => _openVideoCall(context, state, chatCounterpart)),
+          ),
+        ],
       ),
       body: SafeArea(
         child: Stack(
@@ -265,7 +312,7 @@ class _ChatScreenState extends State<ChatScreen> {
                                   index + 1 == state.chatMessages.length) {
                                 final isCurrentUserAuthor = state.chatRoom.users.receiver.id != state.chatMessages[index].authorId;
                                 final message = state.chatMessages[index];
-                                final isPlanOrderMessage = message.type == 'plan_order';
+                                final isPlanOrderMessage = message.type == ChatMessageType.planOrder;
 
                                 PacketOptions? messageOption;
                                 if (isPlanOrderMessage && chosenPlan != null) {
@@ -306,18 +353,13 @@ class _ChatScreenState extends State<ChatScreen> {
                                           });
                                         }
                                       },
-                                      child: ChatBubbleWidget(
-                                        isRead: message.isRead,
-                                        sendTime: message.updatedAt,
-                                        text: message.data.trim(),
-                                        isCurrentUser: isCurrentUserAuthor,
-                                        mediaData: message.mediaData ?? [],
-                                        messageState: message.messageState,
-                                        messageUuid: message.uuid ?? '',
-                                        userSlug: state.chatRoom.users.receiver.slug,
-                                        messageType: message.type,
-                                        isConsultant: amIConsultant,
-                                        urlsMediaInfo: message.urlsMediaInfo,
+                                      child: _buildMessageBubble(
+                                        context: context,
+                                        state: state,
+                                        chatCounterpart: chatCounterpart,
+                                        isCurrentUserAuthor: isCurrentUserAuthor,
+                                        message: message,
+                                        amIConsultant: amIConsultant,
                                       ),
                                     ),
                                   ],
@@ -325,7 +367,7 @@ class _ChatScreenState extends State<ChatScreen> {
                               }
                               final isCurrentUserAuthor = state.chatRoom.users.receiver.id != state.chatMessages[index].authorId;
                               final message = state.chatMessages[index];
-                              final isPlanOrderMessage = message.type == 'plan_order';
+                              final isPlanOrderMessage = message.type == ChatMessageType.planOrder;
 
                               PacketOptions? messageOption;
                               if (isPlanOrderMessage && chosenPlan != null) {
@@ -362,18 +404,13 @@ class _ChatScreenState extends State<ChatScreen> {
                                         });
                                       }
                                     },
-                                    child: ChatBubbleWidget(
-                                      isRead: message.isRead,
-                                      sendTime: message.updatedAt,
-                                      text: message.data.trim(),
-                                      isCurrentUser: isCurrentUserAuthor,
-                                      mediaData: message.mediaData ?? [],
-                                      messageState: message.messageState,
-                                      messageUuid: message.uuid ?? '',
-                                      userSlug: state.chatRoom.users.receiver.slug,
-                                      messageType: message.type,
-                                      isConsultant: amIConsultant,
-                                      urlsMediaInfo: message.urlsMediaInfo,
+                                    child: _buildMessageBubble(
+                                      context: context,
+                                      state: state,
+                                      chatCounterpart: chatCounterpart,
+                                      isCurrentUserAuthor: isCurrentUserAuthor,
+                                      message: message,
+                                      amIConsultant: amIConsultant,
                                     ),
                                   ),
                                 ],
@@ -740,4 +777,80 @@ 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 {
+  const _ChatHeaderVideoCallButton({required this.onPressed});
+
+  final VoidCallback onPressed;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final tooltipMessage = S.maybeOf(context)?.video_call;
+    final button = Material(
+      color: theme.colorScheme.onPrimary,
+      borderRadius: BorderRadius.circular(20),
+      elevation: 0,
+      child: InkWell(
+        onTap: onPressed,
+        customBorder: const CircleBorder(),
+        child: SizedBox(
+          width: 40,
+          height: 40,
+          child: Center(child: Icon(Icons.videocam_rounded, color: appTheme.blueA400, size: 18)),
+        ),
+      ),
+    );
+    if (tooltipMessage == null || tooltipMessage.isEmpty) {
+      return button;
+    }
+    return Tooltip(message: tooltipMessage, child: button);
+  }
 }

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

@@ -39,7 +39,7 @@ class ChatBubbleWidget extends StatelessWidget {
   final MessageState messageState;
   final String messageUuid;
   final String userSlug;
-  final String? messageType;
+  final ChatMessageType? messageType;
   final bool? isConsultant;
   final List<Map<String, dynamic>>? urlsMediaInfo;
   @override
@@ -182,33 +182,36 @@ class ChatBubbleWidget extends StatelessWidget {
                                     }
                                   }
 
-                                  return ListTile(
-                                    contentPadding: const EdgeInsets.all(4),
-                                    horizontalTitleGap: 8,
-                                    onTap: () async {
-                                      if (mediaItem is File) {
-                                        // Для локальных файлов используем file:// URI
-                                        final fileUri = Uri.file(mediaItem.path);
-                                        if (await canLaunchUrl(fileUri)) {
-                                          await launchUrl(fileUri, mode: LaunchMode.externalApplication);
+                                  return Material(
+                                    color: Colors.transparent,
+                                    child: ListTile(
+                                      contentPadding: const EdgeInsets.all(4),
+                                      horizontalTitleGap: 8,
+                                      onTap: () async {
+                                        if (mediaItem is File) {
+                                          // Для локальных файлов используем file:// URI
+                                          final fileUri = Uri.file(mediaItem.path);
+                                          if (await canLaunchUrl(fileUri)) {
+                                            await launchUrl(fileUri, mode: LaunchMode.externalApplication);
+                                          }
+                                        } else {
+                                          // Для URL файлов используем обычный launchUrl
+                                          final urlString = mediaItem.toString();
+                                          final uri = urlString.startsWith('http://') || urlString.startsWith('https://')
+                                              ? Uri.parse(urlString)
+                                              : Uri.parse('https://$urlString');
+                                          if (await canLaunchUrl(uri)) {
+                                            await launchUrl(uri, mode: LaunchMode.externalApplication);
+                                          }
                                         }
-                                      } else {
-                                        // Для URL файлов используем обычный launchUrl
-                                        final urlString = mediaItem.toString();
-                                        final uri = urlString.startsWith('http://') || urlString.startsWith('https://')
-                                            ? Uri.parse(urlString)
-                                            : Uri.parse('https://$urlString');
-                                        if (await canLaunchUrl(uri)) {
-                                          await launchUrl(uri, mode: LaunchMode.externalApplication);
-                                        }
-                                      }
-                                    },
-                                    leading: const Icon(Icons.file_copy_outlined, color: Colors.black),
-                                    trailing: const Icon(Icons.download_outlined, color: Colors.black),
-                                    title: Text(
-                                      fileName,
-                                      maxLines: 2,
-                                      style: const TextStyle(color: Colors.black, fontSize: 12, overflow: TextOverflow.ellipsis),
+                                      },
+                                      leading: const Icon(Icons.file_copy_outlined, color: Colors.black),
+                                      trailing: const Icon(Icons.download_outlined, color: Colors.black),
+                                      title: Text(
+                                        fileName,
+                                        maxLines: 2,
+                                        style: const TextStyle(color: Colors.black, fontSize: 12, overflow: TextOverflow.ellipsis),
+                                      ),
                                     ),
                                   );
                                 }
@@ -255,7 +258,7 @@ class ChatBubbleWidget extends StatelessWidget {
   }
 
   String _getDisplayText() {
-    if (messageType == 'plan_order') {
+    if (messageType == ChatMessageType.planOrder) {
       if (isConsultant == true) {
         // Текст для консультанта
         return '1. Уточните у подопечного его цели и пожелания\n'

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

@@ -0,0 +1,70 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+
+class ChatUserOnlineStatusLine extends StatelessWidget {
+  const ChatUserOnlineStatusLine({
+    super.key,
+    required this.isOnline,
+    required this.lastSeenText,
+    this.style,
+    this.showOnlineDot = true,
+  });
+
+  final bool isOnline;
+  final String lastSeenText;
+  final TextStyle? style;
+  final bool showOnlineDot;
+
+  @override
+  Widget build(BuildContext context) {
+    final textStyle = style ??
+        CustomTextStyles.bodySmallMulishBlack900.copyWith(height: 14 / 12);
+
+    if (isOnline) {
+      if (!showOnlineDot) {
+        return Text(
+          S.of(context).video_call_status_online,
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: textStyle,
+        );
+      }
+      return Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Container(
+            width: 8,
+            height: 8,
+            decoration: BoxDecoration(
+              color: appTheme.greenA700,
+              shape: BoxShape.circle,
+            ),
+          ),
+          const SizedBox(width: 8),
+          Flexible(
+            child: Text(
+              S.of(context).video_call_status_online,
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+              style: textStyle,
+            ),
+          ),
+        ],
+      );
+    }
+
+    final trimmedLastSeen = lastSeenText.trim();
+    if (trimmedLastSeen.isEmpty) {
+      return const SizedBox.shrink();
+    }
+
+    return Text(
+      trimmedLastSeen,
+      maxLines: 1,
+      overflow: TextOverflow.ellipsis,
+      style: textStyle,
+    );
+  }
+}

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

@@ -2,15 +2,14 @@ import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/core/widgets/bottom_sheet_with_blur.dart';
 import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
-import 'package:eatvio_app/core/widgets/loader.dart';
 import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart';
 import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.dart';
-import 'package:eatvio_app/features/chat/presentation/pages/payment_screen.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/chose_plan_date_widget.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/complete_plan_bottom_sheet.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/plan_complain_bottom_sheet.dart';
 import 'package:eatvio_app/features/my_diets/presentation/my_diets_screen.dart';
 import 'package:eatvio_app/features/my_finance/presentation/pages/card_settings.dart';
+import 'package:eatvio_app/features/payment/presentation/payment_flow.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -29,7 +28,6 @@ class NotificationBanner extends StatefulWidget {
 }
 
 class _NotificationBannerState extends State<NotificationBanner> {
-  bool isLoading = false;
   @override
   Widget build(BuildContext context) {
     final size = MediaQuery.sizeOf(context);
@@ -54,13 +52,7 @@ class _NotificationBannerState extends State<NotificationBanner> {
                   padding: EdgeInsets.only(top: 12, right: 8, left: 12),
                   child: _StarIcon(),
                 ),
-              if (isLoading)
-                const Padding(
-                  padding: EdgeInsets.only(left: 40, top: 24),
-                  child: Loader(),
-                )
-              else
-                Padding(
+              Padding(
                   padding: const EdgeInsets.only(top: 16),
                   child: Column(
                     mainAxisSize: MainAxisSize.min,
@@ -111,21 +103,10 @@ class _NotificationBannerState extends State<NotificationBanner> {
                           ),
                           const SizedBox(height: 12),
                           GestureDetector(
-                            onTap: () async {
+                            onTap: () {
                               final planId = (context.read<ChatRoomCubit>().state as ChatRoomStateLoaded).chatRoom.chosenPlan?.id;
-                              setState(() {
-                                isLoading = true;
-                              });
-                              final paymentLink = await context.read<ChatRoomCubit>().getPaymentLink();
-                              setState(() {
-                                isLoading = false;
-                              });
-                              if (paymentLink != null && planId != null) {
-                                if (!context.mounted) return;
-                                GoRouter.of(context).pushReplacement(
-                                  PaymentScreen.path,
-                                  extra: {'url': paymentLink, 'planId': planId},
-                                );
+                              if (planId != null) {
+                                showConsultationPaymentFlow(context, planId: planId);
                               }
                             },
                             child: Text(s.pay, style: TextStyles.textLSemibold.copyWith(color: appTheme.blueA400)),

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

@@ -0,0 +1,103 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/utils/date_time_utils.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+class VideoCallChatMessageWidget extends StatelessWidget {
+  const VideoCallChatMessageWidget({
+    super.key,
+    required this.text,
+    required this.sendTime,
+    required this.onVideoCallPressed,
+  });
+
+  final String text;
+  final DateTime sendTime;
+  final VoidCallback onVideoCallPressed;
+
+  @override
+  Widget build(BuildContext context) {
+    final size = MediaQuery.sizeOf(context);
+    final textStyle = TextStyles.textFS13FW400.copyWith(color: appTheme.black, fontSize: 16);
+
+    return SizedBox(
+      width: size.width,
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(16, 10, 64, 4),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.end,
+          children: [
+            Container(
+              constraints: BoxConstraints(maxWidth: size.width * 0.7),
+              decoration: BoxDecoration(
+                color: appTheme.gray60004,
+                borderRadius: const BorderRadius.horizontal(
+                  left: Radius.circular(16),
+                  right: Radius.circular(24),
+                ),
+              ),
+              child: Padding(
+                padding: const EdgeInsets.fromLTRB(8, 8, 16, 8),
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    if (text.isNotEmpty)
+                      Flexible(
+                        child: Text(text, style: textStyle),
+                      ),
+                    if (text.isNotEmpty) const SizedBox(width: 8),
+                    _VideoCallBubbleActionButton(onPressed: onVideoCallPressed),
+                  ],
+                ),
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.only(left: 4, bottom: 4),
+              child: Text(
+                sendTime.format('HH:mm', 'ru'),
+                style: const TextStyle(
+                  color: Color(0xFF7B8794),
+                  height: 1,
+                  fontSize: 10,
+                  fontWeight: FontWeight.w500,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _VideoCallBubbleActionButton extends StatelessWidget {
+  const _VideoCallBubbleActionButton({required this.onPressed});
+
+  final VoidCallback onPressed;
+
+  @override
+  Widget build(BuildContext context) {
+    return Material(
+      color: appTheme.greenA700,
+      borderRadius: BorderRadius.circular(10),
+      clipBehavior: Clip.antiAlias,
+      child: InkWell(
+        onTap: onPressed,
+        child: SizedBox(
+          width: 36,
+          height: 36,
+          child: Center(
+            child: SvgPicture.asset(
+              'assets/icons/video_call/vc_control_enter.svg',
+              width: 20,
+              height: 20,
+              fit: BoxFit.contain,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/features/chat/repositories/chat_repository.dart

@@ -6,6 +6,7 @@ import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
 import 'package:eatvio_app/features/chat/models/chat_messages_model.dart';
 import 'package:eatvio_app/features/chat/models/chat_room_model.dart';
 import 'package:eatvio_app/features/chat/models/chat_room_pagination_model.dart';
+import 'package:eatvio_app/features/chat/models/order_id_to_conversation_model.dart';
 import 'package:eatvio_app/features/chat/models/payment_model.dart';
 import 'package:eatvio_app/features/chat/models/plan_complain_model.dart';
 import 'package:eatvio_app/features/chat/services/chat_service.dart';
@@ -98,8 +99,19 @@ class ChatRepository {
 
   Future<PaymentModel> getPaymentLink({
     required int id,
+    required String paymentProvider,
   }) async {
-    return await chatService.getPaymentLink(id: id);
+    return await chatService.getPaymentLink(
+      id: id,
+      body: {'payment_provider': paymentProvider},
+    );
+
+  }
+
+  Future<OrderIdToConversationModel> resolveOrderIdToConversation({
+    required String orderId,
+  }) async {
+    return await chatService.resolveOrderIdToConversation(orderId: orderId);
 
   }
 

lib/features/chat/services/chat_service.dart

@@ -3,6 +3,7 @@ import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
 import 'package:eatvio_app/features/chat/models/chat_messages_model.dart';
 import 'package:eatvio_app/features/chat/models/chat_room_model.dart';
 import 'package:eatvio_app/features/chat/models/chat_room_pagination_model.dart';
+import 'package:eatvio_app/features/chat/models/order_id_to_conversation_model.dart';
 import 'package:eatvio_app/features/chat/models/payment_model.dart';
 import 'package:eatvio_app/features/chat/models/plan_complain_model.dart';
 import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
@@ -65,6 +66,12 @@ abstract class ChatService {
   @POST('/api/chosen_plans/{id}/start_payment_process')
   Future<PaymentModel> getPaymentLink({
     @Path() required int id,
+    @Body() required Map<String, String> body,
+  });
+
+  @GET('/api/consultation/resolve/order_id_to_conversation/{orderId}')
+  Future<OrderIdToConversationModel> resolveOrderIdToConversation({
+    @Path() required String orderId,
   });
 
   @GET('/api/chosen_plans/show/{id}')

lib/features/chat/utils/chat_counterpart_utils.dart

@@ -0,0 +1,15 @@
+import 'package:eatvio_app/features/chat/models/chat_room_model.dart';
+import 'package:eatvio_app/features/chat/models/chat_user_model.dart';
+
+ChatUserModel resolveChatCounterpart({
+  required Users users,
+  required int? currentUserId,
+}) {
+  if (currentUserId != null && users.sender.id == currentUserId) {
+    return users.receiver;
+  }
+  if (currentUserId != null && users.receiver.id == currentUserId) {
+    return users.sender;
+  }
+  return users.receiver;
+}

lib/features/diets/presentation/pages/about_diet_screen.dart

@@ -106,9 +106,7 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
                     backgroundColor: appTheme.gray100,
                     resizeToAvoidBottomInset: true,
                     bottomSheet: Container(
-                      padding: EdgeInsets.only(
-                        bottom: MediaQuery.of(context).padding.bottom + 8,
-                      ),
+                      padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom + 8),
                       decoration: BoxDecoration(
                         color: Colors.white,
                         border: Border(top: BorderSide(color: Colors.black.withValues(alpha: 0.1))),

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

@@ -2,6 +2,7 @@ import 'package:dio/dio.dart';
 import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/error_reporting/error_reporter.dart';
 import 'package:eatvio_app/core/const.dart';
+import 'package:eatvio_app/core/firebase_api.dart';
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/core/utils/image_constant.dart';
@@ -15,6 +16,7 @@ import 'package:eatvio_app/features/consultant_rating/presentation/consultant_ra
 import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart';
 import 'package:eatvio_app/features/finances_and_consultations_archive/presentation/user_purchases_screen.dart';
 import 'package:eatvio_app/features/menu/presentation/bloc/menu_cubit/menu_cubit.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
 import 'package:eatvio_app/features/menu/presentation/bloc/menu_cubit/menu_state.dart';
 import 'package:eatvio_app/features/my_diets/presentation/my_diets_screen.dart';
 import 'package:eatvio_app/features/my_plans/presentation/my_plans_screen.dart';
@@ -165,6 +167,13 @@ class MenuScreen extends StatelessWidget {
                 } catch (e, s) {
                   await sl<ErrorReporter>().report(e, s, origin: 'MenuScreen');
                 } finally {
+                  try {
+                    // Needs Authorization header → must run before removing token.
+                    await sl<FirebaseApi>().unregisterPushTokens();
+                  } catch (e, s) {
+                    await sl<ErrorReporter>().report(e, s, origin: 'MenuScreen');
+                  }
+                  await sl<VideoCallSessionCubit>().endCall();
                   await sl<WsManager>().clear();
                   await TokenStorage.removeTokenInStorage();
                   if (context.mounted) {

lib/features/order_info/cubit/order_info_cubit.dart

@@ -14,7 +14,7 @@ class OrderInfoCubit extends Cubit<OrderInfoState> {
     try {
       final plan = state.chosenPlan;
       if (plan == null) return null;
-      final paymentModel = await chatRepository.getPaymentLink(id: plan.id);
+      final paymentModel = await chatRepository.getPaymentLink(id: plan.id, paymentProvider: 'alfa-bank');
       return paymentModel.paymentUrl;
     } catch (e, st) {
       await reportFrom(e, st, this);

lib/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_cubit.dart

@@ -0,0 +1,98 @@
+import 'dart:developer';
+
+import 'package:eatvio_app/core/error_reporting/report_from.dart';
+import 'package:eatvio_app/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_state.dart';
+import 'package:eatvio_app/features/payment/repositories/payment_repository.dart';
+import 'package:eatvio_app/features/payment/repositories/sbp_repository.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:sbp/models/c2bmembers_model.dart';
+
+/// Cubit оплаты консультации через СБП: старт оплаты, список банков, редирект в банк.
+///
+/// Не хранит [planId] как поле — он передаётся в [startPayment].
+/// Polling статуса оплаты остаётся в ChatRoomCubit.
+class ConsultationPaymentCubit extends Cubit<ConsultationPaymentState> {
+  final PaymentRepository paymentRepository;
+  final SbpRepository sbpRepository;
+
+  ConsultationPaymentCubit({
+    required this.paymentRepository,
+    required this.sbpRepository,
+  }) : super(ConsultationPaymentState());
+
+  /// Запускает оплату для [planId], сохраняет checkout_url и загружает банки СБП.
+  Future<void> startPayment({required int planId}) async {
+    try {
+      emit(
+        state.copyWith(
+          isLoading: true,
+          errorMessage: null,
+          banks: const [],
+          checkoutUrl: null,
+          orderId: null,
+        ),
+      );
+
+      final payment = await paymentRepository.startPaymentProcess(planId: planId);
+
+      emit(
+        state.copyWith(
+          checkoutUrl: payment.paymentUrl,
+          orderId: payment.orderId,
+        ),
+      );
+
+      try {
+        final banks = await sbpRepository.getInstalledBanks();
+        if (isClosed) return;
+        emit(
+          state.copyWith(
+            banks: banks,
+            isLoading: false,
+            errorMessage: null,
+          ),
+        );
+      } catch (e, st) {
+        await reportFrom(e, st, this);
+        log(e.toString(), stackTrace: st);
+        if (isClosed) return;
+        emit(
+          state.copyWith(
+            isLoading: false,
+            banks: const [],
+            errorMessage: e.toString(),
+          ),
+        );
+      }
+    } catch (e, st) {
+      await reportFrom(e, st, this);
+      log(e.toString(), stackTrace: st);
+      if (isClosed) return;
+      emit(
+        state.copyWith(
+          isLoading: false,
+          banks: const [],
+          checkoutUrl: null,
+          orderId: null,
+          errorMessage: e.toString(),
+        ),
+      );
+    }
+  }
+
+  /// Открывает банковское приложение [bank] с текущим [ConsultationPaymentState.checkoutUrl].
+  Future<bool> openBank({required C2bmemberModel bank}) async {
+    final checkoutUrl = state.checkoutUrl;
+    if (checkoutUrl == null || checkoutUrl.isEmpty) {
+      return false;
+    }
+
+    try {
+      return await sbpRepository.openBank(url: checkoutUrl, bank: bank);
+    } catch (e, st) {
+      await reportFrom(e, st, this);
+      log(e.toString(), stackTrace: st);
+      return false;
+    }
+  }
+}

lib/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_state.dart

@@ -0,0 +1,15 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:sbp/models/c2bmembers_model.dart';
+
+part 'consultation_payment_state.freezed.dart';
+
+@freezed
+abstract class ConsultationPaymentState with _$ConsultationPaymentState {
+  factory ConsultationPaymentState({
+    @Default(false) bool isLoading,
+    @Default([]) List<C2bmemberModel> banks,
+    String? checkoutUrl,
+    String? orderId,
+    String? errorMessage,
+  }) = _ConsultationPaymentState;
+}

lib/features/payment/presentation/payment_flow.dart

@@ -0,0 +1,49 @@
+import 'package:eatvio_app/features/payment/presentation/widgets/promo_code_gate_bottom_sheet.dart';
+import 'package:eatvio_app/features/payment/presentation/widgets/promo_code_modal.dart';
+import 'package:eatvio_app/features/payment/presentation/widgets/sbp_banks_bottom_sheet.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+
+/// Оркестрирует флоу оплаты консультации:
+/// гейт «У вас есть промокод?» → (Да → форма промокода) → SbpBanks.
+Future<void> showConsultationPaymentFlow(
+  BuildContext context, {
+  required int planId,
+  Future<bool?> Function(BuildContext)? showGate,
+  Future<PromoCodeResult?> Function(BuildContext, {Future<PromoValidation> Function(String)? onValidate})? showForm,
+  Future<void> Function(BuildContext, {required int planId})? showSbp,
+}) async {
+  final gate = showGate ?? _showGate;
+  final form = showForm ?? _showForm;
+  final sbp = showSbp ?? _showSbp;
+  final s = S.of(context);
+
+  final gateChoice = await gate(context);
+  if (gateChoice == null || !context.mounted) return;
+
+  if (gateChoice) {
+    final formResult = await form(
+      context,
+      onValidate: (_) async => PromoValidation.failure(s.promo_invalid),
+    );
+    if (formResult == null || !context.mounted) return;
+  }
+
+  if (!context.mounted) return;
+  await sbp(context, planId: planId);
+}
+
+Future<bool?> _showGate(BuildContext context) {
+  return showPromoCodeGateBottomSheet(context);
+}
+
+Future<PromoCodeResult?> _showForm(
+  BuildContext context, {
+  Future<PromoValidation> Function(String)? onValidate,
+}) {
+  return ItvioPromoCodeModal.show(context, onValidate: onValidate);
+}
+
+Future<void> _showSbp(BuildContext context, {required int planId}) {
+  return showSbpBanksBottomSheet(context, planId: planId);
+}

lib/features/payment/presentation/widgets/promo_code_gate_bottom_sheet.dart

@@ -0,0 +1,97 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+
+/// Показывает bottom sheet «У вас есть промокод?» с кнопками Да/Нет.
+///
+/// Возвращает `true` если пользователь нажал «Да», `false` если «Нет»,
+/// `null` если закрыл шторку (бекдроп/крестик).
+Future<bool?> showPromoCodeGateBottomSheet(BuildContext context) {
+  return showModalBottomSheet<bool?>(
+    context: context,
+    isScrollControlled: true,
+    barrierColor: appTheme.transparentBlack,
+    backgroundColor: Colors.transparent,
+    elevation: 0,
+    useSafeArea: true,
+    builder: (_) => Container(
+      decoration: const BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
+      ),
+      child: _PromoCodeGateSheet(),
+    ),
+  );
+}
+
+/// Виджет-гейт выбора промокода.
+class PromoCodeGateBottomSheet extends StatelessWidget {
+  const PromoCodeGateBottomSheet({super.key, required this.onResult});
+
+  final ValueChanged<bool?> onResult;
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(16, 8, 16, 20),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          const Center(child: BottomSheetHandlerBar()),
+          const SizedBox(height: 24),
+          Text(
+            s.have_promo_code,
+            style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+            textAlign: TextAlign.center,
+          ),
+          const SizedBox(height: 24),
+          SizedBox(
+            height: 50,
+            child: FilledButton(
+              onPressed: () => onResult(true),
+              style: FilledButton.styleFrom(
+                backgroundColor: appTheme.blueA400,
+                foregroundColor: appTheme.whiteA700,
+                shape: const StadiumBorder(),
+              ),
+              child: Text(
+                s.yes,
+                style: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
+              ),
+            ),
+          ),
+          const SizedBox(height: 8),
+          SizedBox(
+            height: 50,
+            child: OutlinedButton(
+              onPressed: () => onResult(false),
+              style: OutlinedButton.styleFrom(
+                foregroundColor: appTheme.blueA400,
+                side: BorderSide(color: appTheme.blueA400),
+                shape: const StadiumBorder(),
+              ),
+              child: Text(
+                s.no,
+                style: TextStyles.textMSemibold.copyWith(color: appTheme.blueA400),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+/// Внутренняя реализация модалки — обёртка над [PromoCodeGateBottomSheet].
+class _PromoCodeGateSheet extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return PromoCodeGateBottomSheet(
+      onResult: (result) => Navigator.of(context).pop(result),
+    );
+  }
+}

lib/features/payment/presentation/widgets/promo_code_modal.dart

@@ -0,0 +1,281 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+
+/// Результат работы модалки промокода.
+class PromoCodeResult {
+  const PromoCodeResult({this.code});
+
+  /// Применённый промокод или null, если пользователь продолжил без него.
+  final String? code;
+
+  bool get hasPromoCode => code != null;
+}
+
+/// Ответ проверки промокода.
+class PromoValidation {
+  const PromoValidation.success() : error = null;
+  const PromoValidation.failure(this.error);
+
+  final String? error;
+
+  bool get isValid => error == null;
+}
+
+/// Модальное окно ввода промокода.
+class ItvioPromoCodeModal extends StatefulWidget {
+  const ItvioPromoCodeModal({super.key, this.onValidate});
+
+  final Future<PromoValidation> Function(String code)? onValidate;
+
+  static Future<PromoCodeResult?> show(
+    BuildContext context, {
+    Future<PromoValidation> Function(String code)? onValidate,
+  }) {
+    return showModalBottomSheet<PromoCodeResult>(
+      context: context,
+      isScrollControlled: true,
+      useSafeArea: true,
+      backgroundColor: Colors.transparent,
+      builder: (_) => ItvioPromoCodeModal(onValidate: onValidate),
+    );
+  }
+
+  @override
+  State<ItvioPromoCodeModal> createState() => _ItvioPromoCodeModalState();
+}
+
+enum _ModalState { input, loading }
+
+class _ItvioPromoCodeModalState extends State<ItvioPromoCodeModal> {
+  final _controller = TextEditingController();
+  final _focusNode = FocusNode();
+
+  _ModalState _state = _ModalState.input;
+  String? _errorText;
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    _focusNode.dispose();
+    super.dispose();
+  }
+
+  Future<void> _apply() async {
+    final code = _controller.text.trim().toUpperCase();
+
+    if (code.isEmpty) {
+      setState(() => _errorText = S.of(context).enter_promo_code);
+      return;
+    }
+
+    setState(() {
+      _state = _ModalState.loading;
+      _errorText = null;
+    });
+
+    PromoValidation validation;
+    try {
+      validation = widget.onValidate != null
+          ? await widget.onValidate!(code)
+          : const PromoValidation.success();
+    } catch (_) {
+      validation = const PromoValidation.failure(
+        'Не удалось проверить промокод. Попробуйте позже',
+      );
+    }
+
+    if (!mounted) return;
+
+    if (!validation.isValid) {
+      setState(() {
+        _state = _ModalState.input;
+        _errorText = validation.error;
+      });
+      _focusNode.requestFocus();
+      return;
+    }
+
+    Navigator.of(context).pop(PromoCodeResult(code: code));
+  }
+
+  void _onSkip() {
+    Navigator.of(context).pop(const PromoCodeResult());
+  }
+
+  bool get _isLoading => _state == _ModalState.loading;
+
+  @override
+  Widget build(BuildContext context) {
+    final bottomInset = MediaQuery.of(context).viewInsets.bottom;
+    final s = S.of(context);
+
+    return Padding(
+      padding: EdgeInsets.only(bottom: bottomInset),
+      child: Container(
+        width: double.infinity,
+        decoration: const BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
+        ),
+        padding: const EdgeInsets.fromLTRB(20, 8, 20, 20),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            const Center(child: BottomSheetHandlerBar()),
+            const SizedBox(height: 16),
+            _buildHeader(),
+            const SizedBox(height: 16),
+            const Text(
+              'Промокод',
+              style: TextStyle(
+                fontSize: 13,
+                color: Color(0xFF6B7684),
+              ),
+            ),
+            const SizedBox(height: 8),
+            _buildField(),
+            const SizedBox(height: 8),
+            _buildHint(),
+            const SizedBox(height: 12),
+            _buildApplyButton(s),
+            const SizedBox(height: 6),
+            _buildSkipButton(s),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildHeader() {
+    final s = S.of(context);
+    return Text(
+      s.have_promo_code_form,
+      style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+    );
+  }
+
+  Widget _buildField() {
+    final hasError = _errorText != null;
+    final s = S.of(context);
+
+    return AnimatedContainer(
+      duration: const Duration(milliseconds: 150),
+      decoration: BoxDecoration(
+        color: appTheme.gray100,
+        borderRadius: BorderRadius.circular(12),
+        border: Border.all(
+          width: 2,
+          color: hasError
+              ? appTheme.red
+              : (_focusNode.hasFocus
+                  ? appTheme.blueA400
+                  : Colors.transparent),
+        ),
+      ),
+      child: Row(
+        children: [
+          Expanded(
+            child: TextField(
+              controller: _controller,
+              focusNode: _focusNode,
+              enabled: !_isLoading,
+              textCapitalization: TextCapitalization.characters,
+              onChanged: (_) {
+                if (_errorText != null) {
+                  setState(() => _errorText = null);
+                }
+              },
+              onSubmitted: (_) => _apply(),
+              decoration: InputDecoration(
+                hintText: s.enter_promo_code,
+                hintStyle: const TextStyle(
+                  color: Color(0xFF9AA3AF),
+                ),
+                border: InputBorder.none,
+                isDense: true,
+                contentPadding: const EdgeInsets.symmetric(
+                  horizontal: 16,
+                  vertical: 14,
+                ),
+              ),
+              style: const TextStyle(
+                fontSize: 15,
+                color: Color(0xFF24303F),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildHint() {
+    final String text;
+    final Color color;
+
+    if (_errorText != null) {
+      text = _errorText!;
+      color = appTheme.red;
+    } else {
+      text = '';
+      color = Colors.transparent;
+    }
+
+    return SizedBox(
+      height: 19,
+      child: Text(
+        text,
+        style: TextStyle(fontSize: 13, color: color),
+        overflow: TextOverflow.ellipsis,
+      ),
+    );
+  }
+
+  Widget _buildApplyButton(S s) {
+    return SizedBox(
+      height: 50,
+      child: FilledButton(
+        onPressed: _isLoading ? null : _apply,
+        style: FilledButton.styleFrom(
+          backgroundColor: appTheme.blueA400,
+          foregroundColor: appTheme.whiteA700,
+          disabledBackgroundColor: appTheme.blueA400.withValues(alpha: 0.55),
+          shape: const StadiumBorder(),
+          textStyle: const TextStyle(
+            fontSize: 15,
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+        child: _isLoading
+            ? const SizedBox(
+                width: 20,
+                height: 20,
+                child: CircularProgressIndicator(
+                  strokeWidth: 2.5,
+                  color: Colors.white,
+                ),
+              )
+            : Text(s.apply),
+      ),
+    );
+  }
+
+  Widget _buildSkipButton(S s) {
+    return SizedBox(
+      height: 46,
+      child: TextButton(
+        onPressed: _isLoading ? null : _onSkip,
+        style: TextButton.styleFrom(
+          foregroundColor: appTheme.blueA400,
+          shape: const StadiumBorder(),
+          textStyle: const TextStyle(fontSize: 14),
+        ),
+        child: Text(s.skip),
+      ),
+    );
+  }
+}

lib/features/payment/presentation/widgets/sbp_banks_bottom_sheet.dart

@@ -0,0 +1,224 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
+import 'package:eatvio_app/core/widgets/bottom_sheet_with_blur.dart';
+import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
+import 'package:eatvio_app/core/widgets/loader.dart';
+import 'package:eatvio_app/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_cubit.dart';
+import 'package:eatvio_app/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_state.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:sbp/models/c2bmembers_model.dart';
+
+/// Показывает bottom sheet выбора банка СБП для оплаты консультации.
+Future<void> showSbpBanksBottomSheet(BuildContext context, {required int planId}) {
+  final height = MediaQuery.sizeOf(context).height * 0.55;
+  return showBottomSheetWithBlur(
+    context: context,
+    height: height,
+    child: SbpBanksBottomSheet(planId: planId),
+  );
+}
+
+/// Bottom sheet со списком установленных банков СБП.
+///
+/// При открытии вызывает [ConsultationPaymentCubit.startPayment] с [planId]
+/// и показывает [Loader], пока загружаются checkout_url и список банков.
+class SbpBanksBottomSheet extends StatefulWidget {
+  const SbpBanksBottomSheet({super.key, required this.planId, this.cubit});
+
+  final int planId;
+  final ConsultationPaymentCubit? cubit;
+
+  @override
+  State<SbpBanksBottomSheet> createState() => _SbpBanksBottomSheetState();
+}
+
+class _SbpBanksBottomSheetState extends State<SbpBanksBottomSheet> {
+  late final ConsultationPaymentCubit _cubit;
+  late final bool _ownsCubit;
+
+  @override
+  void initState() {
+    super.initState();
+    _ownsCubit = widget.cubit == null;
+    _cubit = widget.cubit ?? sl<ConsultationPaymentCubit>();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _cubit.startPayment(planId: widget.planId);
+    });
+  }
+
+  @override
+  void dispose() {
+    if (_ownsCubit) {
+      _cubit.close();
+    }
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    return BlocProvider<ConsultationPaymentCubit>.value(
+      value: _cubit,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            const SizedBox(height: 8),
+            const BottomSheetHandlerBar(),
+            const SizedBox(height: 20),
+            Text(
+              s.choose_bank_for_payment,
+              style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+              textAlign: TextAlign.center,
+            ),
+            const SizedBox(height: 16),
+            Expanded(
+              child: BlocBuilder<ConsultationPaymentCubit, ConsultationPaymentState>(
+                builder: (context, state) {
+                  if (state.isLoading) {
+                    return const Loader();
+                  }
+                  if (state.errorMessage != null) {
+                    return _ErrorContent(
+                      message: s.sbp_payment_error,
+                      onOk: () {
+                        final navigator = Navigator.of(context);
+                        if (navigator.canPop()) {
+                          navigator.pop();
+                        }
+                      },
+                    );
+                  }
+                  if (state.banks.isEmpty) {
+                    return Center(
+                      child: Text(
+                        s.no_installed_banks,
+                        style: TextStyles.textMMedium.copyWith(color: appTheme.black),
+                        textAlign: TextAlign.center,
+                      ),
+                    );
+                  }
+                  return ListView.separated(
+                    itemCount: state.banks.length,
+                    separatorBuilder: (_, _) => const SizedBox(height: 8),
+                    itemBuilder: (context, index) {
+                      final bank = state.banks[index];
+                      return _BankTile(bank: bank, onTap: () => _onBankTap(bank));
+                    },
+                  );
+                },
+              ),
+            ),
+            const SizedBox(height: 16),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Future<void> _onBankTap(C2bmemberModel bank) async {
+    final opened = await _cubit.openBank(bank: bank);
+    if (opened && mounted) {
+      final navigator = Navigator.of(context);
+      if (navigator.canPop()) {
+        navigator.pop();
+      }
+    }
+  }
+}
+
+class _BankTile extends StatelessWidget {
+  const _BankTile({required this.bank, required this.onTap});
+
+  final C2bmemberModel bank;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    final name = bank.localName ?? bank.bankName;
+    return InkWell(
+      onTap: onTap,
+      borderRadius: BorderRadius.circular(12),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 4),
+        child: Row(
+          children: [
+            _BankIcon(bank: bank),
+            const SizedBox(width: 12),
+            Expanded(
+              child: Text(name, style: TextStyles.textLSemibold.copyWith(color: appTheme.black)),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _BankIcon extends StatelessWidget {
+  const _BankIcon({required this.bank});
+
+  final C2bmemberModel bank;
+
+  @override
+  Widget build(BuildContext context) {
+    if (bank.icon.isNotEmpty) {
+      return ClipRRect(
+        borderRadius: BorderRadius.circular(8),
+        child: CachedNetworkImage(
+          imageUrl: bank.logoURL,
+          width: 40,
+          height: 40,
+          placeholder: (context, url) => _placeholder(),
+          errorWidget: (context, url, error) => _placeholder(),
+        ),
+      );
+    }
+    return _placeholder();
+  }
+
+  Widget _placeholder() {
+    return Container(
+      width: 40,
+      height: 40,
+      decoration: BoxDecoration(color: appTheme.blueA400.withValues(alpha: 0.12), borderRadius: BorderRadius.circular(8)),
+      child: Icon(Icons.account_balance, color: appTheme.blueA400, size: 22),
+    );
+  }
+}
+
+class _ErrorContent extends StatelessWidget {
+  const _ErrorContent({required this.message, required this.onOk});
+
+  final String message;
+  final VoidCallback onOk;
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        Text(
+          message,
+          style: TextStyles.textMMedium.copyWith(color: appTheme.black),
+          textAlign: TextAlign.center,
+        ),
+        const SizedBox(height: 16),
+        CustomOutlinedButton(
+          text: s.ok,
+          height: 52,
+          buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
+          buttonStyle: ButtonStyle(side: const WidgetStatePropertyAll(BorderSide.none), backgroundColor: WidgetStatePropertyAll(appTheme.blueA400)),
+          onPressed: onOk,
+        ),
+      ],
+    );
+  }
+}

lib/features/payment/repositories/payment_repository.dart

@@ -0,0 +1,18 @@
+import 'package:eatvio_app/features/chat/models/payment_model.dart';
+import 'package:eatvio_app/features/chat/services/chat_service.dart';
+
+/// Репозиторий оплаты консультаций (chosen_plan) через Alfa Bank / СБП.
+class PaymentRepository {
+  final ChatService chatService;
+
+  PaymentRepository({required this.chatService});
+
+  /// Запускает процесс оплаты: POST `/api/chosen_plans/{id}/start_payment_process`
+  /// с `payment_provider: alfa-bank`.
+  Future<PaymentModel> startPaymentProcess({required int planId}) async {
+    return chatService.getPaymentLink(
+      id: planId,
+      body: const {'payment_provider': 'alfa-bank'},
+    );
+  }
+}

lib/features/payment/repositories/sbp_repository.dart

@@ -0,0 +1,27 @@
+import 'package:eatvio_app/features/payment/services/sbp_service.dart';
+import 'package:sbp/models/c2bmembers_model.dart';
+
+/// Репозиторий оплаты по СБП: обёртка над [SbpService] с graceful-обработкой
+/// ошибок нативного плагина (отсутствие установленных банков, недоступность
+/// сервисов на устройстве, в т.ч. на Huawei HMS и т.п.).
+///
+/// Возвращает управляемые значения вместо проброса исключений, чтобы UI мог
+/// показать fallback (например, открыть checkout_url в браузере/WebView).
+class SbpRepository {
+  final SbpService sbpService;
+
+  SbpRepository({required this.sbpService});
+
+  /// Возвращает установленные банки СБП либо пустой список при ошибке плагина.
+  Future<List<C2bmemberModel>> getInstalledBanks() async {
+    return await sbpService.getInstalledBanks();
+  }
+
+  /// Открывает банк для оплаты. Возвращает `false` при ошибке плагина.
+  Future<bool> openBank({
+    required String url,
+    required C2bmemberModel bank,
+  }) async {
+    return await sbpService.openBank(url: url, bank: bank);
+  }
+}

lib/features/payment/services/sbp_service.dart

@@ -0,0 +1,43 @@
+import 'package:sbp/data/c2bmembers_data.dart';
+import 'package:sbp/models/c2bmembers_model.dart';
+import 'package:sbp/sbp.dart' as sbp;
+
+/// Контракт обёртки над нативным плагином СБП (Система Быстрых Платежей).
+///
+/// Статичные методы класса [Sbp] из пакета `sbp` работают через MethodChannel,
+/// поэтому не поддаются прямому мокированию в тестах. Этот интерфейс вводится
+/// для тестируемости и возможности подмены реализации (см. [SbpServiceImpl]).
+abstract class SbpService {
+  /// Возвращает список банков, установленных на устройстве пользователя
+  /// и поддерживающих оплату по СБП.
+  Future<List<C2bmemberModel>> getInstalledBanks();
+
+  /// Открывает банковское приложение [bank] для оплаты по ссылке [url]
+  /// (checkout_url вида `https://qr.nspk.ru/...`).
+  ///
+  /// Возвращает `true`, если приложение банка успешно запущено.
+  Future<bool> openBank({required String url, required C2bmemberModel bank});
+}
+
+/// Реализация [SbpService], делегирующая вызовы в статичные методы пакета `sbp`.
+class SbpServiceImpl implements SbpService {
+  const SbpServiceImpl();
+
+  @override
+  Future<List<C2bmemberModel>> getInstalledBanks() {
+    // Используем встроенный справочник банков c2bmembersData (получаемый с
+    // https://qr.nspk.ru/proxyapp/c2bmembers.json) и фильтруем только те, что
+    // установлены на устройстве. Локальные иконки/названия включены, чтобы UI
+    // не зависел от сетевой загрузки логотипов.
+    return sbp.Sbp.getInstalledBanks(
+      C2bmembersModel.fromJson(c2bmembersData),
+      useAndroidLocalIcons: true,
+      useAndroidLocalNames: true,
+    );
+  }
+
+  @override
+  Future<bool> openBank({required String url, required C2bmemberModel bank}) {
+    return sbp.Sbp.openBank(url, bank);
+  }
+}

lib/features/plans/enums/chosen_plan_state_enum.dart

@@ -30,7 +30,9 @@ enum ChosenPlanStateEnum {
   @JsonValue('personal_diet_setted')
   personalDietSet,
   @JsonValue('charge_was_collected')
-  stateChargeWasCollected;
+  stateChargeWasCollected,
+  @JsonValue('payment_failed')
+  statePaymentFailed;
 
   static List<ChosenPlanStateEnum> getShowableChatBadgeStates() {
     return [
@@ -53,6 +55,7 @@ enum ChosenPlanStateEnum {
       case ChosenPlanStateEnum.stateInCoordination:
       case ChosenPlanStateEnum.stateStartDateHasBeenSet:
       case ChosenPlanStateEnum.statePendingPayment:
+      case ChosenPlanStateEnum.statePaymentFailed:
         return false;
       default:
         return true;
@@ -68,7 +71,7 @@ enum ChosenPlanStateEnum {
       ChosenPlanStateEnum.stateLastDayFinished,
       ChosenPlanStateEnum.stateComplained,
       ChosenPlanStateEnum.stateDone,
-      ChosenPlanStateEnum.personalDietSet
+      ChosenPlanStateEnum.personalDietSet,
     ];
   }
 }

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

@@ -15,17 +15,20 @@ class ExpandableBouble extends StatelessWidget {
       child: MainBackgroundBouble(
         child: Theme(
           data: Theme.of(context).copyWith(dividerColor: Colors.transparent),
-          child: ExpansionTile(
-            initiallyExpanded: initiallyExpanded,
-            expandedCrossAxisAlignment: CrossAxisAlignment.start,
-            expandedAlignment: Alignment.bottomLeft,
-            tilePadding: const EdgeInsets.symmetric(horizontal: 16),
-            childrenPadding: const EdgeInsets.symmetric(horizontal: 16),
-            title: Text(
-              title,
-              style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+          child: Material(
+            color: Colors.transparent,
+            child: ExpansionTile(
+              initiallyExpanded: initiallyExpanded,
+              expandedCrossAxisAlignment: CrossAxisAlignment.start,
+              expandedAlignment: Alignment.bottomLeft,
+              tilePadding: const EdgeInsets.symmetric(horizontal: 16),
+              childrenPadding: const EdgeInsets.symmetric(horizontal: 16),
+              title: Text(
+                title,
+                style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+              ),
+              children: children,
             ),
-            children: children,
           ),
         ),
       ),

lib/features/video_calls/managers/video_call_manager_snapshot.dart

@@ -0,0 +1,59 @@
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+
+class VideoCallManagerSnapshot {
+  const VideoCallManagerSnapshot({
+    required this.conversationUuid,
+    this.counterpartName,
+    this.localParticipantName,
+    required this.micEnabled,
+    required this.videoEnabled,
+    this.connectError,
+    required this.connectPhase,
+    required this.linkIssue,
+    this.counterpartPresentInLobby = false,
+  });
+
+  final String conversationUuid;
+  final String? counterpartName;
+  final String? localParticipantName;
+  final bool micEnabled;
+  final bool videoEnabled;
+  final String? connectError;
+  final VideoCallConnectPhase connectPhase;
+  final VideoCallLinkIssue linkIssue;
+  final bool counterpartPresentInLobby;
+
+  static const initial = VideoCallManagerSnapshot(
+    conversationUuid: '',
+    micEnabled: false,
+    videoEnabled: false,
+    connectPhase: VideoCallConnectPhase.idle,
+    linkIssue: VideoCallLinkIssue.none,
+  );
+
+  VideoCallManagerSnapshot copyWith({
+    String? conversationUuid,
+    String? counterpartName,
+    String? localParticipantName,
+    bool? micEnabled,
+    bool? videoEnabled,
+    String? connectError,
+    VideoCallConnectPhase? connectPhase,
+    VideoCallLinkIssue? linkIssue,
+    bool? counterpartPresentInLobby,
+    bool clearConnectError = false,
+  }) {
+    return VideoCallManagerSnapshot(
+      conversationUuid: conversationUuid ?? this.conversationUuid,
+      counterpartName: counterpartName ?? this.counterpartName,
+      localParticipantName: localParticipantName ?? this.localParticipantName,
+      micEnabled: micEnabled ?? this.micEnabled,
+      videoEnabled: videoEnabled ?? this.videoEnabled,
+      connectError: clearConnectError ? null : (connectError ?? this.connectError),
+      connectPhase: connectPhase ?? this.connectPhase,
+      linkIssue: linkIssue ?? this.linkIssue,
+      counterpartPresentInLobby:
+          counterpartPresentInLobby ?? this.counterpartPresentInLobby,
+    );
+  }
+}

lib/features/video_calls/models/video_call_models.dart

@@ -0,0 +1,48 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'video_call_models.freezed.dart';
+part 'video_call_models.g.dart';
+
+@freezed
+abstract class VideoCallTokenResponse with _$VideoCallTokenResponse {
+  const factory VideoCallTokenResponse({
+    required String token,
+    required String roomName,
+    required String wsUrl,
+  }) = _VideoCallTokenResponse;
+
+  factory VideoCallTokenResponse.fromJson(Map<String, Object?> json) =>
+      _$VideoCallTokenResponseFromJson(json);
+}
+
+@freezed
+abstract class VideoCallAdminTokenResponse with _$VideoCallAdminTokenResponse {
+  const factory VideoCallAdminTokenResponse({
+    required String adminToken,
+    required String roomName,
+    required String apiUrl,
+  }) = _VideoCallAdminTokenResponse;
+
+  factory VideoCallAdminTokenResponse.fromJson(Map<String, Object?> json) =>
+      _$VideoCallAdminTokenResponseFromJson(json);
+}
+
+@freezed
+abstract class VideoCallEndedResponse with _$VideoCallEndedResponse {
+  const factory VideoCallEndedResponse({required bool sent}) =
+      _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

@@ -0,0 +1,599 @@
+import 'dart:async';
+
+import 'package:eatvio_app/core/cubit/base_cubit.dart';
+import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart';
+import 'package:eatvio_app/features/video_calls/managers/video_call_manager_snapshot.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_screen_wake_lock_coordinator.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_system_pip_coordinator.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:livekit_client/livekit_client.dart' as lk;
+import 'package:permission_handler/permission_handler.dart';
+
+class VideoCallSessionCubit extends BaseCubit<VideoCallSessionState> {
+  VideoCallSessionCubit({
+    required VideoCallManager videoCallManager,
+    VideoCallSystemPipCoordinator? systemPipCoordinator,
+    VideoCallScreenWakeLockCoordinator? screenWakeLockCoordinator,
+  }) : _videoCallManager = videoCallManager,
+       _systemPipCoordinator =
+           systemPipCoordinator ?? VideoCallSystemPipCoordinator(),
+       _screenWakeLock =
+           screenWakeLockCoordinator ?? VideoCallScreenWakeLockCoordinator(),
+       super(const VideoCallSessionState()) {
+    _videoCallManager.addListener(_onManagerSnapshot);
+    _syncFromManager(_videoCallManager.snapshot);
+  }
+
+  final VideoCallManager _videoCallManager;
+  final VideoCallSystemPipCoordinator _systemPipCoordinator;
+  final VideoCallScreenWakeLockCoordinator _screenWakeLock;
+  bool _callScreenRouteVisible = false;
+  bool _autoEnterInFlight = false;
+  bool _counterpartPresentWhenLobbyReady = false;
+  bool _sawEmptyLobbyWhenConnected = false;
+  bool _lobbyReadyTracked = false;
+  String? _lobbyReadyTrackedConversationUuid;
+  Future<void>? _autoEnterFuture;
+  Future<void>? _outgoingAutoEnterFuture;
+
+  lk.Room? get liveKitRoom => _videoCallManager.room;
+  bool get isCallScreenRouteVisible => _callScreenRouteVisible;
+
+  static bool _isCallSessionInactive(VideoCallManagerSnapshot snapshot) {
+    return snapshot.conversationUuid.isEmpty ||
+        snapshot.connectPhase == VideoCallConnectPhase.idle;
+  }
+
+  VideoCallSessionState _sessionStateFromSnapshot(
+    VideoCallManagerSnapshot snapshot,
+  ) {
+    final hideStaleConnectError =
+        snapshot.connectPhase == VideoCallConnectPhase.connected &&
+        !snapshot.linkIssue.needsManualReconnect;
+    final resetCallStage =
+        _isCallSessionInactive(snapshot) ||
+        snapshot.connectPhase == VideoCallConnectPhase.connecting;
+
+    return state.copyWith(
+      conversationUuid: snapshot.conversationUuid,
+      counterpartName: snapshot.counterpartName,
+      localParticipantName: snapshot.localParticipantName,
+      micEnabled: snapshot.micEnabled,
+      videoEnabled: snapshot.videoEnabled,
+      connectError: hideStaleConnectError ? null : snapshot.connectError,
+      connectPhase: snapshot.connectPhase,
+      linkIssue: snapshot.linkIssue,
+      callStageEntered: resetCallStage ? false : state.callStageEntered,
+      uiMode:
+          _isCallSessionInactive(snapshot)
+              ? VideoCallUiMode.hidden
+              : state.uiMode,
+    );
+  }
+
+  void _onManagerSnapshot(VideoCallManagerSnapshot snapshot) {
+    if (isClosed) return;
+    if (_isCallSessionInactive(snapshot)) {
+      unawaited(_systemPipCoordinator.disarm());
+      if (_callScreenRouteVisible) {
+        // [VideoCallManager.startCall] briefly emits idle while replacing the room.
+        return;
+      }
+      _resetLobbyReadyTracking();
+      emit(const VideoCallSessionState());
+      unawaited(_restoreSystemUiAfterCall());
+      return;
+    }
+    _trackLobbyReadyCounterpartPresence(snapshot);
+    final next = _sessionStateFromSnapshot(snapshot);
+    emit(next);
+    _scheduleAutoEnterIfNeeded(next);
+    _scheduleOutgoingAutoEnterIfNeeded(next, snapshot);
+  }
+
+  void _syncFromManager(VideoCallManagerSnapshot snapshot) {
+    if (_isCallSessionInactive(snapshot)) {
+      unawaited(_systemPipCoordinator.disarm());
+      if (_callScreenRouteVisible) return;
+      _resetLobbyReadyTracking();
+      emit(const VideoCallSessionState());
+      return;
+    }
+    _trackLobbyReadyCounterpartPresence(snapshot);
+    emit(_sessionStateFromSnapshot(snapshot));
+  }
+
+  void _resetLobbyReadyTracking() {
+    _lobbyReadyTrackedConversationUuid = null;
+    _counterpartPresentWhenLobbyReady = false;
+    _sawEmptyLobbyWhenConnected = false;
+    _lobbyReadyTracked = false;
+  }
+
+  void _trackLobbyReadyCounterpartPresence(VideoCallManagerSnapshot snapshot) {
+    final uuid = snapshot.conversationUuid;
+    if (uuid.isEmpty) {
+      _resetLobbyReadyTracking();
+      return;
+    }
+    if (snapshot.connectPhase != VideoCallConnectPhase.connected) return;
+
+    if (!_lobbyReadyTracked || _lobbyReadyTrackedConversationUuid != uuid) {
+      _lobbyReadyTracked = true;
+      _lobbyReadyTrackedConversationUuid = uuid;
+      _counterpartPresentWhenLobbyReady = snapshot.counterpartPresentInLobby;
+      _sawEmptyLobbyWhenConnected = !snapshot.counterpartPresentInLobby;
+      return;
+    }
+
+    if (_sawEmptyLobbyWhenConnected && snapshot.counterpartPresentInLobby) {
+      _counterpartPresentWhenLobbyReady = false;
+      _sawEmptyLobbyWhenConnected = false;
+    }
+  }
+
+  Future<void> _notifyIncomingCallAcceptedIfNeeded(String conversationUuid) {
+    return _videoCallManager.notifyIncomingCallAccepted(conversationUuid);
+  }
+
+  /// Синхронизирует UI-состояние после [VideoCallManager.endCall] из notification /
+  /// foreground task (без повторного disconnect).
+  Future<void> onCallEndedExternally() async {
+    await _onCallEndedExternally();
+  }
+
+  Future<void> _onCallEndedExternally() async {
+    if (isClosed) return;
+    await _systemPipCoordinator.disarm();
+    await _restoreSystemUiAfterCall();
+    emit(const VideoCallSessionState());
+  }
+
+  Future<void> startCall({
+    required String conversationUuid,
+    String? counterpartName,
+    String? localParticipantName,
+  }) async {
+    await _videoCallManager.startCall(
+      conversationUuid: conversationUuid,
+      counterpartName: counterpartName,
+      localParticipantName: localParticipantName,
+      micEnabled: state.micEnabled,
+      videoEnabled: state.videoEnabled,
+    );
+  }
+
+  Future<void> onCallScreenVisible({
+    required String conversationUuid,
+    String? counterpartName,
+    String? localParticipantName,
+    bool? counterpartIsConsultant,
+    VideoCallEntryMode entryMode = VideoCallEntryMode.outgoing,
+  }) async {
+    _callScreenRouteVisible = true;
+    await _screenWakeLock.acquire();
+
+    final effectiveEntryMode =
+        state.entryMode == VideoCallEntryMode.incomingAccepted ||
+            entryMode == VideoCallEntryMode.incomingAccepted
+        ? VideoCallEntryMode.incomingAccepted
+        : entryMode;
+    final isIncomingAccepted =
+        effectiveEntryMode == VideoCallEntryMode.incomingAccepted;
+    final isResumingActiveCall =
+        state.conversationUuid == conversationUuid &&
+        state.callStageEntered &&
+        _videoCallManager.room != null;
+    final isSameCallConnecting =
+        state.conversationUuid == conversationUuid &&
+        !state.callStageEntered &&
+        state.connectPhase != VideoCallConnectPhase.idle;
+
+    if (isIncomingAccepted && !isResumingActiveCall) {
+      unawaited(_notifyIncomingCallAcceptedIfNeeded(conversationUuid));
+    }
+
+    if (!isResumingActiveCall && !isSameCallConnecting) {
+      _resetLobbyReadyTracking();
+      await _systemPipCoordinator.disarm();
+    }
+
+    if (isSameCallConnecting) {
+      emit(
+        state.copyWith(
+          counterpartName: counterpartName ?? state.counterpartName,
+          localParticipantName:
+              localParticipantName ?? state.localParticipantName,
+          counterpartIsConsultant:
+              counterpartIsConsultant ?? state.counterpartIsConsultant,
+          entryMode: effectiveEntryMode,
+        ),
+      );
+      if (isIncomingAccepted) {
+        await _tryAutoEnterCallStage();
+      }
+      emit(state.copyWith(uiMode: VideoCallUiMode.fullscreen));
+      await _ensureSystemPipArmedIfInCall();
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        unawaited(_applyVideoCallSystemUi());
+      });
+      return;
+    }
+
+    if (isResumingActiveCall) {
+      await _videoCallManager.onCallScreenVisible(
+        conversationUuid: conversationUuid,
+        counterpartName: counterpartName,
+        localParticipantName: localParticipantName,
+        micEnabled: state.micEnabled,
+        videoEnabled: state.videoEnabled,
+      );
+      if (counterpartIsConsultant != null) {
+        emit(state.copyWith(counterpartIsConsultant: counterpartIsConsultant));
+      }
+    } else {
+      emit(
+        state.copyWith(
+          conversationUuid: conversationUuid,
+          counterpartName: counterpartName,
+          localParticipantName: localParticipantName,
+          counterpartIsConsultant: counterpartIsConsultant ?? false,
+          micEnabled: false,
+          videoEnabled: false,
+          callStageEntered: false,
+          connectError: null,
+          linkIssue: VideoCallLinkIssue.none,
+          connectPhase: VideoCallConnectPhase.connecting,
+          entryMode: effectiveEntryMode,
+        ),
+      );
+      await _videoCallManager.startCall(
+        conversationUuid: conversationUuid,
+        counterpartName: counterpartName,
+        localParticipantName: localParticipantName,
+        micEnabled: false,
+        videoEnabled: false,
+      );
+      emit(state.copyWith(entryMode: effectiveEntryMode));
+      if (isIncomingAccepted) {
+        await _tryAutoEnterCallStage();
+      }
+    }
+
+    emit(state.copyWith(uiMode: VideoCallUiMode.fullscreen));
+    await _ensureSystemPipArmedIfInCall();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      unawaited(_applyVideoCallSystemUi());
+    });
+  }
+
+  Future<void> _ensureSystemPipArmedIfInCall() async {
+    if (!_videoCallManager.isActiveCall) {
+      await _systemPipCoordinator.disarm();
+      return;
+    }
+    await _systemPipCoordinator.armAutoPipOnLeave();
+  }
+
+  void _scheduleAutoEnterIfNeeded(VideoCallSessionState sessionState) {
+    if (sessionState.entryMode != VideoCallEntryMode.incomingAccepted) return;
+    if (sessionState.callStageEntered) return;
+    if (sessionState.connectPhase != VideoCallConnectPhase.connected) return;
+    unawaited(_tryAutoEnterCallStage());
+  }
+
+  void _scheduleOutgoingAutoEnterIfNeeded(
+    VideoCallSessionState sessionState,
+    VideoCallManagerSnapshot snapshot,
+  ) {
+    if (!_callScreenRouteVisible) return;
+    if (sessionState.entryMode != VideoCallEntryMode.outgoing) return;
+    if (sessionState.callStageEntered) return;
+    if (sessionState.connectPhase != VideoCallConnectPhase.connected) return;
+
+    if (!snapshot.counterpartPresentInLobby) {
+      unawaited(_videoCallManager.ensureLobbyRoomJoined());
+      return;
+    }
+    unawaited(_tryAutoEnterWhenCounterpartJoins());
+  }
+
+  Future<void> _tryAutoEnterWhenCounterpartJoins() {
+    final pending = _outgoingAutoEnterFuture;
+    if (pending != null) return pending;
+
+    final run = _runOutgoingAutoEnterCallStage();
+    _outgoingAutoEnterFuture = run;
+    return run.whenComplete(() {
+      if (identical(_outgoingAutoEnterFuture, run)) {
+        _outgoingAutoEnterFuture = null;
+      }
+    });
+  }
+
+  Future<void> _runOutgoingAutoEnterCallStage() async {
+    if (isClosed || _autoEnterInFlight) return;
+    if (!_callScreenRouteVisible) return;
+    if (state.entryMode != VideoCallEntryMode.outgoing) return;
+    if (state.callStageEntered) return;
+    if (state.connectPhase != VideoCallConnectPhase.connected) return;
+
+    _autoEnterInFlight = true;
+    try {
+      await enterCallStage();
+    } finally {
+      _autoEnterInFlight = false;
+    }
+  }
+
+  Future<void> _tryAutoEnterCallStage() {
+    final pending = _autoEnterFuture;
+    if (pending != null) return pending;
+
+    final run = _runAutoEnterCallStage();
+    _autoEnterFuture = run;
+    return run.whenComplete(() {
+      if (identical(_autoEnterFuture, run)) {
+        _autoEnterFuture = null;
+      }
+    });
+  }
+
+  Future<void> _runAutoEnterCallStage() async {
+    if (isClosed || _autoEnterInFlight) return;
+    if (state.entryMode != VideoCallEntryMode.incomingAccepted) return;
+    if (state.callStageEntered) return;
+    if (state.connectPhase != VideoCallConnectPhase.connected) return;
+
+    _autoEnterInFlight = true;
+    try {
+      await _requestMicBeforeIncomingEnter();
+      await enterCallStage();
+    } finally {
+      _autoEnterInFlight = false;
+    }
+  }
+
+  /// After the loading/connect phase, request mic before joining the room.
+  Future<void> _requestMicBeforeIncomingEnter() async {
+    if (state.entryMode != VideoCallEntryMode.incomingAccepted) return;
+
+    final granted = await _requestMicPermissionForCall();
+    if (!granted || isClosed) return;
+
+    await _videoCallManager.toggleMic(state.isMicActiveForUi);
+    if (isClosed) return;
+    emit(state.copyWith(micEnabled: true));
+  }
+
+  @visibleForTesting
+  Future<bool> requestMicPermissionForCall() => _requestMicPermissionForCall();
+
+  Future<bool> _requestMicPermissionForCall() async {
+    try {
+      final status = await Permission.microphone.request();
+      return status.isGranted;
+    } catch (_) {
+      return false;
+    }
+  }
+
+  void onCallScreenDisposed() {
+    _callScreenRouteVisible = false;
+    if (state.uiMode != VideoCallUiMode.fullscreen) {
+      if (state.uiMode == VideoCallUiMode.pip && state.callStageEntered) {
+        // [isCallScreenRouteVisible] is not in bloc state; refresh the global
+        // PiP overlay after the call route is removed.
+        emit(state.copyWith());
+      }
+      return;
+    }
+    if (state.connectPhase == VideoCallConnectPhase.connected &&
+        !state.linkIssue.needsManualReconnect) {
+      if (state.callStageEntered) {
+        unawaited(minimizeToPip());
+      } else {
+        unawaited(endCall());
+      }
+    } else if (state.connectPhase == VideoCallConnectPhase.connecting) {
+      unawaited(endCall());
+    } else if (state.linkIssue.needsManualReconnect) {
+      unawaited(endCall());
+    }
+  }
+
+  bool get _canMinimizeToPip =>
+      state.connectPhase == VideoCallConnectPhase.connected &&
+      !state.linkIssue.needsManualReconnect &&
+      state.callStageEntered;
+
+  Future<void> _applyPipUiState() async {
+    emit(state.copyWith(uiMode: VideoCallUiMode.pip));
+    await _restoreSystemUiAfterCall();
+    await _ensureSystemPipArmedIfInCall();
+  }
+
+  /// Called when Android enters system PiP (e.g. Home gesture).
+  Future<void> syncPipUiStateFromSystem() async {
+    if (!_canMinimizeToPip) return;
+    if (state.uiMode == VideoCallUiMode.pip) return;
+    // Call screen already renders the in-call mini preview; enabling the global
+    // overlay here would duplicate PiP after returning from system PiP.
+    if (_callScreenRouteVisible) return;
+    await _applyPipUiState();
+  }
+
+  /// Re-applies immersive UI after Android system PiP while the call screen
+  /// route is still on the stack.
+  Future<void> onSystemPipExitedWithCallScreenVisible() async {
+    if (!_callScreenRouteVisible) return;
+    if (state.uiMode != VideoCallUiMode.fullscreen) return;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      unawaited(_applyVideoCallSystemUi());
+    });
+  }
+
+  Future<void> minimizeToPip() async {
+    if (!_canMinimizeToPip) return;
+    await _applyPipUiState();
+  }
+
+  Future<void> restoreFullscreenFromPip() async {
+    if (state.uiMode != VideoCallUiMode.pip) return;
+    emit(state.copyWith(uiMode: VideoCallUiMode.fullscreen));
+    unawaited(_ensureSystemPipArmedIfInCall());
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      unawaited(_applyVideoCallSystemUi());
+    });
+  }
+
+  Future<void> leaveCallRoute() async {
+    if (state.connectPhase == VideoCallConnectPhase.connected &&
+        !state.linkIssue.needsManualReconnect) {
+      if (state.callStageEntered) {
+        _callScreenRouteVisible = false;
+        await minimizeToPip();
+      } else {
+        await endCall();
+      }
+    } else {
+      await endCall();
+    }
+  }
+
+  void updateCounterpartIsConsultant(bool isConsultant) {
+    if (isClosed || state.counterpartIsConsultant == isConsultant) return;
+    emit(state.copyWith(counterpartIsConsultant: isConsultant));
+  }
+
+  Future<void> enterCallStage() async {
+    if (isClosed) return;
+    if (state.connectPhase != VideoCallConnectPhase.connected) return;
+    if (state.callStageEntered) return;
+
+    if (state.entryMode == VideoCallEntryMode.outgoing &&
+        _counterpartPresentWhenLobbyReady) {
+      unawaited(_notifyIncomingCallAcceptedIfNeeded(state.conversationUuid));
+    }
+
+    final entered = await _videoCallManager.onEnterCallStage();
+    if (!entered || isClosed) return;
+
+    emit(
+      state.copyWith(
+        callStageEntered: true,
+        splitParticipantView: false,
+        mainStageShowsLocalVideo: false,
+      ),
+    );
+    await _ensureSystemPipArmedIfInCall();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (isClosed) return;
+      _videoCallManager.scheduleRecordingNoticeOnce();
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (isClosed) return;
+        _videoCallManager.scheduleRecordingNoticeOnce();
+      });
+    });
+  }
+
+  Future<void> retryAfterConnectionLoss() async {
+    final entryMode = state.entryMode;
+    final wasInCallStage = state.callStageEntered;
+    await _videoCallManager.retryAfterConnectionLoss();
+    if (isClosed) return;
+    emit(state.copyWith(callStageEntered: false, entryMode: entryMode));
+    if (wasInCallStage &&
+        state.connectPhase == VideoCallConnectPhase.connected &&
+        !state.linkIssue.needsManualReconnect) {
+      await enterCallStage();
+    }
+  }
+
+  Future<void> endCall() async {
+    await _screenWakeLock.release();
+    await _systemPipCoordinator.disarm();
+    await _videoCallManager.endCall();
+  }
+
+  void expandLocal() {
+    emit(
+      state.copyWith(
+        splitParticipantView: false,
+        mainStageShowsLocalVideo: true,
+      ),
+    );
+  }
+
+  void expandRemote() {
+    emit(
+      state.copyWith(
+        splitParticipantView: false,
+        mainStageShowsLocalVideo: false,
+      ),
+    );
+  }
+
+  void shrinkToSplit() {
+    emit(state.copyWith(splitParticipantView: true));
+  }
+
+  void toggleStageSwap() {
+    emit(
+      state.copyWith(mainStageShowsLocalVideo: !state.mainStageShowsLocalVideo),
+    );
+  }
+
+  Future<void> toggleMic() async {
+    await _videoCallManager.toggleMic(state.isMicActiveForUi);
+  }
+
+  Future<void> toggleVideo() async {
+    await _videoCallManager.toggleVideo(state.videoEnabled);
+  }
+
+  Future<void> switchCameraFacing() async {
+    await _videoCallManager.switchCameraFacing(state.useFrontCamera);
+    emit(state.copyWith(useFrontCamera: !state.useFrontCamera));
+  }
+
+  Future<void> _applyVideoCallSystemUi() async {
+    try {
+      await SystemChrome.setPreferredOrientations(const [
+        DeviceOrientation.portraitUp,
+        DeviceOrientation.portraitDown,
+        DeviceOrientation.landscapeLeft,
+        DeviceOrientation.landscapeRight,
+      ]);
+      await SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
+    } on PlatformException catch (_) {
+      await SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+    }
+  }
+
+  Future<void> _restoreSystemUiAfterCall() async {
+    await _screenWakeLock.release();
+    try {
+      await SystemChrome.setPreferredOrientations(const <DeviceOrientation>[]);
+      await SystemChrome.setEnabledSystemUIMode(
+        SystemUiMode.manual,
+        overlays: SystemUiOverlay.values,
+      );
+    } on PlatformException catch (_) {}
+  }
+
+  String resolvedLocalDisplayName() =>
+      _videoCallManager.resolvedLocalDisplayName();
+
+  String resolvedRemoteDisplayName([String fallback = '']) =>
+      _videoCallManager.resolvedRemoteDisplayName(fallback);
+
+  @override
+  Future<void> close() async {
+    _videoCallManager.removeListener(_onManagerSnapshot);
+    await endCall();
+    return super.close();
+  }
+}

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

@@ -0,0 +1,53 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'video_call_session_state.freezed.dart';
+
+enum VideoCallUiMode {
+  hidden,
+  fullscreen,
+  pip,
+}
+
+enum VideoCallConnectPhase { idle, connecting, connected }
+
+enum VideoCallLinkIssue { none, reconnecting, lost }
+
+extension VideoCallLinkIssueX on VideoCallLinkIssue {
+  /// True when the user must manually retry (lost link or LiveKit auto-reconnect).
+  bool get needsManualReconnect =>
+      this == VideoCallLinkIssue.lost || this == VideoCallLinkIssue.reconnecting;
+}
+
+/// How the user reached [VideoCallScreen].
+enum VideoCallEntryMode {
+  /// Outgoing call — connecting lobby; manual enter or auto-enter when callee joins.
+  outgoing,
+
+  /// Accepted incoming CallKit / VoIP / notification — loader then auto-enter.
+  incomingAccepted,
+}
+
+@freezed
+abstract class VideoCallSessionState with _$VideoCallSessionState {
+  const VideoCallSessionState._();
+
+  const factory VideoCallSessionState({
+    @Default('') String conversationUuid,
+    String? counterpartName,
+    @Default(false) bool counterpartIsConsultant,
+    String? localParticipantName,
+    @Default(false) bool micEnabled,
+    @Default(false) bool videoEnabled,
+    @Default(false) bool splitParticipantView,
+    @Default(false) bool mainStageShowsLocalVideo,
+    @Default(true) bool useFrontCamera,
+    String? connectError,
+    @Default(VideoCallUiMode.hidden) VideoCallUiMode uiMode,
+    @Default(VideoCallConnectPhase.idle) VideoCallConnectPhase connectPhase,
+    @Default(VideoCallLinkIssue.none) VideoCallLinkIssue linkIssue,
+    @Default(false) bool callStageEntered,
+    @Default(VideoCallEntryMode.outgoing) VideoCallEntryMode entryMode,
+  }) = _VideoCallSessionState;
+
+  bool get isMicActiveForUi => micEnabled;
+}

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

@@ -0,0 +1,408 @@
+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/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/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';
+
+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,
+  });
+
+  static const String path = '/video-call-screen';
+  static const String name = 'videoCallScreen';
+
+  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;
+
+  @override
+  State<VideoCallScreen> createState() => _VideoCallScreenState();
+}
+
+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,
+      );
+
+  VideoCallSessionCubit get _cubit => sl<VideoCallSessionCubit>();
+  WsManager get _wsManager => sl<WsManager>();
+
+  bool _counterpartIsOnline = false;
+  String _counterpartLastSeenText = '';
+  void Function(bool isOnline)? _presenceOnlineListener;
+
+  @override
+  void initState() {
+    super.initState();
+    _counterpartIsOnline = widget.counterpartIsOnline ?? false;
+    _counterpartLastSeenText = widget.counterpartLastSeenText ?? '';
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+      unawaited(_initCounterpartMetadata());
+      unawaited(
+        _cubit.onCallScreenVisible(
+          conversationUuid: widget.conversationUuid,
+          counterpartName: widget.counterpartName,
+          localParticipantName: widget.localParticipantName,
+          counterpartIsConsultant: widget.counterpartIsConsultant,
+          entryMode: widget.entryMode,
+        ),
+      );
+    });
+  }
+
+  Future<void> _initCounterpartMetadata() async {
+    var isOnline = widget.counterpartIsOnline ?? false;
+    var lastSeenText = widget.counterpartLastSeenText ?? '';
+    var counterpartUserId = widget.counterpartUserId;
+    var counterpartIsConsultant = widget.counterpartIsConsultant;
+
+    final shouldFetchChatRoom =
+        counterpartUserId == null ||
+        widget.counterpartIsOnline == null ||
+        widget.counterpartLastSeenText == null ||
+        counterpartIsConsultant == null;
+
+    if (shouldFetchChatRoom) {
+      try {
+        final chatRoom = await sl<ChatRepository>().getChatRoom(
+          widget.conversationUuid,
+        );
+        final counterpart = resolveChatCounterpart(
+          users: chatRoom.users,
+          currentUserId: _wsManager.userId,
+        );
+        isOnline = counterpart.isOnline;
+        lastSeenText = counterpart.lastSeenText;
+        counterpartUserId = counterpart.id;
+
+        if (counterpartIsConsultant == null) {
+          try {
+            final profile = await sl<ProfileRepository>().getProfileBySlug(
+              counterpart.slug,
+            );
+            counterpartIsConsultant = profile.roles.contains('consultant');
+          } catch (_) {
+            counterpartIsConsultant = false;
+          }
+        }
+      } catch (_) {}
+    }
+
+    if (!mounted) return;
+    setState(() {
+      _counterpartIsOnline = isOnline;
+      _counterpartLastSeenText = lastSeenText;
+    });
+    if (counterpartIsConsultant != null) {
+      _cubit.updateCounterpartIsConsultant(counterpartIsConsultant);
+    }
+
+    if (counterpartUserId == null) return;
+
+    _presenceOnlineListener = (isOnline) {
+      if (!mounted) return;
+      if (isOnline) {
+        setState(() {
+          _counterpartIsOnline = true;
+          _counterpartLastSeenText = '';
+        });
+        return;
+      }
+      unawaited(_refreshCounterpartOnlineStatus());
+    };
+    await _wsManager.initPresenceDirectChatChannel(widget.conversationUuid);
+    _wsManager.addPresenceDirectChatListener(
+      counterpartUserId: counterpartUserId,
+      onCounterpartOnlineChanged: _presenceOnlineListener!,
+    );
+  }
+
+  Future<void> _refreshCounterpartOnlineStatus() async {
+    try {
+      final chatRoom = await sl<ChatRepository>().getChatRoom(
+        widget.conversationUuid,
+      );
+      final counterpart = resolveChatCounterpart(
+        users: chatRoom.users,
+        currentUserId: _wsManager.userId,
+      );
+      if (!mounted) return;
+      setState(() {
+        _counterpartIsOnline = counterpart.isOnline;
+        _counterpartLastSeenText = counterpart.lastSeenText;
+      });
+    } catch (_) {}
+  }
+
+  @override
+  void dispose() {
+    if (_presenceOnlineListener != null) {
+      _wsManager.removePresenceDirectChatListener(_presenceOnlineListener!);
+      _presenceOnlineListener = null;
+    }
+    _cubit.onCallScreenDisposed();
+    super.dispose();
+  }
+
+  Future<void> _handleBackToChat() async {
+    widget.onBackToChat?.call();
+    await _cubit.leaveCallRoute();
+    if (!mounted) return;
+    if (context.canPop()) context.pop();
+  }
+
+  Future<void> _handleHangUp() async {
+    widget.onHangUp?.call();
+    await _cubit.endCall();
+    if (!mounted) return;
+    if (context.canPop()) context.pop();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    final viewPadding = MediaQuery.viewPaddingOf(context);
+    final topInset = viewPadding.top > 0 ? viewPadding.top : 16.0;
+    final bottomInset = viewPadding.bottom;
+
+    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()),
+                ),
+              ),
+            );
+          }
+
+          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

@@ -0,0 +1,56 @@
+import 'dart:io';
+
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_banner_overlay.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_global_pip_layer.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_system_pip_content.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_system_pip_listener.dart';
+import 'package:floating/floating.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+/// Root overlay shell: system PiP on Android, in-app PiP fallback on iOS.
+class VideoCallAppShell extends StatelessWidget {
+  const VideoCallAppShell({super.key, required this.child});
+
+  final Widget? child;
+
+  @override
+  Widget build(BuildContext context) {
+    final shell = Stack(
+      clipBehavior: Clip.none,
+      children: [
+        child ?? const SizedBox.shrink(),
+        Overlay(
+          key: VideoCallBannerOverlay.overlayKey,
+          initialEntries: const <OverlayEntry>[],
+        ),
+        const VideoCallGlobalPipLayer(),
+        const VideoCallSystemPipListener(),
+      ],
+    );
+
+    if (!Platform.isAndroid) return shell;
+
+    return BlocBuilder<VideoCallSessionCubit, VideoCallSessionState>(
+      bloc: sl<VideoCallSessionCubit>(),
+      buildWhen: (previous, current) =>
+          previous.callStageEntered != current.callStageEntered ||
+          previous.connectPhase != current.connectPhase ||
+          previous.linkIssue != current.linkIssue,
+      builder: (context, state) {
+        final allowSystemPipShell = sl<VideoCallManager>().isActiveCall;
+
+        if (!allowSystemPipShell) return shell;
+
+        return PiPSwitcher(
+          childWhenDisabled: shell,
+          childWhenEnabled: const VideoCallSystemPipContent(),
+        );
+      },
+    );
+  }
+}

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

@@ -0,0 +1,10 @@
+import 'package:flutter/material.dart';
+
+/// Dedicated overlay layer above the app navigator for in-call banners.
+abstract final class VideoCallBannerOverlay {
+  static final GlobalKey<OverlayState> overlayKey = GlobalKey<OverlayState>(
+    debugLabel: 'videoCallBannerOverlay',
+  );
+
+  static OverlayState? get overlayState => overlayKey.currentState;
+}

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

@@ -0,0 +1,352 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/chat/presentation/widgets/chat_user_online_status_line.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_controls.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+class VideoCallConnectingEntranceScreen extends StatelessWidget {
+  const VideoCallConnectingEntranceScreen({
+    super.key,
+    required this.counterpartDisplayName,
+    this.counterpartAvatarUrl,
+    required this.counterpartIsOnline,
+    required this.counterpartLastSeenText,
+    required this.micEnabled,
+    required this.videoEnabled,
+    required this.canEnterCall,
+    required this.onEnterCall,
+    required this.labels,
+    required this.controlLabelStyle,
+    required this.onToggleMic,
+    required this.onToggleVideo,
+    required this.onHangUp,
+    required this.bottomInset,
+  });
+
+  final String counterpartDisplayName;
+  final String? counterpartAvatarUrl;
+  final bool counterpartIsOnline;
+  final String counterpartLastSeenText;
+  final bool micEnabled;
+  final bool videoEnabled;
+  final bool canEnterCall;
+  final VoidCallback onEnterCall;
+  final VideoCallControlLabels labels;
+  final TextStyle controlLabelStyle;
+  final VoidCallback onToggleMic;
+  final VoidCallback onToggleVideo;
+  final VoidCallback onHangUp;
+  final double bottomInset;
+
+  static const double _bottomPanelHeight = 132;
+  static const double _topContentSpacing = 60;
+
+  String _firstChar(String s) {
+    if (s.isEmpty) return '';
+    return String.fromCharCode(s.runes.first);
+  }
+
+  String _initials(String name) {
+    final trimmed = name.trim();
+    if (trimmed.isEmpty) return '?';
+    final parts = trimmed.split(RegExp(r'\s+'));
+    if (parts.length >= 2) {
+      final a = _firstChar(parts[0]);
+      final b = _firstChar(parts[1]);
+      if (a.isNotEmpty && b.isNotEmpty) {
+        return (a + b).toUpperCase();
+      }
+    }
+    final single = parts[0];
+    final runes = single.runes.toList();
+    if (runes.length >= 2) {
+      return String.fromCharCodes([runes[0], runes[1]]).toUpperCase();
+    }
+    final c = _firstChar(single);
+    return c.isNotEmpty ? c.toUpperCase() : '?';
+  }
+
+  Widget _initialsPlaceholder(String initials) {
+    return ColoredBox(
+      color: appTheme.backgroundAvatar,
+      child: Center(
+        child: Text(
+          initials,
+          style: TextStyles.textFS24FW700.copyWith(
+            color: appTheme.blueA400,
+            fontWeight: FontWeight.w600,
+            fontSize: 28,
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _avatar(BuildContext context, String name, String? urlRaw) {
+    final url = urlRaw?.trim();
+    final initials = _initials(name);
+    final border = Border.all(color: appTheme.blueA400, width: 1);
+    if (url != null && url.isNotEmpty) {
+      return Container(
+        width: 100,
+        height: 100,
+        decoration: BoxDecoration(shape: BoxShape.circle, border: border),
+        child: ClipOval(
+          child: Image.network(
+            url,
+            fit: BoxFit.cover,
+            errorBuilder: (context, error, stackTrace) =>
+                _initialsPlaceholder(initials),
+          ),
+        ),
+      );
+    }
+    return Container(
+      width: 100,
+      height: 100,
+      decoration: BoxDecoration(
+        shape: BoxShape.circle,
+        color: appTheme.backgroundAvatar,
+        border: border,
+      ),
+      alignment: Alignment.center,
+      child: Text(
+        initials,
+        style: TextStyles.textFS24FW700.copyWith(
+          color: appTheme.blueA400,
+          fontWeight: FontWeight.w600,
+          fontSize: 28,
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    return ColoredBox(
+      color: appTheme.whiteA700,
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          SafeArea(
+            child: Padding(
+              padding: EdgeInsets.only(
+                bottom: _bottomPanelHeight + bottomInset,
+              ),
+              child: SingleChildScrollView(
+                physics: const ClampingScrollPhysics(),
+                padding: const EdgeInsets.symmetric(horizontal: 24),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    const SizedBox(height: _topContentSpacing),
+                    _avatar(context, counterpartDisplayName, counterpartAvatarUrl),
+                    const SizedBox(height: 16),
+                    _buildStatusLine(context, s),
+                    SizedBox(height: canEnterCall ? 20 : 16),
+                    Text(
+                      s.video_call_screen_connecting_title,
+                      textAlign: TextAlign.center,
+                      style: CustomTextStyles.videoCallFlowPlaceholderTitle,
+                    ),
+                    const SizedBox(height: 16),
+                    Text(
+                      s.video_call_recording_notice,
+                      textAlign: TextAlign.center,
+                      style: CustomTextStyles.videoCallFlowPlaceholderConnectingSubtitle,
+                    ),
+                    const SizedBox(height: 8),
+                    Text(
+                      counterpartDisplayName,
+                      textAlign: TextAlign.center,
+                      style:
+                          CustomTextStyles.videoCallFlowPlaceholderConnectingSubtitle
+                              .copyWith(fontWeight: FontWeight.w700),
+                    ),
+                    const SizedBox(height: 24),
+                  ],
+                ),
+              ),
+            ),
+          ),
+          Positioned(
+            left: 0,
+            right: 0,
+            bottom: 0,
+            height: _bottomPanelHeight + bottomInset,
+            child: DecoratedBox(
+              decoration: BoxDecoration(
+                gradient: LinearGradient(
+                  begin: Alignment.topCenter,
+                  end: Alignment.bottomCenter,
+                  colors: [
+                    Colors.black.withValues(alpha: 0),
+                    Colors.black.withValues(alpha: 0.52),
+                  ],
+                ),
+              ),
+              child: Padding(
+                padding: EdgeInsets.fromLTRB(12, 16, 12, 12 + bottomInset),
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.end,
+                  children: [
+                    Expanded(
+                      child: Center(
+                        child: IgnorePointer(
+                          ignoring: !canEnterCall,
+                          child: Opacity(
+                            opacity: canEnterCall ? 1 : 0.45,
+                            child: VideoCallControlTile(
+                              label: s.video_call_enter,
+                              labelStyle: controlLabelStyle,
+                              onTap: onEnterCall,
+                              face: ClipRRect(
+                                borderRadius: BorderRadius.circular(12),
+                                child: SizedBox(
+                                  width: 48,
+                                  height: 48,
+                                  child: ColoredBox(
+                                    color: appTheme.greenA700,
+                                    child: Center(
+                                      child: SvgPicture.asset(
+                                        'assets/icons/video_call/vc_control_enter.svg',
+                                        width: 28,
+                                        height: 28,
+                                        fit: BoxFit.contain,
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                    Expanded(
+                      child: Center(
+                        child: VideoCallControlTile(
+                          label: labels.sound,
+                          labelStyle: controlLabelStyle,
+                          onTap: onToggleMic,
+                          face: ClipRRect(
+                            borderRadius: BorderRadius.circular(12),
+                            child: SizedBox(
+                              width: 48,
+                              height: 48,
+                              child: micEnabled
+                                  ? ColoredBox(
+                                      color: appTheme.blueA400,
+                                      child: Center(
+                                        child: SvgPicture.asset(
+                                          'assets/icons/video_call/vc_mic_on.svg',
+                                          width: 28,
+                                          height: 28,
+                                        ),
+                                      ),
+                                    )
+                                  : ColoredBox(
+                                      color: appTheme.videoCallControlOffBackground,
+                                      child: Center(
+                                        child: SvgPicture.asset(
+                                          'assets/icons/video_call/vc_mic_off.svg',
+                                          width: 28,
+                                          height: 28,
+                                        ),
+                                      ),
+                                    ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                    Expanded(
+                      child: Center(
+                        child: VideoCallControlTile(
+                          label: labels.video,
+                          labelStyle: controlLabelStyle,
+                          onTap: onToggleVideo,
+                          face: ClipRRect(
+                            borderRadius: BorderRadius.circular(12),
+                            child: SizedBox(
+                              width: 48,
+                              height: 48,
+                              child: videoEnabled
+                                  ? Image.asset(
+                                      'assets/icons/video_call/vc_control_video.png',
+                                      fit: BoxFit.cover,
+                                    )
+                                  : ColoredBox(
+                                      color: appTheme.videoCallControlOffBackground,
+                                      child: Center(
+                                        child: SvgPicture.asset(
+                                          'assets/icons/video_call/vc_cam_off.svg',
+                                          width: 28,
+                                          height: 28,
+                                        ),
+                                      ),
+                                    ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                    Expanded(
+                      child: Center(
+                        child: VideoCallControlTile(
+                          label: labels.leave,
+                          labelStyle: controlLabelStyle,
+                          onTap: onHangUp,
+                          face: ClipRRect(
+                            borderRadius: BorderRadius.circular(12),
+                            child: SizedBox(
+                              width: 48,
+                              height: 48,
+                              child: Image.asset(
+                                'assets/icons/video_call/vc_control_leave.png',
+                                fit: BoxFit.cover,
+                                alignment: const Alignment(0, -0.82),
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildStatusLine(BuildContext context, S s) {
+    final statusStyle = CustomTextStyles.bodySmallMulishBlack900.copyWith(
+      height: 14 / 12,
+    );
+    final onlineStatus = ChatUserOnlineStatusLine(
+      isOnline: counterpartIsOnline,
+      lastSeenText: counterpartLastSeenText,
+      style: statusStyle,
+    );
+
+    if (counterpartIsOnline || counterpartLastSeenText.trim().isNotEmpty) {
+      return Center(child: onlineStatus);
+    }
+
+    if (!canEnterCall) {
+      return Text(
+        s.video_call_screen_connecting_subtitle,
+        textAlign: TextAlign.center,
+        style: statusStyle,
+      );
+    }
+
+    return const SizedBox.shrink();
+  }
+}

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

@@ -0,0 +1,147 @@
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+typedef VideoCallControlLabels = ({String chat, String sound, String video, String leave});
+
+class VideoCallControlColumn extends StatelessWidget {
+  const VideoCallControlColumn({
+    super.key,
+    required this.micEnabled,
+    required this.videoEnabled,
+    required this.onChat,
+    required this.onToggleMic,
+    required this.onToggleVideo,
+    required this.onHangUp,
+    required this.labels,
+    required this.controlLabelStyle,
+  });
+
+  final bool micEnabled;
+  final bool videoEnabled;
+  final VoidCallback onChat;
+  final VoidCallback onToggleMic;
+  final VoidCallback onToggleVideo;
+  final VoidCallback onHangUp;
+  final VideoCallControlLabels labels;
+  final TextStyle controlLabelStyle;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        VideoCallControlTile(
+          label: labels.chat,
+          labelStyle: controlLabelStyle,
+          onTap: onChat,
+          face: ClipRRect(
+            borderRadius: BorderRadius.circular(12),
+            child: Image.asset('assets/icons/video_call/vc_control_chat.png', width: 48, height: 48, fit: BoxFit.cover),
+          ),
+        ),
+        const SizedBox(height: 22),
+        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)),
+                    ),
+            ),
+          ),
+        ),
+        const SizedBox(height: 22),
+        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)),
+                    ),
+            ),
+          ),
+        ),
+        const SizedBox(height: 22),
+        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)),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class VideoCallControlTile extends StatelessWidget {
+  const VideoCallControlTile({super.key, required this.label, required this.labelStyle, required this.onTap, required this.face});
+
+  final String label;
+  final TextStyle labelStyle;
+  final VoidCallback onTap;
+  final Widget face;
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: onTap,
+      borderRadius: BorderRadius.circular(12),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          SizedBox(width: 48, height: 48, child: face),
+          const SizedBox(height: 6),
+          Text(label, style: labelStyle),
+        ],
+      ),
+    );
+  }
+}
+
+class VideoCallPipStyleIconButton extends StatelessWidget {
+  const VideoCallPipStyleIconButton({super.key, required this.onPressed, required this.child});
+
+  final VoidCallback onPressed;
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    return Material(
+      color: appTheme.videoCallPipIconBackground,
+      borderRadius: BorderRadius.circular(8),
+      child: InkWell(
+        borderRadius: BorderRadius.circular(8),
+        onTap: onPressed,
+        child: Padding(padding: const EdgeInsets.all(8), child: child),
+      ),
+    );
+  }
+}

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

@@ -0,0 +1,305 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+const double _kVideoCallFlowBottomBarHeight = 132;
+
+Widget _videoCallFlowBottomBarGradient({
+  required double bottomInset,
+  required Widget child,
+}) {
+  return Positioned(
+    left: 0,
+    right: 0,
+    bottom: 0,
+    height: _kVideoCallFlowBottomBarHeight + bottomInset,
+    child: DecoratedBox(
+      decoration: BoxDecoration(
+        gradient: LinearGradient(
+          begin: Alignment.topCenter,
+          end: Alignment.bottomCenter,
+          colors: [
+            Colors.black.withValues(alpha: 0),
+            Colors.black.withValues(alpha: 0.52),
+          ],
+        ),
+      ),
+      child: Padding(
+        padding: EdgeInsets.fromLTRB(24, 24, 24, 24 + bottomInset),
+        child: child,
+      ),
+    ),
+  );
+}
+
+ButtonStyle _videoCallFlowBarButtonStyle({required Color backgroundColor}) {
+  return FilledButton.styleFrom(
+    backgroundColor: backgroundColor,
+    foregroundColor: appTheme.whiteA700,
+    padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+    minimumSize: const Size(0, 48),
+    tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+    shape: RoundedRectangleBorder(
+      borderRadius: BorderRadius.circular(8),
+    ),
+  );
+}
+
+class _VideoCallFlowScaffold extends StatelessWidget {
+  const _VideoCallFlowScaffold({required this.child});
+
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    return ColoredBox(
+      color: appTheme.whiteA700,
+      child: SafeArea(
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 28),
+          child: Column(
+            children: [
+              const SizedBox(height: 40),
+              Image.asset(
+                'assets/icons/video_call/eatvio_c.png',
+                width: 88,
+                height: 88,
+                fit: BoxFit.contain,
+              ),
+              const SizedBox(height: 32),
+              Expanded(child: Center(child: child)),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class VideoCallLoadingScreen extends StatelessWidget {
+  const VideoCallLoadingScreen({super.key, required this.onClose});
+
+  final VoidCallback onClose;
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    final bottomInset = MediaQuery.viewPaddingOf(context).bottom;
+    return ColoredBox(
+      color: appTheme.whiteA700,
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          SafeArea(
+            bottom: false,
+            child: Padding(
+              padding: EdgeInsets.only(
+                bottom: _kVideoCallFlowBottomBarHeight + bottomInset,
+              ),
+              child: Center(
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    SizedBox(
+                      width: 40,
+                      height: 40,
+                      child: CircularProgressIndicator(
+                        strokeWidth: 3,
+                        color: appTheme.blueA400,
+                      ),
+                    ),
+                    const SizedBox(height: 28),
+                    Text(
+                      s.video_call_screen_loading_title,
+                      textAlign: TextAlign.center,
+                      style: CustomTextStyles.videoCallFlowPlaceholderTitle,
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+          _videoCallFlowBottomBarGradient(
+            bottomInset: bottomInset,
+            child: Align(
+              alignment: Alignment.bottomCenter,
+              child: FilledButton.icon(
+                onPressed: onClose,
+                style: _videoCallFlowBarButtonStyle(
+                  backgroundColor: appTheme.videoCallControlOffBackground,
+                ),
+                icon: Icon(
+                  Icons.close,
+                  size: 18,
+                  color: appTheme.whiteA700,
+                ),
+                label: Text(
+                  s.video_call_close,
+                  style: CustomTextStyles.videoCallFlowPlaceholderFilledButtonLabel,
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class VideoCallConnectingScreen extends StatelessWidget {
+  const VideoCallConnectingScreen({super.key, required this.isReconnecting});
+
+  final bool isReconnecting;
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    final title = isReconnecting
+        ? s.video_call_screen_reconnecting_title
+        : s.video_call_screen_connecting_title;
+    final subtitle = isReconnecting
+        ? s.video_call_screen_reconnecting_subtitle
+        : s.video_call_screen_connecting_subtitle;
+    return _VideoCallFlowScaffold(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          SizedBox(
+            width: 44,
+            height: 44,
+            child: CircularProgressIndicator(
+              strokeWidth: 3,
+              color: appTheme.blueA400,
+            ),
+          ),
+          const SizedBox(height: 28),
+          Text(
+            title,
+            textAlign: TextAlign.center,
+            style: CustomTextStyles.videoCallFlowPlaceholderTitle,
+          ),
+          const SizedBox(height: 8),
+          Text(
+            subtitle,
+            textAlign: TextAlign.center,
+            style: isReconnecting
+                ? CustomTextStyles.videoCallFlowPlaceholderReconnectingSubtitle
+                : CustomTextStyles.videoCallFlowPlaceholderConnectingSubtitle,
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class VideoCallConnectionLostScreen extends StatelessWidget {
+  const VideoCallConnectionLostScreen({
+    super.key,
+    required this.detailMessage,
+    required this.onRetry,
+    required this.onLeave,
+  });
+
+  final String? detailMessage;
+  final VoidCallback onRetry;
+  final VoidCallback onLeave;
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    final bottomInset = MediaQuery.viewPaddingOf(context).bottom;
+    return ColoredBox(
+      color: appTheme.whiteA700,
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          SafeArea(
+            bottom: false,
+            child: Padding(
+              padding: EdgeInsets.only(
+                left: 24,
+                right: 24,
+                bottom: _kVideoCallFlowBottomBarHeight + bottomInset,
+              ),
+              child: Center(
+                child: SingleChildScrollView(
+                  physics: const ClampingScrollPhysics(),
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      SvgPicture.asset(
+                        'assets/icons/video_call/poor_connection.svg',
+                        width: 120,
+                        height: 107,
+                        fit: BoxFit.contain,
+                      ),
+                      const SizedBox(height: 16),
+                      Text(
+                        s.video_call_connection_lost_title,
+                        textAlign: TextAlign.center,
+                        style: CustomTextStyles.videoCallFlowPlaceholderTitle,
+                      ),
+                      const SizedBox(height: 8),
+                      Text(
+                        s.video_call_connection_lost_message,
+                        textAlign: TextAlign.center,
+                        style: CustomTextStyles
+                            .videoCallFlowPlaceholderConnectionLostBody,
+                      ),
+                      if (detailMessage != null &&
+                          detailMessage!.trim().isNotEmpty) ...[
+                        const SizedBox(height: 16),
+                        Text(
+                          detailMessage!,
+                          textAlign: TextAlign.center,
+                          style: CustomTextStyles
+                              .videoCallFlowPlaceholderConnectionLostDetail,
+                        ),
+                      ],
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+          _videoCallFlowBottomBarGradient(
+            bottomInset: bottomInset,
+            child: Row(
+              crossAxisAlignment: CrossAxisAlignment.end,
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                FilledButton(
+                  onPressed: onRetry,
+                  style: _videoCallFlowBarButtonStyle(
+                    backgroundColor: appTheme.greenA700,
+                  ),
+                  child: Text(
+                    s.video_call_try_again,
+                    style: CustomTextStyles.videoCallFlowPlaceholderFilledButtonLabel,
+                  ),
+                ),
+                FilledButton.icon(
+                  onPressed: onLeave,
+                  style: _videoCallFlowBarButtonStyle(
+                    backgroundColor: appTheme.videoCallControlOffBackground,
+                  ),
+                  icon: Icon(
+                    Icons.close,
+                    size: 18,
+                    color: appTheme.whiteA700,
+                  ),
+                  label: Text(
+                    s.video_call_close,
+                    style: CustomTextStyles.videoCallFlowPlaceholderFilledButtonLabel,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

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

@@ -0,0 +1,160 @@
+import 'dart:async';
+import 'dart:io';
+import 'dart:math' as math;
+
+import 'package:eatvio_app/core/app_router.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+import 'package:eatvio_app/features/video_calls/presentation/pages/video_call_screen.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_pip_video_preview.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
+
+class VideoCallGlobalPipLayer extends StatefulWidget {
+  const VideoCallGlobalPipLayer({super.key});
+
+  @override
+  State<VideoCallGlobalPipLayer> createState() =>
+      _VideoCallGlobalPipLayerState();
+}
+
+class _VideoCallGlobalPipLayerState extends State<VideoCallGlobalPipLayer> {
+  static const double _pipW = 142;
+  static const double _pipH = 201;
+  static const double _edgeInset = 8;
+  static const double _pipInitialExtraLeft = 28;
+  static const double _pipInitialExtraDown = 16;
+
+  double? _pipLeft;
+  double? _pipTop;
+  Offset? _pipPanPointerGlobal;
+  double? _pipPanOriginLeft;
+  double? _pipPanOriginTop;
+
+  void _resetPipPanState() {
+    _pipPanPointerGlobal = null;
+    _pipPanOriginLeft = null;
+    _pipPanOriginTop = null;
+  }
+
+  void _openFullscreenRoute(VideoCallSessionState s) {
+    final ctx = AppRouter.navigatorKey.currentContext;
+    if (ctx == null) return;
+    unawaited(sl<VideoCallSessionCubit>().restoreFullscreenFromPip());
+    GoRouter.of(ctx).pushNamed(
+      VideoCallScreen.name,
+      extra: <String, dynamic>{
+        'conversationUuid': s.conversationUuid,
+        'counterpartName': s.counterpartName,
+        'localParticipantName': s.localParticipantName,
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<VideoCallSessionCubit, VideoCallSessionState>(
+      bloc: sl<VideoCallSessionCubit>(),
+      buildWhen: (a, b) =>
+          a.uiMode != b.uiMode ||
+          a.connectPhase != b.connectPhase ||
+          a.callStageEntered != b.callStageEntered ||
+          a.videoEnabled != b.videoEnabled,
+      builder: (context, state) {
+        if (state.uiMode != VideoCallUiMode.pip ||
+            state.connectPhase != VideoCallConnectPhase.connected ||
+            !state.callStageEntered) {
+          return const SizedBox.shrink();
+        }
+        final cubit = context.read<VideoCallSessionCubit>();
+        if (Platform.isAndroid && cubit.isCallScreenRouteVisible) {
+          return const SizedBox.shrink();
+        }
+        final room = cubit.liveKitRoom;
+        if (room == null) return const SizedBox.shrink();
+
+        final mq = MediaQuery.of(context);
+        final maxW = mq.size.width;
+        final maxH = mq.size.height;
+        final topInset = mq.viewPadding.top > 0 ? mq.viewPadding.top : 16.0;
+        final bottomInset = mq.viewPadding.bottom;
+        final defaultPipLeft = maxW - _pipW - _edgeInset - _pipInitialExtraLeft;
+        final minPipTop = topInset + _edgeInset;
+        final defaultPipTop = minPipTop + _pipInitialExtraDown;
+        final maxPipLeft = math.max(_edgeInset, maxW - _pipW - _edgeInset);
+        final maxPipTop = math.max(
+          minPipTop,
+          maxH - _pipH - _edgeInset - bottomInset,
+        );
+        final pipLeft =
+            ((_pipLeft ?? defaultPipLeft).clamp(_edgeInset, maxPipLeft) as num)
+                .toDouble();
+        final pipTop =
+            ((_pipTop ?? defaultPipTop).clamp(minPipTop, maxPipTop) as num)
+                .toDouble();
+
+        return Material(
+          type: MaterialType.transparency,
+          child: ListenableBuilder(
+            listenable: videoCallRoomTracksListenable(room),
+            builder: (context, _) {
+              return Stack(
+                clipBehavior: Clip.none,
+                children: [
+                  Positioned(
+                    left: pipLeft,
+                    top: pipTop,
+                    child: GestureDetector(
+                      behavior: HitTestBehavior.opaque,
+                      onTap: () => _openFullscreenRoute(state),
+                      onPanStart: (details) {
+                        _pipPanPointerGlobal = details.globalPosition;
+                        _pipPanOriginLeft = pipLeft;
+                        _pipPanOriginTop = pipTop;
+                      },
+                      onPanUpdate: (details) {
+                        if (_pipPanPointerGlobal == null ||
+                            _pipPanOriginLeft == null ||
+                            _pipPanOriginTop == null) {
+                          return;
+                        }
+                        final delta =
+                            details.globalPosition - _pipPanPointerGlobal!;
+                        setState(() {
+                          final nx = (_pipPanOriginLeft! + delta.dx)
+                              .clamp(_edgeInset, maxPipLeft);
+                          final ny = (_pipPanOriginTop! + delta.dy).clamp(
+                            minPipTop,
+                            maxPipTop,
+                          );
+                          _pipLeft = (nx as num).toDouble();
+                          _pipTop = (ny as num).toDouble();
+                        });
+                      },
+                      onPanEnd: (_) => _resetPipPanState(),
+                      onPanCancel: _resetPipPanState,
+                      child: ClipRRect(
+                        borderRadius: BorderRadius.circular(8),
+                        child: SizedBox(
+                          width: _pipW,
+                          height: _pipH,
+                          child: VideoCallPipVideoPreview(
+                            sessionState: state,
+                            room: room,
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+}

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

@@ -0,0 +1,45 @@
+import 'package:livekit_client/livekit_client.dart' as lk;
+
+abstract final class VideoCallLiveKitTrackUtils {
+  static lk.VideoTrack? asVideoTrack(lk.Track? track) {
+    if (track == null) return null;
+    return track is lk.VideoTrack ? track : null;
+  }
+
+  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;
+  }
+
+  static lk.VideoTrack? remoteCameraVideoTrack(lk.Room room) {
+    for (final participant in room.remoteParticipants.values) {
+      final fromCameraPub = visibleVideoFromPublication(
+        participant.getTrackPublicationBySource(lk.TrackSource.camera),
+      );
+      if (fromCameraPub != null) return fromCameraPub;
+
+      for (final pub in participant.videoTrackPublications) {
+        if (pub.source == lk.TrackSource.screenShareVideo ||
+            pub.source == lk.TrackSource.screenShareAudio) {
+          continue;
+        }
+        final v = visibleVideoFromPublication(pub);
+        if (v != null) return v;
+      }
+    }
+    return null;
+  }
+
+  static lk.VideoTrack? localCameraVideoTrack(lk.Room room) {
+    return visibleVideoFromPublication(
+      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

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

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

@@ -0,0 +1,23 @@
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:flutter/material.dart';
+
+class VideoCallNoVideoBackground extends StatelessWidget {
+  const VideoCallNoVideoBackground({super.key, this.logoSize = 96});
+
+  final double logoSize;
+
+  @override
+  Widget build(BuildContext context) {
+    return ColoredBox(
+      color: appTheme.gray100,
+      child: Center(
+        child: Image.asset(
+          'assets/icons/video_call/eatvio_c.png',
+          width: logoSize,
+          height: logoSize,
+          fit: BoxFit.contain,
+        ),
+      ),
+    );
+  }
+}

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

@@ -0,0 +1,73 @@
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_livekit_track_utils.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_no_video_background.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_remote_video_stage.dart';
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_room_tracks_listenable.dart';
+import 'package:flutter/material.dart';
+import 'package:livekit_client/livekit_client.dart' as lk;
+
+/// Shared compact preview for both in-app and Android system PiP.
+class VideoCallPipVideoPreview extends StatelessWidget {
+  const VideoCallPipVideoPreview({
+    super.key,
+    required this.sessionState,
+    required this.room,
+  });
+
+  final VideoCallSessionState sessionState;
+  final lk.Room room;
+
+  static const double _pipNoVideoLogoSize = 56;
+
+  @override
+  Widget build(BuildContext context) {
+    return ListenableBuilder(
+      listenable: videoCallRoomTracksListenable(room),
+      builder: (context, _) {
+        if (VideoCallLiveKitTrackUtils.isSoloInRoom(room)) {
+          return _VideoCallPipLocalPreview(
+            room: room,
+            videoEnabled: sessionState.videoEnabled,
+          );
+        }
+
+        return VideoCallRemoteVideoStage(
+          room: room,
+          connectError: null,
+          noVideoLogoSize: _pipNoVideoLogoSize,
+        );
+      },
+    );
+  }
+}
+
+class _VideoCallPipLocalPreview extends StatelessWidget {
+  const _VideoCallPipLocalPreview({
+    required this.room,
+    required this.videoEnabled,
+  });
+
+  final lk.Room room;
+  final bool videoEnabled;
+
+  @override
+  Widget build(BuildContext context) {
+    if (!videoEnabled) {
+      return const VideoCallNoVideoBackground(logoSize: 56);
+    }
+
+    final local = VideoCallLiveKitTrackUtils.localCameraVideoTrack(room);
+    if (local != null) {
+      return IgnorePointer(
+        child: lk.VideoTrackRenderer(
+          local,
+          key: ValueKey(local.sid),
+          fit: lk.VideoViewFit.cover,
+          mirrorMode: lk.VideoViewMirrorMode.auto,
+        ),
+      );
+    }
+
+    return const VideoCallNoVideoBackground(logoSize: 56);
+  }
+}

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

@@ -0,0 +1,68 @@
+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;
+
+class VideoCallRemoteVideoStage extends StatelessWidget {
+  const VideoCallRemoteVideoStage({
+    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),
+      builder: (context, _) {
+        final remote = VideoCallLiveKitTrackUtils.remoteCameraVideoTrack(room);
+        if (remote != null) {
+          return lk.VideoTrackRenderer(
+            remote,
+            key: ValueKey(remote.sid),
+            fit: lk.VideoViewFit.cover,
+          );
+        }
+        final showConnectError =
+            connectError != null &&
+            room.connectionState != lk.ConnectionState.connected;
+        return Stack(
+          fit: StackFit.expand,
+          children: [
+            VideoCallNoVideoBackground(logoSize: noVideoLogoSize),
+            if (showConnectError)
+              Center(
+                child: Padding(
+                  padding: const EdgeInsets.all(24),
+                  child: Text(
+                    connectError!,
+                    textAlign: TextAlign.center,
+                    style: TextStyles.textSMedium.copyWith(color: appTheme.red),
+                  ),
+                ),
+              )
+            else if (room.connectionState != lk.ConnectionState.connected)
+              Center(
+                child: SizedBox(
+                  width: 36,
+                  height: 36,
+                  child: CircularProgressIndicator(
+                    strokeWidth: 3,
+                    color: appTheme.blueA400,
+                  ),
+                ),
+              ),
+          ],
+        );
+      },
+    );
+  }
+}

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

@@ -0,0 +1,11 @@
+import 'package:flutter/foundation.dart';
+import 'package:livekit_client/livekit_client.dart' as lk;
+
+
+Listenable videoCallRoomTracksListenable(lk.Room room) {
+  return Listenable.merge([
+    room,
+    ...room.remoteParticipants.values,
+    if (room.localParticipant != null) room.localParticipant!,
+  ]);
+}

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

@@ -0,0 +1,555 @@
+import 'dart:math' as math;
+
+import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_controls.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_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;
+
+const _kExpandShrinkOuterPadding = EdgeInsets.all(6);
+
+abstract final class _VideoCallStageAssets {
+  static const String shrink = 'assets/icons/video_call/vc_shrink.svg';
+  static const String expand = 'assets/icons/video_call/vc_expand.svg';
+  static const String cameraSwitch = 'assets/icons/video_call/vc_camera_switch.png';
+}
+
+class VideoCallStageLayout extends StatefulWidget {
+  const VideoCallStageLayout({
+    super.key,
+    required this.room,
+    required this.connectError,
+    required this.localDisplayName,
+    required this.remoteDisplayName,
+    this.remoteIsConsultant = false,
+    required this.micEnabled,
+    required this.videoEnabled,
+    required this.splitParticipantView,
+    required this.mainStageShowsLocalVideo,
+    required this.useFrontCamera,
+    required this.onExpandLocal,
+    required this.onExpandRemote,
+    required this.onShrinkFromFullscreen,
+    required this.onToggleStageSwap,
+    required this.onChat,
+    required this.onToggleMic,
+    required this.onToggleVideo,
+    required this.onHangUp,
+    required this.onSwitchCamera,
+    required this.controlLabelStyle,
+    required this.labels,
+    required this.topInset,
+    this.bottomInset = 0,
+  });
+
+  final lk.Room room;
+  final String? connectError;
+  final String localDisplayName;
+  final String remoteDisplayName;
+  final bool remoteIsConsultant;
+  final bool micEnabled;
+  final bool videoEnabled;
+  final bool splitParticipantView;
+  final bool mainStageShowsLocalVideo;
+  final bool useFrontCamera;
+  final VoidCallback onExpandLocal;
+  final VoidCallback onExpandRemote;
+  final VoidCallback onShrinkFromFullscreen;
+  final VoidCallback onToggleStageSwap;
+  final VoidCallback onChat;
+  final VoidCallback onToggleMic;
+  final VoidCallback onToggleVideo;
+  final VoidCallback onHangUp;
+  final VoidCallback onSwitchCamera;
+  final TextStyle controlLabelStyle;
+  final VideoCallControlLabels labels;
+  final double topInset;
+
+  final double bottomInset;
+
+  @override
+  State<VideoCallStageLayout> createState() => _VideoCallStageLayoutState();
+}
+
+class _VideoCallStageLayoutState extends State<VideoCallStageLayout> {
+  static const double _pipW = 142;
+  static const double _pipH = 201;
+  static const double _mainStageCornerRadius = 24;
+  static const double _edgeInset = 8;
+  static const double _controlsHorizontalInset = 22;
+  static const double _shrinkExpandExtraTop = 12;
+  static const double _pipInitialExtraLeft = 28;
+  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;
+  Offset? _pipPanPointerGlobal;
+  double? _pipPanOriginLeft;
+  double? _pipPanOriginTop;
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        if (widget.splitParticipantView) {
+          return _buildSplitLayout(constraints);
+        }
+        return _buildFullscreenLayout(constraints);
+      },
+    );
+  }
+
+  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),
+                  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: BorderRadius.circular(_mainStageCornerRadius),
+                  ),
+                ),
+              ),
+              ..._bottomBarGradient(),
+              ..._bottomControlsRow(),
+            ],
+          );
+        }
+
+        return Stack(
+          fit: StackFit.expand,
+          children: [
+            Positioned.fill(
+              child: Padding(
+                padding: EdgeInsets.fromLTRB(_edgeInset, widget.topInset + _edgeInset, _edgeInset, _edgeInset),
+                child: Column(
+                  children: [
+                    Expanded(
+                      flex: _splitRemoteFlex,
+                      child: _SplitParticipantPane(
+                        room: widget.room,
+                        displayName: widget.remoteDisplayName,
+                        isConsultant: widget.remoteIsConsultant,
+                        isLocal: false,
+                        connectError: widget.connectError,
+                        videoEnabled: widget.videoEnabled,
+                        useFrontCamera: widget.useFrontCamera,
+                        onExpand: widget.onExpandRemote,
+                        onSwitchCamera: widget.onSwitchCamera,
+                        borderRadius: const BorderRadius.only(
+                          topLeft: Radius.circular(_mainStageCornerRadius),
+                          topRight: Radius.circular(_mainStageCornerRadius),
+                          bottomLeft: Radius.zero,
+                          bottomRight: Radius.zero,
+                        ),
+                      ),
+                    ),
+                    const SizedBox(height: _edgeInset),
+                    Expanded(
+                      flex: _splitLocalFlex,
+                      child: _SplitParticipantPane(
+                        room: widget.room,
+                        displayName: widget.localDisplayName,
+                        isLocal: true,
+                        connectError: null,
+                        videoEnabled: widget.videoEnabled,
+                        useFrontCamera: widget.useFrontCamera,
+                        onExpand: widget.onExpandLocal,
+                        onSwitchCamera: widget.onSwitchCamera,
+                        borderRadius: const BorderRadius.only(
+                          topLeft: Radius.zero,
+                          topRight: Radius.zero,
+                          bottomLeft: Radius.circular(_mainStageCornerRadius),
+                          bottomRight: Radius.circular(_mainStageCornerRadius),
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+            ..._bottomBarGradient(),
+            ..._bottomControlsRow(),
+          ],
+        );
+      },
+    );
+  }
+
+  Widget _buildFullscreenLayout(BoxConstraints constraints) {
+    final maxW = constraints.maxWidth;
+    final maxH = constraints.maxHeight;
+    final defaultPipLeft = maxW - _pipW - _edgeInset - _pipInitialExtraLeft;
+    final minPipTop = widget.topInset + _edgeInset;
+    final defaultPipTop = minPipTop + _pipInitialExtraDown;
+    final maxPipLeft = math.max(_edgeInset, maxW - _pipW - _edgeInset);
+    final maxPipTop = math.max(minPipTop, maxH - _pipH - _edgeInset - widget.bottomInset);
+    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,
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+            ..._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,
+                            ),
+                    ),
+                  ),
+                ),
+              ),
+          ],
+        );
+      },
+    );
+  }
+
+  List<Widget> _bottomBarGradient() {
+    return [
+      Positioned(
+        left: 0,
+        right: 0,
+        bottom: 0,
+        height: _bottomGradientHeight + widget.bottomInset,
+        child: IgnorePointer(
+          child: DecoratedBox(
+            decoration: BoxDecoration(
+              gradient: LinearGradient(
+                begin: Alignment.bottomCenter,
+                end: Alignment.topCenter,
+                colors: [Colors.black.withValues(alpha: 0.55), Colors.black.withValues(alpha: 0)],
+              ),
+            ),
+          ),
+        ),
+      ),
+    ];
+  }
+
+  void _resetPipPanState() {
+    _pipPanPointerGlobal = null;
+    _pipPanOriginLeft = null;
+    _pipPanOriginTop = null;
+  }
+
+  List<Widget> _bottomControlsRow() {
+    return [
+      Positioned(
+        left: _controlsHorizontalInset,
+        right: _controlsHorizontalInset,
+        bottom: _edgeInset + 4 + widget.bottomInset,
+        child: Row(
+          crossAxisAlignment: CrossAxisAlignment.end,
+          children: [
+            const Expanded(child: SizedBox.shrink()),
+            const SizedBox(width: 14),
+            VideoCallControlColumn(
+              micEnabled: widget.micEnabled,
+              videoEnabled: widget.videoEnabled,
+              onChat: widget.onChat,
+              onToggleMic: widget.onToggleMic,
+              onToggleVideo: widget.onToggleVideo,
+              onHangUp: widget.onHangUp,
+              labels: widget.labels,
+              controlLabelStyle: widget.controlLabelStyle,
+            ),
+          ],
+        ),
+      ),
+    ];
+  }
+}
+
+class _SplitParticipantPane extends StatelessWidget {
+  const _SplitParticipantPane({
+    required this.room,
+    required this.displayName,
+    this.isConsultant = false,
+    required this.isLocal,
+    required this.connectError,
+    required this.videoEnabled,
+    required this.useFrontCamera,
+    required this.onExpand,
+    required this.onSwitchCamera,
+    required this.borderRadius,
+  });
+
+  final lk.Room room;
+  final String displayName;
+  final bool isConsultant;
+  final bool isLocal;
+  final String? connectError;
+  final bool videoEnabled;
+  final bool useFrontCamera;
+  final VoidCallback onExpand;
+  final VoidCallback onSwitchCamera;
+  final BorderRadius borderRadius;
+
+  @override
+  Widget build(BuildContext context) {
+    return Material(
+      type: MaterialType.transparency,
+      clipBehavior: Clip.antiAlias,
+      shape: RoundedRectangleBorder(borderRadius: borderRadius),
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          Positioned.fill(
+            child: ListenableBuilder(
+              listenable: videoCallRoomTracksListenable(room),
+              builder: (context, _) {
+                if (isLocal) {
+                  if (!videoEnabled) {
+                    return const VideoCallNoVideoBackground();
+                  }
+                  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();
+                }
+                return VideoCallRemoteVideoStage(room: room, connectError: connectError);
+              },
+            ),
+          ),
+          VideoCallParticipantNameLabel(
+            name: displayName,
+            isConsultant: !isLocal && isConsultant,
+          ),
+          Positioned(
+            left: 0,
+            top: _VideoCallStageLayoutState._splitExpandButtonTop,
+            child: Padding(
+              padding: _kExpandShrinkOuterPadding,
+              child: VideoCallPipStyleIconButton(
+                onPressed: onExpand,
+                child: SvgPicture.asset(_VideoCallStageAssets.expand, width: 20, height: 20, fit: BoxFit.contain),
+              ),
+            ),
+          ),
+          if (isLocal && videoEnabled)
+            Positioned(
+              right: 10,
+              top: 10,
+              child: Padding(
+                padding: _kExpandShrinkOuterPadding,
+                child: VideoCallPipStyleIconButton(
+                  onPressed: onSwitchCamera,
+                  child: Image.asset(_VideoCallStageAssets.cameraSwitch, width: 20, height: 20, fit: BoxFit.contain, key: ValueKey(useFrontCamera)),
+                ),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+}
+
+class _VideoCallMainStage extends StatelessWidget {
+  const _VideoCallMainStage({required this.room, required this.connectError, required this.mainShowsLocal, required this.videoEnabled});
+
+  final lk.Room room;
+  final String? connectError;
+  final bool mainShowsLocal;
+  final bool videoEnabled;
+
+  @override
+  Widget build(BuildContext context) {
+    return ListenableBuilder(
+      listenable: videoCallRoomTracksListenable(room),
+      builder: (context, _) {
+        if (mainShowsLocal) {
+          if (!videoEnabled) {
+            return const VideoCallNoVideoBackground();
+          }
+          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();
+        }
+        return VideoCallRemoteVideoStage(room: room, connectError: connectError);
+      },
+    );
+  }
+}
+
+class _VideoCallPipRemoteContent extends StatelessWidget {
+  const _VideoCallPipRemoteContent({required this.room});
+
+  final lk.Room room;
+
+  @override
+  Widget build(BuildContext context) {
+    return IgnorePointer(
+      child: VideoCallRemoteVideoStage(
+        room: room,
+        connectError: null,
+        noVideoLogoSize: 56,
+      ),
+    );
+  }
+}
+
+class _VideoCallPipLocalContent extends StatelessWidget {
+  const _VideoCallPipLocalContent({required this.room, required this.videoEnabled, required this.useFrontCamera, required this.onSwitchCamera});
+
+  final lk.Room room;
+  final bool videoEnabled;
+  final bool useFrontCamera;
+  final VoidCallback onSwitchCamera;
+
+  @override
+  Widget build(BuildContext context) {
+    final local = VideoCallLiveKitTrackUtils.localCameraVideoTrack(room);
+    return Stack(
+      fit: StackFit.expand,
+      children: [
+        if (!videoEnabled)
+          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,
+            ),
+          )
+        else
+          const VideoCallNoVideoBackground(logoSize: 56),
+        if (videoEnabled)
+          Positioned(
+            right: 10,
+            top: 10,
+            child: VideoCallPipStyleIconButton(
+              onPressed: onSwitchCamera,
+              child: Image.asset(_VideoCallStageAssets.cameraSwitch, width: 20, height: 20, fit: BoxFit.contain, key: ValueKey(useFrontCamera)),
+            ),
+          ),
+      ],
+    );
+  }
+}