Merge pull request 'feat(sbp_payments): QR-код оплаты СБП с другого устройства' (#1120) from apoloz/eatvio_app:feat/sbp-qr-payment into main

Reviewed-on: eatvio/eatvio_app#1120
Reviewed-by: misha <misha@noreply.localhost>

.gitea/workflows/test.yml

@@ -14,7 +14,7 @@ env:
 
 jobs:
   build:
-    runs-on: [ubuntu-latest]
+    runs-on: [debian-12]
 
     steps:
       - uses: https://github.com/actions/checkout@v3
@@ -155,10 +155,10 @@ jobs:
 
       - name: Get dependencies
         run: |
-            flutter clean
-            flutter pub cache repair
-            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

android/app/build.gradle

@@ -39,7 +39,7 @@ android {
         versionName = flutter.versionName
         manifestPlaceholders = [
                 YANDEX_CLIENT_ID: yandexClientId,
-                applicationName: "io.flutter.app.FlutterApplication"
+                applicationName: "com.eatvioapp.app.EatvioApplication"
         ]
     }
 

android/app/src/main/AndroidManifest.xml

@@ -87,8 +87,11 @@
             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. -->
+        <!-- The incoming notification's content intent and full-screen intent both open
+             CallkitIncomingActivity. Replace it with a bridge: a tap on an unlocked phone
+             routes to the same accept flow as Answer; on a locked/dark screen it shows a
+             ringing screen that wakes the device. Own task affinity keeps the plugin's
+             CLEAR_TASK flag from killing MainActivity. -->
         <activity
             android:name="com.hiennv.flutter_callkit_incoming.CallkitIncomingActivity"
             tools:node="remove" />
@@ -97,20 +100,26 @@
             android:name=".EatvioCallkitIncomingBridgeActivity"
             android:exported="false"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:taskAffinity=""
+            android:allowTaskReparenting="false"
             android:excludeFromRecents="true"
             android:noHistory="true"
+            android:showWhenLocked="true"
             android:turnScreenOn="true"
-            android:launchMode="singleTop"
+            android:launchMode="singleInstance"
             android:configChanges="orientation" />
 
         <activity-alias
             android:name="com.hiennv.flutter_callkit_incoming.CallkitIncomingActivity"
             android:targetActivity=".EatvioCallkitIncomingBridgeActivity"
             android:exported="true"
+            android:taskAffinity=""
+            android:allowTaskReparenting="false"
             android:excludeFromRecents="true"
             android:noHistory="true"
+            android:showWhenLocked="true"
             android:turnScreenOn="true"
-            android:launchMode="singleTop"
+            android:launchMode="singleInstance"
             android:configChanges="orientation"
             android:permission="${applicationId}.PERMISSION_CALL">
             <intent-filter>

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

@@ -13,14 +13,12 @@ object CallKitAcceptIntentMapper {
             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),
-        )
+        return payloadMap(data, action)
+    }
+
+    fun declinePayloadFromBundle(data: Bundle, action: String): Map<String, Any?>? {
+        if (!action.contains(CallkitConstants.ACTION_CALL_DECLINE)) return null
+        return payloadMap(data, action)
     }
 
     fun payloadFromIntent(intent: Intent?): Map<String, Any?>? {
@@ -35,6 +33,16 @@ object CallKitAcceptIntentMapper {
             return null
         }
 
+        return payloadMap(data, action)
+    }
+
+    fun clearCallKitLaunchIntent(intent: Intent?) {
+        if (intent == null) return
+        intent.removeExtra(FlutterCallkitIncomingPlugin.EXTRA_CALLKIT_CALL_DATA)
+        intent.action = null
+    }
+
+    private fun payloadMap(data: Bundle, action: String): Map<String, Any?> {
         return hashMapOf(
             "action" to action,
             "id" to data.getString(CallkitConstants.EXTRA_CALLKIT_ID, ""),
@@ -44,10 +52,4 @@ object CallKitAcceptIntentMapper {
             "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

@@ -16,6 +16,12 @@ object CallKitIntentBridge {
             CallKitAcceptIntentMapper.payloadFromBundle(data, action)?.let { payload ->
                 PendingCallKitAcceptBridge.store(payload)
             }
+            CallKitAcceptIntentMapper.declinePayloadFromBundle(data, action)?.let { payload ->
+                PendingCallKitDeclineBridge.store(payload)
+                if (MainActivity.isInForeground) {
+                    MainActivity.onPendingDecline?.invoke()
+                }
+            }
         }
 
         val broadcastIntent = CallkitIncomingBroadcastReceiver.getIntent(context, action, data)

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

@@ -0,0 +1,10 @@
+package com.eatvioapp.app
+
+import android.app.Application
+
+class EatvioApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        VideoCallDeclineReporter.install(this)
+    }
+}

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

@@ -1,12 +1,71 @@
 package com.eatvioapp.app
 
 import android.app.Activity
+import android.app.KeyguardManager
+import android.content.Context
+import android.content.Intent
+import android.content.pm.ActivityInfo
+import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.os.PowerManager
+import android.util.Log
+import android.view.View
+import android.view.WindowManager
+import android.view.ViewGroup.MarginLayoutParams
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import com.hiennv.flutter_callkit_incoming.AppUtils
 import com.hiennv.flutter_callkit_incoming.CallkitConstants
+import com.hiennv.flutter_callkit_incoming.CallkitNotificationManager
+import com.hiennv.flutter_callkit_incoming.ImageLoaderProvider
+import com.hiennv.flutter_callkit_incoming.Utils
+import com.hiennv.flutter_callkit_incoming.widgets.RippleRelativeLayout
+import java.lang.ref.WeakReference
+import kotlin.math.abs
+import com.hiennv.flutter_callkit_incoming.R as CallkitR
 
-/// Redirects notification body / full-screen intent taps to the same accept path as
-/// the Answer button, instead of showing the native Callkit incoming UI.
+/// Target of the incoming notification's content intent and full-screen intent.
+///
+/// Unlocked, lit screen: the user tapped the notification body, route it to the same
+/// accept flow as the Answer button.
+///
+/// Locked or dark screen: Android fired the full-screen intent on its own, so show a
+/// ringing screen that wakes the device and lets the user answer or decline.
 class EatvioCallkitIncomingBridgeActivity : Activity() {
+    companion object {
+        private const val TAG = "EatvioIncomingBridge"
+        private const val WAKE_LOCK_TAG = "eatvio:incoming_call"
+        private const val DEFAULT_RING_DURATION_MS = 45_000L
+        private const val MIN_RING_SCREEN_MS = 1_000L
+
+        private val mainHandler = Handler(Looper.getMainLooper())
+        private var ringingScreen: WeakReference<EatvioCallkitIncomingBridgeActivity>? = null
+
+        /**
+         * Closes the ringing screen once the call stopped ringing: answered or declined
+         * from the notification, timed out, or ended by the caller.
+         */
+        fun dismissRingingScreen() {
+            mainHandler.post {
+                ringingScreen?.get()?.closeRingingScreen()
+                ringingScreen = null
+            }
+        }
+
+        fun shouldShowRingingScreen(keyguardLocked: Boolean, screenInteractive: Boolean): Boolean {
+            return keyguardLocked || !screenInteractive
+        }
+    }
+
+    private var callData: Bundle? = null
+    private var wakeLock: PowerManager.WakeLock? = null
+    private var ringTimeout: Runnable? = null
+    private var actionTaken = false
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -15,15 +74,256 @@ class EatvioCallkitIncomingBridgeActivity : Activity() {
             finish()
             return
         }
+        callData = data
 
-        CallKitIntentBridge.dispatchCallKitAction(
-            this,
-            CallkitConstants.ACTION_CALL_ACCEPT,
-            data,
+        if (!launchedOnLockedOrDarkScreen()) {
+            Log.i(TAG, "tap on notification body: accept")
+            CallKitIntentBridge.dispatchCallKitAction(this, CallkitConstants.ACTION_CALL_ACCEPT, data)
+            finish()
+            @Suppress("DEPRECATION")
+            overridePendingTransition(0, 0)
+            return
+        }
+
+        Log.i(TAG, "full-screen intent on locked/dark screen: show ringing screen")
+        showRingingScreen(data)
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        setIntent(intent)
+        val data = intent.extras?.getBundle(CallkitConstants.EXTRA_CALLKIT_INCOMING_DATA) ?: return
+        if (ringingScreen?.get() !== this) return
+        callData = data
+        bindCallData(data)
+        scheduleRingTimeout(data)
+    }
+
+    override fun onDestroy() {
+        cancelRingTimeout()
+        releaseWakeLock()
+        if (ringingScreen?.get() === this) {
+            ringingScreen = null
+        }
+        super.onDestroy()
+    }
+
+    @Deprecated("Deprecated in Java")
+    override fun onBackPressed() {
+        // The ringing screen is dismissed by Answer / Decline / timeout only.
+    }
+
+    private fun launchedOnLockedOrDarkScreen(): Boolean {
+        val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+        val powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager
+        return shouldShowRingingScreen(
+            keyguardLocked = keyguardManager.isKeyguardLocked,
+            screenInteractive = powerManager.isInteractive,
+        )
+    }
+
+    private fun showRingingScreen(data: Bundle) {
+        ringingScreen = WeakReference(this)
+
+        setTheme(CallkitR.style.CallkitIncomingTheme)
+        requestedOrientation = if (Utils.isTablet(this)) {
+            ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+        } else {
+            ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+        }
+        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+            setTurnScreenOn(true)
+            setShowWhenLocked(true)
+        } else {
+            @Suppress("DEPRECATION")
+            window.addFlags(
+                WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON or
+                    WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED,
+            )
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            window.statusBarColor = Color.TRANSPARENT
+            window.navigationBarColor = Color.TRANSPARENT
+        }
+
+        acquireWakeLock(ringDuration(data))
+        VideoCallPushBridge.keepRingingOnFullScreen()
+
+        setContentView(CallkitR.layout.activity_callkit_incoming)
+        bindCallData(data)
+        scheduleRingTimeout(data)
+    }
+
+    private fun bindCallData(data: Bundle) {
+        val background: ImageView = findViewById(CallkitR.id.ivBackground)
+        val ripple: RippleRelativeLayout = findViewById(CallkitR.id.llBackgroundAnimation)
+        val callerName: TextView = findViewById(CallkitR.id.tvNameCaller)
+        val callerNumber: TextView = findViewById(CallkitR.id.tvNumber)
+        val logo: ImageView = findViewById(CallkitR.id.ivLogo)
+        val avatar: ImageView = findViewById(CallkitR.id.ivAvatar)
+        val actions: LinearLayout = findViewById(CallkitR.id.llAction)
+        val acceptButton: ImageView = findViewById(CallkitR.id.ivAcceptCall)
+        val acceptLabel: TextView = findViewById(CallkitR.id.tvAccept)
+        val declineButton: ImageView = findViewById(CallkitR.id.ivDeclineCall)
+        val declineLabel: TextView = findViewById(CallkitR.id.tvDecline)
+
+        ripple.layoutParams.height = Utils.getScreenWidth() + Utils.getStatusBarHeight(this)
+        ripple.startRippleAnimation()
+        (actions.layoutParams as? MarginLayoutParams)?.let { params ->
+            params.setMargins(0, 0, 0, Utils.getNavigationBarHeight(this))
+            actions.layoutParams = params
+        }
+
+        callerName.text = data.getString(CallkitConstants.EXTRA_CALLKIT_NAME_CALLER, "")
+        callerNumber.visibility = View.INVISIBLE
+        logo.visibility = View.INVISIBLE
+
+        val textColor = parseColor(data.getString(CallkitConstants.EXTRA_CALLKIT_TEXT_COLOR), Color.WHITE)
+        callerName.setTextColor(textColor)
+        acceptLabel.setTextColor(textColor)
+        declineLabel.setTextColor(textColor)
+        background.setBackgroundColor(
+            parseColor(data.getString(CallkitConstants.EXTRA_CALLKIT_BACKGROUND_COLOR), Color.parseColor("#0955fa")),
         )
 
-        finish()
-        @Suppress("DEPRECATION")
-        overridePendingTransition(0, 0)
+        val avatarUrl = data.getString(CallkitConstants.EXTRA_CALLKIT_AVATAR, "")
+        if (!avatarUrl.isNullOrEmpty()) {
+            avatar.visibility = View.VISIBLE
+            @Suppress("DEPRECATION", "UNCHECKED_CAST")
+            val headers = data.getSerializable(CallkitConstants.EXTRA_CALLKIT_HEADERS) as? HashMap<String, Any?>
+            try {
+                ImageLoaderProvider.loadImage(this, avatarUrl, headers, CallkitR.drawable.ic_default_avatar, avatar)
+            } catch (error: Exception) {
+                Log.w(TAG, "failed to load caller avatar", error)
+            }
+        }
+
+        if (data.getInt(CallkitConstants.EXTRA_CALLKIT_TYPE, 0) > 0) {
+            acceptButton.setImageResource(CallkitR.drawable.ic_video)
+        }
+        acceptButton.background = AppUtils.createCircleDrawable(
+            parseColor(data.getString(CallkitConstants.EXTRA_CALLKIT_ACCEPT_COLOR), Color.parseColor("#4CAF50")),
+        )
+        declineButton.background = AppUtils.createCircleDrawable(
+            parseColor(data.getString(CallkitConstants.EXTRA_CALLKIT_DECLINE_COLOR), Color.parseColor("#F44336")),
+        )
+
+        val acceptText = data.getString(CallkitConstants.EXTRA_CALLKIT_TEXT_ACCEPT, "")
+        acceptLabel.text = if (acceptText.isNullOrEmpty()) getString(CallkitR.string.text_accept) else acceptText
+        val declineText = data.getString(CallkitConstants.EXTRA_CALLKIT_TEXT_DECLINE, "")
+        declineLabel.text = if (declineText.isNullOrEmpty()) getString(CallkitR.string.text_decline) else declineText
+
+        acceptButton.setOnClickListener { onAcceptClick() }
+        declineButton.setOnClickListener { onDeclineClick() }
+    }
+
+    private fun onAcceptClick() {
+        val data = callData ?: return
+        if (actionTaken) return
+        actionTaken = true
+        cancelRingTimeout()
+        Log.i(TAG, "ringing screen: accept")
+
+        // Same order as the plugin's own incoming activity: dispatch the accept, then ask
+        // the keyguard to unlock so MainActivity (which cannot show over the keyguard)
+        // becomes visible as soon as the user unlocks.
+        CallKitIntentBridge.dispatchCallKitAction(this, CallkitConstants.ACTION_CALL_ACCEPT, data)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+            if (keyguardManager.isKeyguardLocked) {
+                keyguardManager.requestDismissKeyguard(this, null)
+            }
+        }
+        finishRingingTask()
+    }
+
+    private fun onDeclineClick() {
+        val data = callData ?: return
+        if (actionTaken) return
+        actionTaken = true
+        cancelRingTimeout()
+        Log.i(TAG, "ringing screen: decline")
+
+        CallKitIntentBridge.dispatchCallKitAction(this, CallkitConstants.ACTION_CALL_DECLINE, data)
+        finishRingingTask()
+    }
+
+    private fun closeRingingScreen() {
+        if (isFinishing) return
+        cancelRingTimeout()
+        finishRingingTask()
+    }
+
+    private fun finishRingingTask() {
+        if (isFinishing) return
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            finishAndRemoveTask()
+        } else {
+            finish()
+        }
+    }
+
+    private fun ringDuration(data: Bundle): Long {
+        val duration = data.getLong(CallkitConstants.EXTRA_CALLKIT_DURATION, DEFAULT_RING_DURATION_MS)
+        return if (duration > 0L) duration else DEFAULT_RING_DURATION_MS
+    }
+
+    /**
+     * The notification was posted before this screen appeared, so ring only for the
+     * remaining part of the call duration.
+     */
+    private fun scheduleRingTimeout(data: Bundle) {
+        cancelRingTimeout()
+        val now = System.currentTimeMillis()
+        val startedAt = data.getLong(CallkitNotificationManager.EXTRA_TIME_START_CALL, now)
+        val remaining = (ringDuration(data) - abs(now - startedAt)).coerceAtLeast(MIN_RING_SCREEN_MS)
+        val timeout = Runnable {
+            Log.i(TAG, "ringing screen: timed out")
+            closeRingingScreen()
+        }
+        ringTimeout = timeout
+        mainHandler.postDelayed(timeout, remaining)
+    }
+
+    private fun cancelRingTimeout() {
+        ringTimeout?.let { mainHandler.removeCallbacks(it) }
+        ringTimeout = null
+    }
+
+    @Suppress("DEPRECATION")
+    private fun acquireWakeLock(durationMs: Long) {
+        try {
+            val powerManager = applicationContext.getSystemService(Context.POWER_SERVICE) as PowerManager
+            val lock = powerManager.newWakeLock(
+                PowerManager.SCREEN_BRIGHT_WAKE_LOCK or
+                    PowerManager.ACQUIRE_CAUSES_WAKEUP or
+                    PowerManager.ON_AFTER_RELEASE,
+                WAKE_LOCK_TAG,
+            )
+            lock.acquire(durationMs)
+            wakeLock = lock
+        } catch (error: Exception) {
+            Log.w(TAG, "failed to acquire wake lock", error)
+        }
+    }
+
+    private fun releaseWakeLock() {
+        val lock = wakeLock ?: return
+        wakeLock = null
+        try {
+            if (lock.isHeld) lock.release()
+        } catch (error: Exception) {
+            Log.w(TAG, "failed to release wake lock", error)
+        }
+    }
+
+    private fun parseColor(value: String?, fallback: Int): Int {
+        if (value.isNullOrBlank()) return fallback
+        return try {
+            Color.parseColor(value)
+        } catch (error: IllegalArgumentException) {
+            fallback
+        }
     }
 }

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

@@ -16,7 +16,7 @@ class EatvioFcmMessagingService : FirebaseMessagingService() {
         Log.i(TAG, "onMessageReceived: ${message.data}")
 
         if (VideoCallPushBridge.isEndedVideoCall(message.data)) {
-            VideoCallPushBridge.dismissAllIncomingCalls(this)
+            VideoCallPushBridge.dismissEndedVideoCall(this, message.data)
             return
         }
 

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

@@ -21,7 +21,7 @@ class HmsPushService : HmsMessageService() {
         if (message == null) return
 
         if (VideoCallPushBridge.isEndedVideoCall(message.dataOfMap)) {
-            VideoCallPushBridge.dismissAllIncomingCalls(this)
+            VideoCallPushBridge.dismissEndedVideoCall(this, message.dataOfMap)
             return
         }
 

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

@@ -25,6 +25,9 @@ class MainActivity: FlutterActivity() {
         @JvmStatic
         var isInForeground: Boolean = false
             private set
+
+        @JvmStatic
+        var onPendingDecline: (() -> Unit)? = null
     }
 
     private val channelName = "com.eatvioapp/hms_push"
@@ -38,13 +41,18 @@ class MainActivity: FlutterActivity() {
     override fun onResume() {
         super.onResume()
         isInForeground = true
+        onPendingDecline = { scheduleDeliverPendingCallKitDecline() }
         captureCallKitLaunchIntent(intent)
         if (PendingCallKitAcceptBridge.peek() != null) {
             scheduleDeliverPendingCallKitAccept()
         }
+        if (PendingCallKitDeclineBridge.peek() != null) {
+            scheduleDeliverPendingCallKitDecline()
+        }
     }
 
     override fun onPause() {
+        onPendingDecline = null
         isInForeground = false
         super.onPause()
     }
@@ -55,22 +63,50 @@ class MainActivity: FlutterActivity() {
         methodChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, channelName)
         videoCallPipChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, videoCallPipChannelName)
         videoCallPushChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, videoCallPushChannelName)
+        onPendingDecline = { scheduleDeliverPendingCallKitDecline() }
         videoCallPushChannel?.setMethodCallHandler { call, result ->
             when (call.method) {
                 "dismissIncomingCalls" -> {
                     try {
-                        VideoCallPushBridge.dismissAllIncomingCalls(applicationContext)
+                        val args = call.arguments as? Map<*, *>
+                        val callId = args?.get("call_id")?.toString()
+                            ?: args?.get("callId")?.toString()
+                        val conversationUuid = args?.get("conversation_uuid")?.toString()
+                            ?: args?.get("conversationUuid")?.toString()
+                        VideoCallPushBridge.dismissIncomingCalls(
+                            applicationContext,
+                            callId = callId,
+                            conversationUuid = conversationUuid,
+                        )
                         result.success(null)
                     } catch (e: Exception) {
                         result.error("DISMISS_INCOMING_CALLS_FAILED", e.message, null)
                     }
                 }
+                "showIncomingCall" -> {
+                    try {
+                        val args = call.arguments as? Map<*, *> ?: emptyMap<Any, Any>()
+                        val data = HashMap<String, String>()
+                        for ((key, value) in args) {
+                            val name = key as? String ?: continue
+                            if (value == null) continue
+                            data[name] = value.toString()
+                        }
+                        VideoCallPushBridge.showIncomingCall(applicationContext, data)
+                        result.success(null)
+                    } catch (e: Exception) {
+                        result.error("SHOW_INCOMING_CALL_FAILED", e.message, null)
+                    }
+                }
                 "drainPendingCallKitAccept" -> {
                     result.success(PendingCallKitAcceptBridge.drain())
                 }
                 "peekPendingCallKitAccept" -> {
                     result.success(PendingCallKitAcceptBridge.peekPending())
                 }
+                "drainPendingCallKitDecline" -> {
+                    result.success(PendingCallKitDeclineBridge.drain())
+                }
                 else -> result.notImplemented()
             }
         }
@@ -226,6 +262,30 @@ class MainActivity: FlutterActivity() {
         channel.invokeMethod("onCallKitLaunchIntent", payload)
     }
 
+    private fun scheduleDeliverPendingCallKitDecline() {
+        PendingCallKitDeclineBridge.scheduleDeliverToFlutter(
+            deliver = { deliverPendingCallKitDeclineToFlutter() },
+        )
+    }
+
+    private fun deliverPendingCallKitDeclineToFlutter() {
+        val payload = PendingCallKitDeclineBridge.peek() ?: return
+        val channel = videoCallPushChannel
+        if (channel == null) {
+            android.util.Log.w(
+                "VideoCallPush",
+                "deliverPendingCallKitDeclineToFlutter: channel not ready",
+            )
+            return
+        }
+
+        android.util.Log.i(
+            "VideoCallPush",
+            "deliverPendingCallKitDeclineToFlutter: id=${payload["id"]}",
+        )
+        channel.invokeMethod("onCallKitDecline", payload)
+    }
+
     private fun handleIntentForActionUrl(intent: Intent?) {
         if (intent == null) return
 

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

@@ -0,0 +1,44 @@
+package com.eatvioapp.app
+
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+
+/// Stores a decline until Flutter can POST /video-call/decline.
+///
+/// The plugin broadcasts the decline. If the Flutter engine is not attached,
+/// that broadcast never reaches the backend and the call keeps ringing on the
+/// user's other devices.
+object PendingCallKitDeclineBridge {
+    private const val TAG = "PendingCallKitDecline"
+
+    @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 decline 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 decline id=${payload["id"]}")
+        }
+        return payload
+    }
+
+    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/VideoCallDeclineClient.kt

@@ -0,0 +1,73 @@
+package com.eatvioapp.app
+
+import android.content.Context
+import android.util.Log
+import java.net.HttpURLConnection
+import java.net.URL
+
+internal object FlutterSharedPrefs {
+    const val NAME = "FlutterSharedPreferences"
+    private const val PREFIX = "flutter."
+
+    fun string(context: Context, key: String): String? {
+        return context
+            .getSharedPreferences(NAME, Context.MODE_PRIVATE)
+            .getString(PREFIX + key, null)
+            ?.trim()
+            ?.takeIf { it.isNotEmpty() }
+    }
+}
+
+internal object VideoCallDeclineClient {
+    private const val TAG = "VideoCallDecline"
+    private const val TIMEOUT_MS = 4_000
+
+    fun send(context: Context, handle: String?, extra: Map<*, *>?) {
+        val fields = VideoCallDeclineRequestFactory.fields(handle, extra)
+        val baseUrl = FlutterSharedPrefs.string(context, "apiBaseUrl")
+            ?: FlutterSharedPrefs.string(context, "customBaseUrl")
+        val request = VideoCallDeclineRequestFactory.build(
+            baseUrl = baseUrl,
+            token = FlutterSharedPrefs.string(context, "token"),
+            hwId = FlutterSharedPrefs.string(context, "eatvio.android_install_hw_id"),
+            fields = fields,
+        )
+        if (request == null) {
+            Log.w(
+                TAG,
+                "skip decline POST conversation=${fields.conversationUuid} ended=${fields.endedPush}",
+            )
+            return
+        }
+
+        try {
+            val code = post(request)
+            Log.i(TAG, "decline POST status=$code conversation=${fields.conversationUuid}")
+        } catch (error: Exception) {
+            Log.w(TAG, "decline POST failed conversation=${fields.conversationUuid}", error)
+        }
+    }
+
+    private fun post(request: VideoCallDeclineRequest): Int {
+        val connection = (URL(request.url).openConnection() as HttpURLConnection).apply {
+            requestMethod = "POST"
+            connectTimeout = TIMEOUT_MS
+            readTimeout = TIMEOUT_MS
+            doOutput = true
+            setRequestProperty("Authorization", "Bearer ${request.token}")
+            setRequestProperty("Accept", "application/json")
+            setRequestProperty("Content-Type", "application/json; charset=utf-8")
+        }
+        try {
+            connection.outputStream.use { stream ->
+                stream.write(request.body.toByteArray(Charsets.UTF_8))
+            }
+            val code = connection.responseCode
+            val response = if (code in 200..299) connection.inputStream else connection.errorStream
+            response?.use { stream -> stream.readBytes() }
+            return code
+        } finally {
+            connection.disconnect()
+        }
+    }
+}

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

@@ -0,0 +1,74 @@
+package com.eatvioapp.app
+
+import android.content.Context
+import android.os.Bundle
+import android.util.Log
+import androidx.core.os.BundleCompat
+import com.hiennv.flutter_callkit_incoming.CallkitConstants
+import com.hiennv.flutter_callkit_incoming.CallkitEventCallback
+import com.hiennv.flutter_callkit_incoming.FlutterCallkitIncomingPlugin
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withTimeoutOrNull
+
+/**
+ * Sends `POST /video-call/decline` from the process that handled the tap.
+ *
+ * The notification Decline button is an explicit broadcast into the CallKit
+ * plugin. That broadcast starts the process when the app was killed and does
+ * not start Flutter. The plugin notifies this callback before it returns, so
+ * the request can finish while the process is still alive.
+ */
+object VideoCallDeclineReporter : CallkitEventCallback {
+    private const val TAG = "VideoCallDecline"
+    private const val WAIT_FOR_HTTP_MS = 9_000L
+
+    @Volatile
+    private var appContext: Context? = null
+
+    @Volatile
+    private var installed = false
+
+    fun install(context: Context) {
+        if (installed) return
+        installed = true
+        appContext = context.applicationContext
+        FlutterCallkitIncomingPlugin.registerEventCallback(this)
+        Log.i(TAG, "installed")
+    }
+
+    override fun onCallEvent(event: CallkitEventCallback.CallEvent, callData: Bundle) {
+        if (event != CallkitEventCallback.CallEvent.DECLINE) return
+        val context = appContext ?: return
+        val handle = callData.getString(CallkitConstants.EXTRA_CALLKIT_HANDLE)
+        val extra = copyExtra(callData)
+        if (MainActivity.isInForeground) {
+            CoroutineScope(Dispatchers.IO).launch {
+                VideoCallDeclineClient.send(context, handle, extra)
+            }
+            return
+        }
+        // The Decline button starts this process and then the broadcast ends.
+        // Wait here so Android does not kill the process before the POST returns.
+        runBlocking(Dispatchers.IO) {
+            withTimeoutOrNull(WAIT_FOR_HTTP_MS) {
+                VideoCallDeclineClient.send(context, handle, extra)
+            }
+        }
+    }
+
+    private fun copyExtra(callData: Bundle): Map<String, Any?> {
+        val raw = BundleCompat.getSerializable(
+            callData,
+            CallkitConstants.EXTRA_CALLKIT_EXTRA,
+            HashMap::class.java,
+        ) ?: return emptyMap()
+        return buildMap {
+            for ((key, value) in raw) {
+                if (key is String) put(key, value)
+            }
+        }
+    }
+}

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

@@ -0,0 +1,136 @@
+package com.eatvioapp.app
+
+/**
+ * Body of `POST /api/v2/chat/{conversation}/video-call/decline`.
+ *
+ * [callId] is omitted when it is missing, not a uuid, or equal to the
+ * conversation uuid: the server treats `call_id` as the session uuid.
+ */
+internal data class VideoCallDeclineRequest(
+    val url: String,
+    val token: String,
+    val body: String,
+)
+
+internal data class VideoCallDeclineFields(
+    val conversationUuid: String,
+    val callId: String?,
+    val endedPush: Boolean,
+)
+
+internal object VideoCallDeclineRequestFactory {
+    private val HEX = "0123456789ABCDEF".toCharArray()
+    private val uuidPattern =
+        Regex("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$")
+
+    fun fields(handle: String?, extra: Map<*, *>?): VideoCallDeclineFields {
+        val conversation = firstString(
+            extra,
+            listOf("conversationUuid", "conversation_uuid"),
+        ) ?: handle?.trim().orEmpty()
+        val rawCallId = firstString(extra, listOf("call_id", "callId"))
+        return VideoCallDeclineFields(
+            conversationUuid = conversation,
+            callId = backendCallId(rawCallId, conversation),
+            endedPush = marksEndedPush(extra),
+        )
+    }
+
+    fun build(
+        baseUrl: String?,
+        token: String?,
+        hwId: String?,
+        fields: VideoCallDeclineFields,
+    ): VideoCallDeclineRequest? {
+        if (fields.endedPush) return null
+        val conversation = fields.conversationUuid.trim()
+        val authToken = token?.trim().orEmpty()
+        val deviceId = hwId?.trim().orEmpty()
+        val root = baseUrl?.trim()?.trimEnd('/').orEmpty()
+        if (conversation.isEmpty() || authToken.isEmpty()) return null
+        if (deviceId.length < 8 || deviceId.length > 64) return null
+        if (!root.startsWith("http://") && !root.startsWith("https://")) return null
+
+        val encoded = encodePathSegment(conversation)
+        return VideoCallDeclineRequest(
+            url = "$root/api/v2/chat/$encoded/video-call/decline",
+            token = authToken,
+            body = jsonBody(deviceId, fields.callId),
+        )
+    }
+
+    private fun backendCallId(callId: String?, conversationUuid: String): String? {
+        val id = callId?.trim().orEmpty()
+        if (!uuidPattern.matches(id)) return null
+        if (id.equals(conversationUuid.trim(), ignoreCase = true)) return null
+        return id
+    }
+
+    private fun firstString(extra: Map<*, *>?, keys: List<String>): String? {
+        if (extra == null) return null
+        for (key in keys) {
+            val value = extra[key] as? String ?: continue
+            val trimmed = value.trim()
+            if (trimmed.isNotEmpty()) return trimmed
+        }
+        return null
+    }
+
+    private fun marksEndedPush(extra: Map<*, *>?): Boolean {
+        val value = extra?.get("endedPush") ?: return false
+        return when (value) {
+            is Boolean -> value
+            is Number -> value.toInt() != 0
+            is String -> {
+                val normalized = value.trim().lowercase()
+                normalized == "true" || normalized == "1"
+            }
+            else -> false
+        }
+    }
+
+    private fun jsonBody(hwId: String, callId: String?): String {
+        val hw = jsonString(hwId)
+        if (callId == null) return """{"hw_id":$hw}"""
+        return """{"hw_id":$hw,"call_id":${jsonString(callId)}}"""
+    }
+
+    private fun encodePathSegment(value: String): String {
+        val bytes = value.encodeToByteArray()
+        return buildString(bytes.size) {
+            for (byte in bytes) {
+                val code = byte.toInt() and 0xFF
+                val allowed = code in 'A'.code..'Z'.code ||
+                    code in 'a'.code..'z'.code ||
+                    code in '0'.code..'9'.code ||
+                    code == '-'.code ||
+                    code == '_'.code ||
+                    code == '.'.code ||
+                    code == '~'.code
+                if (allowed) {
+                    append(code.toChar())
+                } else {
+                    append('%')
+                    append(HEX[code ushr 4])
+                    append(HEX[code and 0x0F])
+                }
+            }
+        }
+    }
+
+    private fun jsonString(value: String): String {
+        val escaped = buildString {
+            for (char in value) {
+                when (char) {
+                    '\\' -> append("\\\\")
+                    '"' -> append("\\\"")
+                    '\n' -> append("\\n")
+                    '\r' -> append("\\r")
+                    '\t' -> append("\\t")
+                    else -> append(char)
+                }
+            }
+        }
+        return "\"$escaped\""
+    }
+}

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

@@ -4,6 +4,7 @@ import android.content.Context
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
+import android.os.PowerManager
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -17,6 +18,7 @@ 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 com.hiennv.flutter_callkit_incoming.removeCall
 import java.util.HashMap
 import java.util.concurrent.atomic.AtomicInteger
 
@@ -24,16 +26,20 @@ object VideoCallPushBridge {
     private const val TAG = "VideoCallPushBridge"
     private const val ANDROID_ACCENT_COLOR = "#2787F5"
     private const val MISSED_CALL_CLEANUP_DELAY_MS = 250L
+    private const val TOMBSTONE_TTL_MS = 2 * 60 * 1000L
+    private const val WAKE_LOCK_TAG = "eatvio:incoming_call_ring"
 
     private val mainHandler = Handler(Looper.getMainLooper())
     private val playbackLock = Any()
     private val playbackGeneration = AtomicInteger(0)
+    private val tombstonedCallIds = HashMap<String, Long>()
 
     private var activeSoundManager: CallkitSoundPlayerManager? = null
     private var activeNotificationManager: CallkitNotificationManager? = null
     private var activeCallBundle: Bundle? = null
     private var storedAppContext: Context? = null
     private var ringtoneTimeout: Runnable? = null
+    private var ringWakeLock: PowerManager.WakeLock? = null
     private var callbackRegistered = false
 
     /**
@@ -115,23 +121,38 @@ object VideoCallPushBridge {
         storedAppContext = appContext
         ensureIncomingCallCallbackRegistered()
 
+        val serverCallId = callId(data)
+        if (isTombstoned(serverCallId)) {
+            Log.i(TAG, "showIncomingCall: skip tombstoned call_id=$serverCallId")
+            return
+        }
+
         val callData = buildCallDataBundle(data)
         if (callData == null) {
             Log.w(TAG, "showIncomingCall: missing conversation uuid, data=$data")
             return
         }
 
-        val generation = playbackGeneration.incrementAndGet()
-        Log.i(TAG, "showIncomingCall: conversation=${callData.getString(CallkitConstants.EXTRA_CALLKIT_ID)}")
+        val callId = callData.getString(CallkitConstants.EXTRA_CALLKIT_ID)
+        val seenGeneration = playbackGeneration.get()
+        Log.i(TAG, "showIncomingCall: id=$callId conversation=${conversationUuid(data)}")
 
         // Ringtone.play() and stop() must run on the same thread. FCM delivers
         // pushes on a background thread, while Answer runs on the main thread.
+        // A second show for the same conversation must not bump the generation:
+        // that would cancel the timeout of the call that is already ringing.
         mainHandler.post {
             synchronized(playbackLock) {
-                if (generation != playbackGeneration.get()) {
-                    Log.i(TAG, "showIncomingCall: skipped stale playback generation=$generation")
+                if (seenGeneration != playbackGeneration.get()) {
+                    Log.i(TAG, "showIncomingCall: skipped after silence")
                     return@post
                 }
+                val alreadyRinging = activeCallBundle?.getString(CallkitConstants.EXTRA_CALLKIT_ID)
+                if (!callId.isNullOrBlank() && callId == alreadyRinging) {
+                    Log.i(TAG, "showIncomingCall: already ringing $callId")
+                    return@post
+                }
+                val generation = playbackGeneration.incrementAndGet()
                 startIncomingCallLocked(appContext, callData, generation)
             }
         }
@@ -158,17 +179,53 @@ object VideoCallPushBridge {
         }
     }
 
-    fun dismissAllIncomingCalls(context: Context) {
+    /**
+     * The plugin's sound player stops on ACTION_SCREEN_OFF. The ringing screen turns
+     * the display on itself, so keep ringing through that transition.
+     */
+    fun keepRingingOnFullScreen() {
+        synchronized(playbackLock) {
+            activeSoundManager?.keepRingingOnFullScreen()
+        }
+    }
+
+    fun dismissIncomingCalls(
+        context: Context,
+        callId: String? = null,
+        conversationUuid: String? = null,
+    ) {
+        val normalizedCallId = callId?.trim()?.takeIf { it.isNotEmpty() }
+        val normalizedConversation = conversationUuid?.trim()?.takeIf { it.isNotEmpty() }
+        if (normalizedCallId != null) {
+            markTombstone(normalizedCallId)
+        }
+
         val appContext = context.applicationContext
         val calls = getDataActiveCalls(appContext)
-        Log.i(TAG, "dismissAllIncomingCalls: active calls=${calls.size}")
+        Log.i(
+            TAG,
+            "dismissIncomingCalls: active=${calls.size} call_id=${normalizedCallId ?: "-"} " +
+                "conversation=${normalizedConversation ?: "-"}",
+        )
         playbackGeneration.incrementAndGet()
 
         val dismiss = Runnable {
             synchronized(playbackLock) {
                 val notificationManager = resolveNotificationManager(appContext)
-                val bundles = calls.map { it.toBundle() }
-                stopPlaybackLocked(appContext)
+                val allBundles = calls.map { it.toBundle() }
+                val targeted = hasDismissTarget(normalizedCallId, normalizedConversation)
+                val bundles = if (targeted) {
+                    allBundles.filter { bundleMatches(it, normalizedCallId, normalizedConversation) }
+                } else {
+                    allBundles
+                }
+
+                val activeMatches = activeCallBundle?.let { bundle ->
+                    !targeted || bundleMatches(bundle, normalizedCallId, normalizedConversation)
+                } == true
+                if (activeMatches || !targeted) {
+                    stopPlaybackLocked(appContext)
+                }
 
                 for (bundle in bundles) {
                     try {
@@ -176,25 +233,39 @@ object VideoCallPushBridge {
                     } catch (error: Exception) {
                         Log.w(
                             TAG,
-                            "dismissAllIncomingCalls: failed for call ${bundle.getString(CallkitConstants.EXTRA_CALLKIT_ID)}",
+                            "dismissIncomingCalls: 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)
+                if (!targeted || bundles.isNotEmpty()) {
+                    try {
+                        CallkitNotificationService.stopService(appContext)
+                    } catch (error: Exception) {
+                        Log.w(TAG, "dismissIncomingCalls: failed to stop callkit service", error)
+                    }
                 }
 
-                try {
-                    removeAllCalls(appContext)
-                } catch (error: Exception) {
-                    Log.w(TAG, "dismissAllIncomingCalls: failed to remove persisted calls", error)
+                if (!targeted) {
+                    try {
+                        removeAllCalls(appContext)
+                    } catch (error: Exception) {
+                        Log.w(TAG, "dismissIncomingCalls: failed to remove persisted calls", error)
+                    }
+                } else {
+                    for (bundle in bundles) {
+                        try {
+                            removeCall(appContext, Data.fromBundle(bundle))
+                        } catch (error: Exception) {
+                            Log.w(TAG, "dismissIncomingCalls: failed to remove targeted call", error)
+                        }
+                    }
                 }
 
-                stopIncomingRingtone()
+                if (activeMatches || !targeted) {
+                    stopIncomingRingtone()
+                }
                 scheduleMissedCallCleanup(notificationManager, bundles)
             }
         }
@@ -206,6 +277,18 @@ object VideoCallPushBridge {
         }
     }
 
+    fun dismissAllIncomingCalls(context: Context) {
+        dismissIncomingCalls(context)
+    }
+
+    fun dismissEndedVideoCall(context: Context, data: Map<String, String>) {
+        dismissIncomingCalls(
+            context = context,
+            callId = callId(data),
+            conversationUuid = conversationUuid(data),
+        )
+    }
+
     private fun ensureIncomingCallCallbackRegistered() {
         if (callbackRegistered) return
         FlutterCallkitIncomingPlugin.registerEventCallback(incomingCallEventCallback)
@@ -230,6 +313,7 @@ object VideoCallPushBridge {
         }
 
         val durationMs = callData.getLong(CallkitConstants.EXTRA_CALLKIT_DURATION, 45_000L)
+        wakeScreenLocked(appContext, if (durationMs > 0L) durationMs else 45_000L)
         if (durationMs > 0L) {
             val timeout = Runnable {
                 synchronized(playbackLock) {
@@ -243,8 +327,43 @@ object VideoCallPushBridge {
         }
     }
 
+    /**
+     * Turns the screen on while the call rings. The full-screen intent of the
+     * notification does the same only when the system grants it; the wake lock
+     * works without any grant, so the lock screen with the call card lights up.
+     */
+    @Suppress("DEPRECATION")
+    private fun wakeScreenLocked(appContext: Context, durationMs: Long) {
+        releaseScreenWakeLockLocked()
+        try {
+            val powerManager = appContext.getSystemService(Context.POWER_SERVICE) as PowerManager
+            val lock = powerManager.newWakeLock(
+                PowerManager.SCREEN_BRIGHT_WAKE_LOCK or
+                    PowerManager.ACQUIRE_CAUSES_WAKEUP or
+                    PowerManager.ON_AFTER_RELEASE,
+                WAKE_LOCK_TAG,
+            )
+            lock.acquire(durationMs)
+            ringWakeLock = lock
+            Log.i(TAG, "wakeScreen: screen on for ${durationMs}ms, interactive=${powerManager.isInteractive}")
+        } catch (error: Exception) {
+            Log.w(TAG, "wakeScreen: failed to acquire wake lock", error)
+        }
+    }
+
+    private fun releaseScreenWakeLockLocked() {
+        val lock = ringWakeLock ?: return
+        ringWakeLock = null
+        try {
+            if (lock.isHeld) lock.release()
+        } catch (error: Exception) {
+            Log.w(TAG, "wakeScreen: failed to release wake lock", error)
+        }
+    }
+
     private fun stopPlaybackLocked(appContext: Context) {
         cancelRingtoneTimeoutLocked()
+        releaseScreenWakeLockLocked()
         val notificationManager = activeNotificationManager
         val bundle = activeCallBundle
         stopIncomingRingtone()
@@ -258,6 +377,7 @@ object VideoCallPushBridge {
         activeSoundManager = null
         activeNotificationManager = null
         activeCallBundle = null
+        EatvioCallkitIncomingBridgeActivity.dismissRingingScreen()
     }
 
     private fun cancelRingtoneTimeoutLocked() {
@@ -344,6 +464,8 @@ object VideoCallPushBridge {
 
     private fun buildCallDataBundle(data: Map<String, String>): Bundle? {
         val conversationUuid = conversationUuid(data) ?: return null
+        val serverCallId = callId(data)
+        val callKitId = serverCallId ?: conversationUuid
         val callerName = data["counterpartName"]
             ?: data["counterpart_name"]
             ?: data["caller_name"]
@@ -369,6 +491,9 @@ object VideoCallPushBridge {
 
         val extra = HashMap<String, Any?>()
         extra["conversationUuid"] = conversationUuid
+        if (!serverCallId.isNullOrBlank()) {
+            extra["call_id"] = serverCallId
+        }
         extra["counterpartName"] = callerName
         if (avatarUrl.isNotBlank()) {
             extra["counterpartAvatarUrl"] = avatarUrl
@@ -379,9 +504,13 @@ object VideoCallPushBridge {
         if (counterpartIsConsultant) {
             extra["counterpartIsConsultant"] = true
         }
+        val messageId = data["message_id"] ?: data["messageId"]
+        if (!messageId.isNullOrBlank()) {
+            extra["message_id"] = messageId
+        }
 
         return Bundle().apply {
-            putString(CallkitConstants.EXTRA_CALLKIT_ID, conversationUuid)
+            putString(CallkitConstants.EXTRA_CALLKIT_ID, callKitId)
             putString(CallkitConstants.EXTRA_CALLKIT_NAME_CALLER, callerName)
             putString(CallkitConstants.EXTRA_CALLKIT_APP_NAME, "Итвио")
             putString(CallkitConstants.EXTRA_CALLKIT_HANDLE, conversationUuid)
@@ -406,6 +535,77 @@ object VideoCallPushBridge {
         }
     }
 
+    private fun callId(data: Map<String, String>): String? {
+        return data["call_id"]?.trim()?.takeIf { it.isNotEmpty() }
+            ?: data["callId"]?.trim()?.takeIf { it.isNotEmpty() }
+    }
+
+    private fun hasDismissTarget(callId: String?, conversationUuid: String?): Boolean {
+        return !callId.isNullOrBlank() || !conversationUuid.isNullOrBlank()
+    }
+
+    private fun bundleMatches(
+        bundle: Bundle,
+        callId: String?,
+        conversationUuid: String?,
+    ): Boolean {
+        val normalizedCallId = callId?.trim()?.lowercase()
+        if (!normalizedCallId.isNullOrEmpty()) {
+            val id = bundle.getString(CallkitConstants.EXTRA_CALLKIT_ID)?.trim()?.lowercase()
+            if (id != null && id == normalizedCallId) return true
+            val extraCallId = extraString(bundle, "call_id")
+                ?: extraString(bundle, "callId")
+            if (extraCallId != null && extraCallId.lowercase() == normalizedCallId) {
+                return true
+            }
+            // A ring that already stores its own call id must not be closed by
+            // another call in the same chat. Legacy rings have no call id and
+            // still match the conversation.
+            if (!extraCallId.isNullOrBlank()) return false
+        }
+
+        val normalizedConversation = conversationUuid?.trim()?.lowercase() ?: return false
+        val handle = bundle.getString(CallkitConstants.EXTRA_CALLKIT_HANDLE)?.trim()?.lowercase()
+        if (handle != null && handle == normalizedConversation) return true
+        val extraConversation = extraString(bundle, "conversationUuid")
+            ?: extraString(bundle, "conversation_uuid")
+        return extraConversation?.lowercase() == normalizedConversation
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private fun extraString(bundle: Bundle, key: String): String? {
+        val extra = bundle.getSerializable(CallkitConstants.EXTRA_CALLKIT_EXTRA) as? HashMap<String, Any?>
+            ?: return null
+        val value = extra[key] ?: return null
+        val text = value.toString().trim()
+        return text.takeIf { it.isNotEmpty() }
+    }
+
+    private fun markTombstone(callId: String) {
+        val normalized = callId.trim().lowercase()
+        if (normalized.isEmpty()) return
+        pruneTombstones()
+        tombstonedCallIds[normalized] = System.currentTimeMillis() + TOMBSTONE_TTL_MS
+    }
+
+    private fun isTombstoned(callId: String?): Boolean {
+        val normalized = callId?.trim()?.lowercase() ?: return false
+        if (normalized.isEmpty()) return false
+        pruneTombstones()
+        return tombstonedCallIds.containsKey(normalized)
+    }
+
+    private fun pruneTombstones() {
+        val now = System.currentTimeMillis()
+        val iterator = tombstonedCallIds.entries.iterator()
+        while (iterator.hasNext()) {
+            val entry = iterator.next()
+            if (entry.value <= now) {
+                iterator.remove()
+            }
+        }
+    }
+
     private fun conversationUuid(data: Map<String, String>): String? {
         val fromData = data["conversationUuid"]
             ?: data["conversation_uuid"]

android/app/src/test/kotlin/com/eatvioapp/app/VideoCallDeclineRequestTest.kt

@@ -0,0 +1,103 @@
+package com.eatvioapp.app
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class VideoCallDeclineRequestTest {
+    private val baseUrl = "https://eatvio.example"
+    private val token = "sanctum-token"
+    private val hwId = "install-hw-id-01"
+    private val conversation = "11111111-1111-1111-1111-111111111111"
+    private val callId = "22222222-2222-2222-2222-222222222222"
+
+    @Test
+    fun buildsDeclinePostWithCallId() {
+        val request = request(callId = callId)
+
+        assertEquals(
+            "https://eatvio.example/api/v2/chat/$conversation/video-call/decline",
+            request?.url,
+        )
+        assertEquals(token, request?.token)
+        assertEquals(
+            """{"hw_id":"$hwId","call_id":"$callId"}""",
+            request?.body,
+        )
+    }
+
+    @Test
+    fun omitsCallIdWhenItIsTheConversationUuid() {
+        val request = request(callId = conversation.uppercase())
+
+        assertEquals("""{"hw_id":"$hwId"}""", request?.body)
+    }
+
+    @Test
+    fun omitsCallIdThatIsNotAUuid() {
+        val request = request(callId = "message-15")
+
+        assertEquals("""{"hw_id":"$hwId"}""", request?.body)
+    }
+
+    @Test
+    fun readsConversationFromHandleWhenExtraHasNone() {
+        val fields = VideoCallDeclineRequestFactory.fields(conversation, emptyMap<String, Any?>())
+        val request = VideoCallDeclineRequestFactory.build(baseUrl, token, hwId, fields)
+
+        assertTrue(request?.url?.contains(conversation) == true)
+    }
+
+    @Test
+    fun skipsEndedPush() {
+        val fields = VideoCallDeclineRequestFactory.fields(
+            conversation,
+            mapOf("conversationUuid" to conversation, "endedPush" to true),
+        )
+
+        assertNull(VideoCallDeclineRequestFactory.build(baseUrl, token, hwId, fields))
+    }
+
+    @Test
+    fun skipsMissingTokenBaseUrlOrShortHwId() {
+        val fields = VideoCallDeclineRequestFactory.fields(
+            null,
+            mapOf("conversationUuid" to conversation, "call_id" to callId),
+        )
+
+        assertNull(VideoCallDeclineRequestFactory.build(null, token, hwId, fields))
+        assertNull(VideoCallDeclineRequestFactory.build(baseUrl, "  ", hwId, fields))
+        assertNull(VideoCallDeclineRequestFactory.build(baseUrl, token, "short", fields))
+        assertNull(VideoCallDeclineRequestFactory.build("eatvio.example", token, hwId, fields))
+    }
+
+    @Test
+    fun trimsATrailingSlashOnTheBaseUrl() {
+        val request = VideoCallDeclineRequestFactory.build(
+            "$baseUrl/",
+            token,
+            hwId,
+            VideoCallDeclineRequestFactory.fields(
+                null,
+                mapOf("conversationUuid" to conversation),
+            ),
+        )
+
+        assertEquals(
+            "https://eatvio.example/api/v2/chat/$conversation/video-call/decline",
+            request?.url,
+        )
+    }
+
+    private fun request(callId: String?): VideoCallDeclineRequest? {
+        val fields = VideoCallDeclineRequestFactory.fields(
+            null,
+            mapOf(
+                "conversationUuid" to conversation,
+                "call_id" to callId,
+            ),
+        )
+        return VideoCallDeclineRequestFactory.build(baseUrl, token, hwId, fields)
+    }
+}

android/build/reports/problems/problems-report.html

@@ -650,7 +650,7 @@ code + .copy-button {
 <script type="text/javascript">
 function configurationCacheProblems() { return (
 // begin-report-data
-{"diagnostics":[{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]}],"problemsReport":{"totalProblemCount":1,"requestedTasks":":app:compileDebugKotlin","documentationLink":"https://docs.gradle.org/9.0.0/userguide/reporting_problems.html","documentationLinkCaption":"Problem report","summaries":[]}}
+{"diagnostics":[{"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/9.0.0/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('url = <value>') instead."}]]}],"problemsReport":{"totalProblemCount":1,"requestedTasks":":app:testDebugUnitTest --tests com.eatvioapp.app.VideoCallDeclineRequestTest","documentationLink":"https://docs.gradle.org/9.0.0/userguide/reporting_problems.html","documentationLinkCaption":"Problem report","summaries":[]}}
 // end-report-data
 );}
 </script>

ios/Runner.xcodeproj/project.pbxproj

@@ -11,6 +11,7 @@
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		46B43B96F809CEC6058EFDD3 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15ADDB2A35F334AF0AE50011 /* Pods_Runner.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
+		E47D0C1B2F0B4D1000EA7A01 /* VideoCallDeclineClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = E47D0C1A2F0B4D1000EA7A01 /* VideoCallDeclineClient.swift */; };
 		C4A8E2022E9A4B1000123456 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A8E2012E9A4B1000123456 /* SceneDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -38,6 +39,7 @@
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		E47D0C1A2F0B4D1000EA7A01 /* VideoCallDeclineClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoCallDeclineClient.swift; sourceTree = "<group>"; };
 		C4A8E2012E9A4B1000123456 /* SceneDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		938EE8FB5BAA359AAEDEFFF8 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
@@ -117,6 +119,7 @@
 				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
 				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
 				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
+				E47D0C1A2F0B4D1000EA7A01 /* VideoCallDeclineClient.swift */,
 				C4A8E2012E9A4B1000123456 /* SceneDelegate.swift */,
 				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
 				FEE92A0E2D772EA300E6E989 /* Runner.entitlements */,
@@ -303,6 +306,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
+				E47D0C1B2F0B4D1000EA7A01 /* VideoCallDeclineClient.swift in Sources */,
 				C4A8E2022E9A4B1000123456 /* SceneDelegate.swift in Sources */,
 				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
 			);

ios/Runner/SceneDelegate.swift

@@ -19,6 +19,10 @@ class SceneDelegate: FlutterSceneDelegate {
   override func sceneDidBecomeActive(_ scene: UIScene) {
     super.sceneDidBecomeActive(scene)
     registerCallChannels()
+    guard let appDelegate = UIApplication.shared.delegate as? AppDelegate else {
+      return
+    }
+    appDelegate.deliverStoredAcceptedCall()
   }
 
   override func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {

ios/Runner/VideoCallDeclineClient.swift

@@ -0,0 +1,163 @@
+import Foundation
+import UIKit
+
+enum VideoCallDeclineClient {
+  private static let uuidPattern =
+    #"^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"#
+
+  /// `POST /video-call/decline` from the CallKit callback. The process is
+  /// awake here even when the user never opens the app afterwards.
+  static func send(extra: [String: Any], handle: String) {
+    post(action: "decline", extra: extra, handle: handle)
+  }
+
+  /// `POST /video-call/accept` from the CallKit answer callback. Flutter may
+  /// still be frozen on the splash snapshot, so the other device must be
+  /// told from here. A later Dart retry with the same hw_id is idempotent.
+  static func sendAccept(extra: [String: Any], handle: String) {
+    post(action: "accept", extra: extra, handle: handle)
+  }
+
+  private static func post(action: String, extra: [String: Any], handle: String) {
+    let fields = declineFields(extra: extra, handle: handle)
+    guard let request = makeRequest(
+      baseUrl: prefsString("apiBaseUrl") ?? prefsString("customBaseUrl"),
+      token: prefsString("token"),
+      hwId: UIDevice.current.identifierForVendor?.uuidString,
+      fields: fields,
+      action: action
+    ) else {
+      NSLog(
+        "[EatvioVoIP] \(action) POST skipped conversation=\(fields.conversationUuid) ended=\(fields.endedPush)"
+      )
+      return
+    }
+
+    let task = EatvioBackgroundTask()
+    task.begin(name: "video-call-\(action)")
+    let urlTask = URLSession.shared.dataTask(with: request) { _, response, error in
+      let code = (response as? HTTPURLResponse)?.statusCode ?? -1
+      NSLog(
+        "[EatvioVoIP] \(action) POST status=\(code) conversation=\(fields.conversationUuid) error=\(error?.localizedDescription ?? "-")"
+      )
+      task.end()
+    }
+    urlTask.resume()
+  }
+
+  static func makeRequest(
+    baseUrl: String?,
+    token: String?,
+    hwId: String?,
+    fields: VideoCallDeclineFields,
+    action: String = "decline"
+  ) -> URLRequest? {
+    if fields.endedPush { return nil }
+    let conversation = fields.conversationUuid.trimmingCharacters(in: .whitespacesAndNewlines)
+    let authToken = token?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+    let deviceId = hwId?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+    var root = baseUrl?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+    while root.hasSuffix("/") {
+      root.removeLast()
+    }
+    guard !conversation.isEmpty, !authToken.isEmpty else { return nil }
+    guard deviceId.count >= 8, deviceId.count <= 64 else { return nil }
+    guard root.hasPrefix("http://") || root.hasPrefix("https://") else { return nil }
+    guard action == "accept" || action == "decline" else { return nil }
+    guard let encoded = conversation.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed),
+      let url = URL(string: "\(root)/api/v2/chat/\(encoded)/video-call/\(action)")
+    else { return nil }
+
+    var body: [String: String] = ["hw_id": deviceId]
+    if let callId = fields.callId {
+      body["call_id"] = callId
+    }
+    guard let data = try? JSONSerialization.data(withJSONObject: body) else { return nil }
+
+    var request = URLRequest(url: url)
+    request.httpMethod = "POST"
+    request.timeoutInterval = 10
+    request.setValue("Bearer \(authToken)", forHTTPHeaderField: "Authorization")
+    request.setValue("application/json", forHTTPHeaderField: "Accept")
+    request.setValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type")
+    request.httpBody = data
+    return request
+  }
+
+  private static func declineFields(extra: [String: Any], handle: String) -> VideoCallDeclineFields {
+    let conversation = firstString(extra, keys: ["conversationUuid", "conversation_uuid"])
+      ?? handle.trimmingCharacters(in: .whitespacesAndNewlines)
+    let rawCallId = firstString(extra, keys: ["call_id", "callId"])
+    return VideoCallDeclineFields(
+      conversationUuid: conversation,
+      callId: backendCallId(rawCallId, conversation: conversation),
+      endedPush: marksEndedPush(extra["endedPush"])
+    )
+  }
+
+  private static func backendCallId(_ callId: String?, conversation: String) -> String? {
+    let id = callId?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+    guard let regex = try? NSRegularExpression(pattern: uuidPattern),
+      regex.firstMatch(in: id, range: NSRange(id.startIndex..., in: id)) != nil
+    else { return nil }
+    if id.compare(conversation.trimmingCharacters(in: .whitespacesAndNewlines), options: .caseInsensitive) == .orderedSame {
+      return nil
+    }
+    return id
+  }
+
+  private static func firstString(_ extra: [String: Any], keys: [String]) -> String? {
+    for key in keys {
+      guard let value = extra[key] as? String else { continue }
+      let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines)
+      if !trimmed.isEmpty { return trimmed }
+    }
+    return nil
+  }
+
+  private static func marksEndedPush(_ value: Any?) -> Bool {
+    if let bool = value as? Bool { return bool }
+    if let number = value as? NSNumber { return number.intValue != 0 }
+    if let text = value as? String {
+      let normalized = text.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+      return normalized == "true" || normalized == "1"
+    }
+    return false
+  }
+
+  private static func prefsString(_ key: String) -> String? {
+    let value = UserDefaults.standard.string(forKey: "flutter.\(key)")?
+      .trimmingCharacters(in: .whitespacesAndNewlines)
+    if let value, !value.isEmpty { return value }
+    return nil
+  }
+}
+
+struct VideoCallDeclineFields {
+  var conversationUuid: String
+  var callId: String?
+  var endedPush: Bool
+}
+
+private final class EatvioBackgroundTask {
+  private let lock = NSLock()
+  private var id: UIBackgroundTaskIdentifier = .invalid
+
+  func begin(name: String) {
+    let taskId = UIApplication.shared.beginBackgroundTask(withName: name) { [weak self] in
+      self?.end()
+    }
+    lock.lock()
+    id = taskId
+    lock.unlock()
+  }
+
+  func end() {
+    lock.lock()
+    let current = id
+    id = .invalid
+    lock.unlock()
+    guard current != .invalid else { return }
+    UIApplication.shared.endBackgroundTask(current)
+  }
+}

ios/fastlane/Fastfile

@@ -43,37 +43,60 @@ platform :ios do
     end
     
     UI.message "Using auth_key_path: #{auth_key_path}"
-    
+
+    # Authenticate to App Store Connect early:
+    # needed here by latest_testflight_build_number, not only by upload_to_testflight.
+    app_store_connect_api_key(
+      key_id: "325JS9JCZH",
+      issuer_id: "dfa27d1d-2bb8-4d4d-847e-0b32f9b880b3",
+      key_filepath: auth_key_path,
+      duration: 1200,
+      in_house: false
+    )
+
     # Configure Flutter for release mode
     UI.message "Configuring Flutter for release mode..."
     sh("cd .. && flutter build ios --config-only --release")
     
-    # Read build number from Flutter Generated.xcconfig
+    # Read version and build number from Flutter Generated.xcconfig.
+    # They are only a floor: the actual build number is derived from TestFlight below,
+    # so repeated CI runs on the same commit can never hit
+    # ENTITY_ERROR.ATTRIBUTE.INVALID.DUPLICATE ("bundle version must be higher").
     generated_xcconfig_path = File.join("..", "Flutter", "Generated.xcconfig")
+    flutter_build_name = nil
     flutter_build_number = nil
-    
+
     if File.exist?(generated_xcconfig_path)
       File.foreach(generated_xcconfig_path) do |line|
-        matches = line.match(/FLUTTER_BUILD_NUMBER=(.*)/)
-        if matches
-          flutter_build_number = matches[1].strip
-          break
+        if (m = line.match(/FLUTTER_BUILD_NAME=(.*)/))
+          flutter_build_name = m[1].strip
+        elsif (m = line.match(/FLUTTER_BUILD_NUMBER=(.*)/))
+          flutter_build_number = m[1].strip
         end
       end
     end
-    
-    if flutter_build_number.nil?
-      UI.user_error!("Could not find FLUTTER_BUILD_NUMBER in #{generated_xcconfig_path}")
+
+    if flutter_build_name.nil? || flutter_build_number.nil?
+      UI.user_error!("Could not find FLUTTER_BUILD_NAME/FLUTTER_BUILD_NUMBER in #{generated_xcconfig_path}")
     end
-    
-    UI.message "Flutter build number: #{flutter_build_number}"
-    
+
+    UI.message "Flutter version from pubspec: #{flutter_build_name} (#{flutter_build_number})"
+
+    asc_latest_build_number = latest_testflight_build_number(
+      app_identifier: "com.eatvioapp.app",
+      version: flutter_build_name,
+      initial_build_number: flutter_build_number.to_i
+    )
+
+    new_build_number = [flutter_build_number.to_i, asc_latest_build_number].max + 1
+    UI.message "Latest TestFlight build number: #{asc_latest_build_number} -> uploading build #{new_build_number}"
+
     match(type: "appstore", readonly: true)
-    
+
     # Set build number explicitly instead of incrementing
     increment_build_number(
       xcodeproj: "Runner.xcodeproj",
-      build_number: flutter_build_number
+      build_number: new_build_number
     )
 
     update_code_signing_settings(
@@ -93,22 +116,13 @@ platform :ios do
       export_team_id: "VL68C36HYS"
     )
 
-    app_store_connect_api_key(
-      key_id: "325JS9JCZH", 
-      issuer_id: "dfa27d1d-2bb8-4d4d-847e-0b32f9b880b3", 
-      key_filepath: auth_key_path,
-      duration: 1200,
-      in_house: false
-    )
-  
-    
     begin
       upload_to_testflight(
         skip_waiting_for_build_processing: true,
         skip_submission: true,
         distribute_external: false,
         notify_external_testers: false,
-        changelog: "TestFlight build #{flutter_build_number}",
+        changelog: "TestFlight build #{new_build_number}",
         verbose: true
       )
     rescue => ex

lib/core/app_config.dart

@@ -33,6 +33,20 @@ class AppConfig {
   late String _baseUrl;
   String get baseUrl => _baseUrl;
 
+  /// Продуктовые хосты API. Сравнение по хосту целиком: поддомены
+  /// (например `*-hasan.eatvio.ru`) — это стенды разработки, не прод.
+  static const List<String> prodApiHosts = ['eatvio.ru', 'eatvio.com'];
+
+  /// Текущий base URL указывает на продуктовый API?
+  bool get isProdApi {
+    final host = Uri.tryParse(baseUrl)?.host.toLowerCase() ?? '';
+    if (host.isEmpty) return false;
+    return prodApiHosts.any((prodHost) => host == prodHost || host == 'www.$prodHost');
+  }
+
+  /// Работаем на стенде разработки/stage (не на продуктовом API)?
+  bool get isDevOrStageStand => !isProdApi;
+
   void setBaseUrl(String baseUrls) {
     _baseUrl = baseUrls;
     _persistBaseUrl(baseUrls);
@@ -48,6 +62,7 @@ class AppConfig {
       return;
     }
     unawaited(sl<Prefs>().setString(PrefsKeys.customBaseUrl, normalized));
+    unawaited(sl<Prefs>().setString(PrefsKeys.apiBaseUrl, normalized));
   }
 
   /// Список глобальных BlocProvider'ов

lib/core/cached_base_url.dart

@@ -1,16 +1,30 @@
+import 'dart:async';
+
 import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/prefs.dart';
 import 'package:eatvio_app/core/prefs_keys.dart';
 
 /// Подставляет сохранённый base URL до создания HTTP-клиента.
+///
+/// Действующий адрес также пишется в [PrefsKeys.apiBaseUrl], чтобы нативный
+/// decline мог собрать `POST /video-call/decline`, когда Flutter не запущен.
 void applyCachedBaseUrl() {
   if (!sl.isRegistered<Prefs>() || !sl.isRegistered<AppConfig>()) {
     return;
   }
   final cached = sl<Prefs>().getString(PrefsKeys.customBaseUrl)?.trim();
-  if (cached == null || cached.isEmpty) {
+  if (cached != null && cached.isNotEmpty) {
+    sl<AppConfig>().setBaseUrl(cached);
     return;
   }
-  sl<AppConfig>().setBaseUrl(cached);
+  _persistApiBaseUrl(sl<AppConfig>().baseUrl);
+}
+
+void _persistApiBaseUrl(String baseUrl) {
+  final normalized = baseUrl.trim();
+  if (normalized.isEmpty || !sl.isRegistered<Prefs>()) {
+    return;
+  }
+  unawaited(sl<Prefs>().setString(PrefsKeys.apiBaseUrl, normalized));
 }

lib/core/device/device_hw_id_provider.dart

@@ -1,16 +1,70 @@
 import 'dart:io';
+import 'dart:math';
 
 import 'package:device_info_plus/device_info_plus.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
+/// Stable id of this install, sent as `hw_id` on push registration and on
+/// video-call accept/decline.
+///
+/// Android `Build.ID` is the firmware id. Two phones on the same build share
+/// it, so the backend treats them as one device and a decline on one does not
+/// reach the other. A per-install id stays unique.
 abstract final class DeviceHwIdProvider {
-  static Future<String?> current() async {
-    final deviceInfo = DeviceInfoPlugin();
+  static const androidInstallIdKey = 'eatvio.android_install_hw_id';
+  static const androidTokenMigratedKey = 'eatvio.android_hw_id_token_migrated';
+
+  static Future<String?> current({SharedPreferences? preferences}) async {
     if (Platform.isIOS) {
-      return (await deviceInfo.iosInfo).identifierForVendor;
+      return (await DeviceInfoPlugin().iosInfo).identifierForVendor;
     }
     if (Platform.isAndroid) {
-      return (await deviceInfo.androidInfo).id;
+      return androidInstallId(preferences: preferences);
     }
     return null;
   }
+
+  static Future<String> androidInstallId({
+    SharedPreferences? preferences,
+  }) async {
+    final prefs = preferences ?? await SharedPreferences.getInstance();
+    final existing = prefs.getString(androidInstallIdKey)?.trim();
+    if (existing != null && existing.length >= 8) return existing;
+
+    final created = _newInstallId();
+    await prefs.setString(androidInstallIdKey, created);
+    return created;
+  }
+
+  /// The previous Android registration used `Build.ID`. Drop that token once
+  /// and register again with the install id.
+  static Future<bool> androidTokenNeedsReregister({
+    SharedPreferences? preferences,
+  }) async {
+    if (!Platform.isAndroid) return false;
+    final prefs = preferences ?? await SharedPreferences.getInstance();
+    return prefs.getBool(androidTokenMigratedKey) != true;
+  }
+
+  static Future<void> markAndroidTokenReregistered({
+    SharedPreferences? preferences,
+  }) async {
+    final prefs = preferences ?? await SharedPreferences.getInstance();
+    await prefs.setBool(androidTokenMigratedKey, true);
+  }
+
+  static String _newInstallId() {
+    final random = Random.secure();
+    final bytes = List<int>.generate(16, (_) => random.nextInt(256));
+    bytes[6] = (bytes[6] & 0x0f) | 0x40;
+    bytes[8] = (bytes[8] & 0x3f) | 0x80;
+    final hex = bytes
+        .map((byte) => byte.toRadixString(16).padLeft(2, '0'))
+        .join();
+    return '${hex.substring(0, 8)}-'
+        '${hex.substring(8, 12)}-'
+        '${hex.substring(12, 16)}-'
+        '${hex.substring(16, 20)}-'
+        '${hex.substring(20)}';
+  }
 }

lib/core/di/cubit_registrations.dart

@@ -42,7 +42,8 @@ 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;
+import 'package:eatvio_app/features/profile/presentation/bloc/plans_cubit/plans_cubit.dart'
+    as profile_plans;
 import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
 import 'package:eatvio_app/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart';
 import 'package:eatvio_app/features/recipe/presentation/cubit/about_recipe_cubit.dart';
@@ -70,69 +71,174 @@ class CubitRegistrations {
   /// Регистрация Cubit'ов как синглтонов
   static void _registerSingletonCubits() {
     sl.registerLazySingleton<NewMessagesCubit>(() => NewMessagesCubit());
-    sl.registerLazySingleton<NotificationsCubit>(() => NotificationsCubit(wsManager: sl(), notificationsRepository: sl()));
-    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(),
+    sl.registerLazySingleton<NotificationsCubit>(
+      () => NotificationsCubit(wsManager: sl(), notificationsRepository: sl()),
+    );
+    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(),
       ),
     );
+    sl.registerLazySingleton<FeedCubit>(() => FeedCubit(feedRepository: sl()));
   }
 
   /// Регистрация Cubit'ов как фабрик
   static void _registerFactoryCubits() {
     // Auth related cubits
-    sl.registerFactory<AuthCubit>(() => AuthCubit(authRepository: sl(), firebaseApi: sl(), prefs: sl(), profileRepository: sl()));
-    sl.registerFactory<RegistrationCubit>(() => RegistrationCubit(registrationRepository: sl(), prefs: sl()));
-    sl.registerFactory<ResetPasswordCubit>(() => ResetPasswordCubit(resetPasswordRepository: sl()));
-    sl.registerFactory<VerifyEmailCubit>(() => VerifyEmailCubit(profileRepository: sl(), prefs: sl()));
-    sl.registerFactory<OAuthCubit>(() => OAuthCubit(authRepository: sl(), prefs: sl()));
-    sl.registerFactory<RegistrationCubitV2>(() => RegistrationCubitV2(registrationRepository: sl()));
+    sl.registerFactory<AuthCubit>(
+      () => AuthCubit(
+        authRepository: sl(),
+        firebaseApi: sl(),
+        prefs: sl(),
+        profileRepository: sl(),
+        sessionLifecycleService: sl(),
+      ),
+    );
+    sl.registerFactory<RegistrationCubit>(
+      () => RegistrationCubit(
+        registrationRepository: sl(),
+        prefs: sl(),
+        sessionLifecycleService: sl(),
+      ),
+    );
+    sl.registerFactory<ResetPasswordCubit>(
+      () => ResetPasswordCubit(resetPasswordRepository: sl()),
+    );
+    sl.registerFactory<VerifyEmailCubit>(
+      () => VerifyEmailCubit(profileRepository: sl(), prefs: sl()),
+    );
+    sl.registerFactory<OAuthCubit>(
+      () => OAuthCubit(
+        authRepository: sl(),
+        firebaseApi: sl(),
+        prefs: sl(),
+        sessionLifecycleService: sl(),
+      ),
+    );
+    sl.registerFactory<RegistrationCubitV2>(
+      () => RegistrationCubitV2(
+        registrationRepository: sl(),
+        firebaseApi: sl(),
+        sessionLifecycleService: sl(),
+      ),
+    );
     // Feed related cubits
-    sl.registerFactory<FeedCubit>(() => FeedCubit(feedRepository: sl()));
-    sl.registerFactory<RecipesCubit>(() => RecipesCubit(feedRepository: sl(), recipeRepository: sl(), aboutRecipeRepository: sl()));
-    sl.registerFactory<DietsCubit>(() => DietsCubit(feedRepository: sl(), dietsRepository: sl()));
-    sl.registerFactory<PlansCubit>(() => PlansCubit(feedRepository: sl(), planRepository: sl()));
-    sl.registerFactory<ConsultantsCubit>(() => ConsultantsCubit(feedRepository: sl()));
-    sl.registerFactory<CommentsCubit>(() => CommentsCubit(feedRepository: sl(), commentsRepository: sl()));
-    sl.registerFactory<FeedProfileCubit>(() => FeedProfileCubit(profileRepository: sl()));
+    sl.registerFactory<RecipesCubit>(
+      () => RecipesCubit(
+        feedRepository: sl(),
+        recipeRepository: sl(),
+        aboutRecipeRepository: sl(),
+      ),
+    );
+    sl.registerFactory<DietsCubit>(
+      () => DietsCubit(feedRepository: sl(), dietsRepository: sl()),
+    );
+    sl.registerFactory<PlansCubit>(
+      () => PlansCubit(feedRepository: sl(), planRepository: sl()),
+    );
+    sl.registerFactory<ConsultantsCubit>(
+      () => ConsultantsCubit(feedRepository: sl()),
+    );
+    sl.registerFactory<CommentsCubit>(
+      () => CommentsCubit(feedRepository: sl(), commentsRepository: sl()),
+    );
+    sl.registerFactory<FeedProfileCubit>(
+      () => FeedProfileCubit(profileRepository: sl()),
+    );
 
     // Chat related cubits
-    sl.registerFactory<ChatRoomCubit>(() => ChatRoomCubit(cardsRepository: sl(), chatRepository: sl(), wsManager: sl()));
+    sl.registerFactory<ChatRoomCubit>(
+      () => ChatRoomCubit(
+        cardsRepository: sl(),
+        chatRepository: sl(),
+        wsManager: sl(),
+      ),
+    );
 
     // Profile related cubits
-    sl.registerFactory<ProfileCubit>(() => ProfileCubit(profileRepository: sl(), chatRepository: sl(), consultantRepository: sl()));
-    sl.registerFactory<profile_plans.PlansCubit>(() => profile_plans.PlansCubit(plansRepository: sl()));
+    sl.registerFactory<ProfileCubit>(
+      () => ProfileCubit(
+        profileRepository: sl(),
+        chatRepository: sl(),
+        consultantRepository: sl(),
+      ),
+    );
+    sl.registerFactory<profile_plans.PlansCubit>(
+      () => profile_plans.PlansCubit(plansRepository: sl()),
+    );
     sl.registerFactory<SubCubit>(() => SubCubit(profileRepository: sl()));
 
     // Content creation cubits
-    sl.registerFactory<CreateDietCubit>(() => CreateDietCubit(profileRepository: sl(), createDietRepository: sl(), glossaryRepository: sl()));
-    sl.registerFactory<CreatePlanCubit>(() => CreatePlanCubit(createPlanRepository: sl()));
-    sl.registerFactory<CreateRecipeCubit>(() => CreateRecipeCubit(recipeRepository: sl(), glossaryRepository: sl()));
-    sl.registerFactory<BlogPostCreateCubit>(() => BlogPostCreateCubit(blogPostRepository: sl()));
+    sl.registerFactory<CreateDietCubit>(
+      () => CreateDietCubit(
+        profileRepository: sl(),
+        createDietRepository: sl(),
+        glossaryRepository: sl(),
+      ),
+    );
+    sl.registerFactory<CreatePlanCubit>(
+      () => CreatePlanCubit(createPlanRepository: sl()),
+    );
+    sl.registerFactory<CreateRecipeCubit>(
+      () => CreateRecipeCubit(recipeRepository: sl(), glossaryRepository: sl()),
+    );
+    sl.registerFactory<BlogPostCreateCubit>(
+      () => BlogPostCreateCubit(blogPostRepository: sl()),
+    );
 
     // Content viewing cubits
-    sl.registerFactory<AboutDietCubit>(() => AboutDietCubit(dietsRepository: sl(), profileRepository: sl()));
-    sl.registerFactory<AboutPlanCubit>(() => AboutPlanCubit(planRepository: sl(), profileRepository: sl(), dietRepository: sl()));
-    sl.registerFactory<AboutRecipeCubit>(() => AboutRecipeCubit(recipeRepository: sl(), profileRepository: sl()));
+    sl.registerFactory<AboutDietCubit>(
+      () => AboutDietCubit(dietsRepository: sl(), profileRepository: sl()),
+    );
+    sl.registerFactory<AboutPlanCubit>(
+      () => AboutPlanCubit(
+        planRepository: sl(),
+        profileRepository: sl(),
+        dietRepository: sl(),
+      ),
+    );
+    sl.registerFactory<AboutRecipeCubit>(
+      () => AboutRecipeCubit(recipeRepository: sl(), profileRepository: sl()),
+    );
     sl.registerFactory<BlogPostCubit>(() => BlogPostCubit(sl()));
 
     // User content cubits
-    sl.registerFactory<MyDietsCubit>(() => MyDietsCubit(myDietsRepository: sl(), createDietRepository: sl()));
-    sl.registerFactory<MyPlansCubit>(() => MyPlansCubit(myPlansRepository: sl()));
-    sl.registerFactory<MyRecipesCubit>(() => MyRecipesCubit(myRecipesRepository: sl(), aboutRecipeRepository: sl(), recipeRepository: sl()));
+    sl.registerFactory<MyDietsCubit>(
+      () => MyDietsCubit(myDietsRepository: sl(), createDietRepository: sl()),
+    );
+    sl.registerFactory<MyPlansCubit>(
+      () => MyPlansCubit(myPlansRepository: sl()),
+    );
+    sl.registerFactory<MyRecipesCubit>(
+      () => MyRecipesCubit(
+        myRecipesRepository: sl(),
+        aboutRecipeRepository: sl(),
+        recipeRepository: sl(),
+      ),
+    );
 
     // Other feature cubits
-    sl.registerFactory<CalendarCubit>(() => CalendarCubit(calendarRepository: sl()));
+    sl.registerFactory<CalendarCubit>(
+      () => CalendarCubit(calendarRepository: sl()),
+    );
     sl.registerFactory<DiaryCubit>(
       () => DiaryCubit(
         chatRepository: sl(),
@@ -144,28 +250,74 @@ class CubitRegistrations {
       ),
     );
     sl.registerFactory<SettingsCubit>(
-      () => SettingsCubit(profileRepository: sl(), settingsRepository: sl(), consultantRepository: sl(), consultationsRepository: sl()),
+      () => SettingsCubit(
+        profileRepository: sl(),
+        settingsRepository: sl(),
+        consultantRepository: sl(),
+        consultationsRepository: sl(),
+        sessionLifecycleService: sl(),
+      ),
+    );
+    sl.registerFactory<RegisterConsultantCubit>(
+      () => RegisterConsultantCubit(consultantRepository: sl()),
+    );
+    sl.registerFactory<ComplainingCubit>(
+      () => ComplainingCubit(repository: sl()),
+    );
+    sl.registerFactory<UserCardsCubit>(
+      () => UserCardsCubit(cardsRepository: sl()),
+    );
+    sl.registerFactory<OrderInfoCubit>(
+      () => OrderInfoCubit(chatRepository: sl(), profileRepository: sl()),
     );
-    sl.registerFactory<RegisterConsultantCubit>(() => RegisterConsultantCubit(consultantRepository: sl()));
-    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()),
+      () => ConsultationPaymentCubit(
+        paymentRepository: sl(),
+        sbpRepository: sl(),
+      ),
+    );
+    sl.registerFactory<ConsultationsCubit>(
+      () => ConsultationsCubit(consultationsRepository: sl(), chatRepository: sl()),
+    );
+    sl.registerFactory<ConsultantCommentsCubit>(
+      () => ConsultantCommentsCubit(diaryRepository: sl()),
+    );
+    sl.registerFactory<CancelPlanCubit>(
+      () => CancelPlanCubit(cancelPlanRepository: sl()),
+    );
+    sl.registerFactory<ConsultationsArchiveCubit>(
+      () => ConsultationsArchiveCubit(consultationsRepository: sl()),
+    );
+    sl.registerFactory<ConsultantFinancesCubit>(
+      () => ConsultantFinancesCubit(consultationsRepository: sl()),
+    );
+    sl.registerFactory<UserPurchasesCubit>(
+      () => UserPurchasesCubit(consultationsRepository: sl()),
+    );
+    sl.registerFactory<BlockedUsersCubit>(
+      () => BlockedUsersCubit(blockedUsersRepository: sl()),
+    );
+    sl.registerFactory<NotificationSettingsCubit>(
+      () => NotificationSettingsCubit(notificationSettingsRepository: sl()),
+    );
+    sl.registerFactory<ConsultantRatingCubit>(
+      () => ConsultantRatingCubit(
+        feedRepository: sl(),
+        repository: sl(),
+        profileRepository: sl(),
+      ),
     );
-    sl.registerFactory<ConsultationsCubit>(() => ConsultationsCubit(consultationsRepository: sl()));
-    sl.registerFactory<ConsultantCommentsCubit>(() => ConsultantCommentsCubit(diaryRepository: sl()));
-    sl.registerFactory<CancelPlanCubit>(() => CancelPlanCubit(cancelPlanRepository: sl()));
-    sl.registerFactory<ConsultationsArchiveCubit>(() => ConsultationsArchiveCubit(consultationsRepository: sl()));
-    sl.registerFactory<ConsultantFinancesCubit>(() => ConsultantFinancesCubit(consultationsRepository: sl()));
-    sl.registerFactory<UserPurchasesCubit>(() => UserPurchasesCubit(consultationsRepository: sl()));
-    sl.registerFactory<BlockedUsersCubit>(() => BlockedUsersCubit(blockedUsersRepository: sl()));
-    sl.registerFactory<NotificationSettingsCubit>(() => NotificationSettingsCubit(notificationSettingsRepository: sl()));
-    sl.registerFactory<ConsultantRatingCubit>(() => ConsultantRatingCubit(feedRepository: sl(), repository: sl(), profileRepository: sl()));
     sl.registerFactory<ViewsCubit>(() => ViewsCubit(viewsRepository: sl()));
-    sl.registerFactory<UserDetailsCubit>(() => UserDetailsCubit(profileRepository: sl()));
-    sl.registerFactory<MenuCubit>(() => MenuCubit(sl()));
+    sl.registerFactory<UserDetailsCubit>(
+      () => UserDetailsCubit(profileRepository: sl()),
+    );
+    sl.registerFactory<MenuCubit>(() => MenuCubit(sl(), sl()));
     sl.registerFactory<MarketingCubit>(() => MarketingCubit(sl()));
-    sl.registerFactory<PersonalDietSuggestionCubit>(() => PersonalDietSuggestionCubit(dietRepository: sl(), personalDietSuggestionService: sl()));
+    sl.registerFactory<PersonalDietSuggestionCubit>(
+      () => PersonalDietSuggestionCubit(
+        dietRepository: sl(),
+        personalDietSuggestionService: sl(),
+      ),
+    );
   }
 }

lib/core/di/session_registrations.dart

@@ -0,0 +1,15 @@
+import 'package:eatvio_app/core/error_reporting/error_reporter.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/session/session_lifecycle_service.dart';
+import 'package:eatvio_app/core/websockets/ws_manager.dart';
+
+class SessionRegistrations {
+  static void registerAll() {
+    sl.registerLazySingleton<SessionLifecycleService>(
+      () => SessionLifecycleService(
+        wsManager: sl<WsManager>(),
+        errorReporter: sl<ErrorReporter>(),
+      ),
+    );
+  }
+}

lib/core/firebase_api.dart

@@ -3,6 +3,7 @@ import 'dart:developer';
 import 'dart:io';
 import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/app_initializer.dart';
+import 'package:eatvio_app/core/device/device_hw_id_provider.dart';
 import 'package:eatvio_app/core/notifications/notification_permission_requester.dart';
 import 'package:eatvio_app/core/push/hms_client_error.dart';
 import 'package:device_info_plus/device_info_plus.dart';
@@ -44,15 +45,16 @@ class FirebaseApi {
   Future<void> registerAnonymousPushToken() async {
     try {
       await _requestNotificationPermission();
-      final deviceInfo = DeviceInfoPlugin();
       final credentials = await _resolvePushCredentials();
       final token = credentials.token;
       if (token == null || token.isEmpty) return;
+      final hwId = await DeviceHwIdProvider.current();
+      if (hwId == null || hwId.length < 8) return;
       await sl<Dio>().post(
         '/api/anonymous_token',
         data: {
           'platform': credentials.platform,
-          'hw_id': Platform.isIOS ? (await deviceInfo.iosInfo).identifierForVendor : (await deviceInfo.androidInfo).id,
+          'hw_id': hwId,
           'token': token,
         },
       ).timeout(
@@ -69,34 +71,52 @@ class FirebaseApi {
   }
 
   Future<void> registerPushToken() async {
-    if (await TokenStorage.haveTokenInStorage()) {
-      try {
-        await _requestNotificationPermission();
-        final deviceInfo = DeviceInfoPlugin();
-        final credentials = await _resolvePushCredentials();
-        final token = credentials.token;
-        if (token == null || token.isEmpty) return;
-        await sl<Dio>().post(
-          '/api/profile/notification/token/register',
-          data: {
-            'platform': credentials.platform,
-            'hw_id': Platform.isIOS ? (await deviceInfo.iosInfo).identifierForVendor : (await deviceInfo.androidInfo).id,
-            'token': token,
-          },
-        ).timeout(
-          const Duration(seconds: 10),
-          onTimeout: () {
-            throw TimeoutException('registerPushToken timeout');
-          },
-        );
-        if (Platform.isIOS) {
-          await _registerIosVoipPushToken();
+    if (!await TokenStorage.haveTokenInStorage()) return;
+    try {
+      await _requestNotificationPermission();
+      final credentials = await _resolvePushCredentials();
+      final token = credentials.token;
+      final hwId = await DeviceHwIdProvider.current();
+      final reregisterAndroid =
+          await DeviceHwIdProvider.androidTokenNeedsReregister();
+      if (token != null &&
+          token.isNotEmpty &&
+          hwId != null &&
+          hwId.length >= 8) {
+        if (reregisterAndroid) {
+          try {
+            await unregisterPushToken();
+          } catch (_) {}
+        }
+        await sl<Dio>()
+            .post(
+              '/api/profile/notification/token/register',
+              data: {
+                'platform': credentials.platform,
+                'hw_id': hwId,
+                'token': token,
+              },
+            )
+            .timeout(
+              const Duration(seconds: 10),
+              onTimeout: () {
+                throw TimeoutException('registerPushToken timeout');
+              },
+            );
+        if (reregisterAndroid) {
+          await DeviceHwIdProvider.markAndroidTokenReregistered();
         }
-      } catch (e, st) {
-        log(e.toString(), stackTrace: st);
-        await _errorReporter.report(e, st, origin: 'FirebaseApi');
-        // Не пробрасываем ошибку дальше, так как это не критичная операция
       }
+    } catch (e, st) {
+      log(e.toString(), stackTrace: st);
+      await _errorReporter.report(e, st, origin: 'FirebaseApi');
+      // Не пробрасываем ошибку дальше, так как это не критичная операция
+    }
+    // Incoming calls on iOS come only through the VoIP token. It does not
+    // depend on the FCM token, so a missing or failed FCM registration must
+    // not leave the device without calls.
+    if (Platform.isIOS) {
+      await _registerIosVoipPushToken();
     }
   }
 
@@ -142,12 +162,13 @@ class FirebaseApi {
       final token = (await FlutterCallkitIncoming.getDevicePushTokenVoIP())?.trim();
       if (token == null || token.isEmpty) return;
 
-      final deviceInfo = DeviceInfoPlugin();
+      final hwId = await DeviceHwIdProvider.current();
+      if (hwId == null || hwId.length < 8) return;
       await sl<Dio>().post(
         '/api/profile/notification/token/voip/register',
         data: {
           'platform': 'ios',
-          'hw_id': (await deviceInfo.iosInfo).identifierForVendor,
+          'hw_id': hwId,
           'token': token,
         },
       ).timeout(

lib/core/interceptors/phone_verify_error_interceptor.dart

@@ -1,5 +1,6 @@
 import 'package:dio/dio.dart';
 import 'package:eatvio_app/core/app_router.dart';
+import 'package:eatvio_app/core/interceptors/verification_requirement.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/routing/route_constants.dart';
 import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
@@ -9,28 +10,77 @@ import 'package:go_router/go_router.dart';
 class PhoneVerifyErrorInterceptor extends Interceptor {
   @override
   void onError(DioException err, ErrorInterceptorHandler handler) async {
-    if (err.response?.statusCode == 405) {
-      final data = err.response?.data;
-
-      if (data is Map<String, dynamic> && data['type'] == 'unverificated_phone') {
-        final String phone = await sl<ProfileRepository>().getMyPhone();
-        final String passKey = await sl<ProfileRepository>().getPassKey(routeName: 'user_detailz.change-phone-verify', routeParams: {"phone": phone});
-        await showErrorDialog(
-          AppRouter.navigatorKey.currentContext!,
-          title: 'Привяжите номер телефона',
-          description: 'Для того, что бы выполнить это действие необходимо привязать номер телефона',
-        );
-        final currentContext = AppRouter.navigatorKey.currentContext;
-
-        if (currentContext != null && currentContext.mounted && GoRouter.of(currentContext).state.path == RouteConstants.stepperBecomeConsultantScreen) {
-          GoRouter.of(currentContext).pop();
-        }
-        AppRouter.navigatorKey.currentContext?.pushNamed('verifyScreen', extra: passKey);
-        return handler.reject(
-          DioException(requestOptions: err.requestOptions, response: err.response, error: 'Phone number not verified', type: DioExceptionType.badResponse),
-        );
-      }
+    if (err.response?.statusCode != 405) {
+      return handler.next(err);
+    }
+
+    final requirement = VerificationRequirement.tryParse(err.response?.data);
+    if (requirement == null) {
+      return handler.next(err);
+    }
+
+    // Бэкенд может требовать подтверждения почты, телефона или обоих каналов сразу.
+    if (requirement.needsEmail) {
+      await _handleEmailVerificationRequired();
+    } else {
+      await _handlePhoneVerificationRequired();
+    }
+
+    return handler.reject(
+      DioException(
+        requestOptions: err.requestOptions,
+        response: err.response,
+        error: 'Phone number not verified',
+        type: DioExceptionType.badResponse,
+      ),
+    );
+  }
+
+  /// Старый сценарий: показывает привязку телефона и открывает passkey-экран.
+  Future<void> _handlePhoneVerificationRequired() async {
+    final String phone = await sl<ProfileRepository>().getMyPhone();
+    final String passKey = await sl<ProfileRepository>().getPassKey(
+      routeName: 'user_detailz.change-phone-verify',
+      routeParams: {"phone": phone},
+    );
+    await showErrorDialog(
+      AppRouter.navigatorKey.currentContext!,
+      title: 'Привяжите номер телефона',
+      description:
+          'Для того, что бы выполнить это действие необходимо привязать номер телефона',
+    );
+    final currentContext = AppRouter.navigatorKey.currentContext;
+
+    if (currentContext != null &&
+        currentContext.mounted &&
+        GoRouter.of(currentContext).state.path ==
+            RouteConstants.stepperBecomeConsultantScreen) {
+      GoRouter.of(currentContext).pop();
+    }
+    AppRouter.navigatorKey.currentContext?.pushNamed(
+      'verifyScreen',
+      extra: passKey,
+    );
+  }
+
+  /// Новый сценарий: предлагает подтвердить e-mail и открывает экран ввода кода.
+  Future<void> _handleEmailVerificationRequired() async {
+    final context = AppRouter.navigatorKey.currentContext;
+
+    if (context == null || !context.mounted) {
+      // UI недоступен (например, в тестах) — просто отклоняем запрос, без падения.
+      return;
+    }
+
+    await showErrorDialog(
+      context,
+      title: 'Подтвердите e-mail',
+      description:
+          'Чтобы публиковать материалы, подтвердите адрес электронной почты. Мы отправим код на вашу почту.',
+    );
+
+    if (context.mounted) {
+      context.pushNamed('verifyEmailScreen', extra: true);
     }
-    return handler.next(err);
   }
 }

lib/core/interceptors/token_interceptor.dart

@@ -1,9 +1,7 @@
 import 'package:dio/dio.dart';
-import 'package:eatvio_app/core/app_router.dart';
+import 'package:eatvio_app/core/session/session_lifecycle_service.dart';
 import 'package:eatvio_app/core/token_storage.dart';
-import 'package:eatvio_app/core/websockets/ws_manager.dart';
 import 'package:eatvio_app/core/locator_service.dart';
-import 'package:go_router/go_router.dart';
 
 class TokenInterceptor extends Interceptor {
   @override
@@ -14,6 +12,7 @@ class TokenInterceptor extends Interceptor {
     final token = await TokenStorage.getTokenFromStorage();
     if (token != null && token.isNotEmpty) {
       options.headers['Authorization'] = 'Bearer $token';
+      options.extra['authToken'] = token;
     }
 
     super.onRequest(options, handler);
@@ -25,9 +24,18 @@ class TokenInterceptor extends Interceptor {
     ErrorInterceptorHandler handler,
   ) async {
     if (err.response?.statusCode == 401) {
-      await sl<WsManager>().clear();
-      await TokenStorage.removeTokenInStorage();
-      AppRouter.navigatorKey.currentContext?.go('/auth-screen');
+      final requestCarriedAuth = err.requestOptions.headers.containsKey(
+        'Authorization',
+      );
+      final requestToken = err.requestOptions.extra['authToken'];
+      final currentToken = await TokenStorage.getTokenFromStorage();
+      if (requestCarriedAuth &&
+          requestToken != null &&
+          requestToken == currentToken) {
+        await sl<SessionLifecycleService>().endSession(
+          reason: SessionEndReason.unauthorized,
+        );
+      }
     }
     super.onError(err, handler);
   }

lib/core/interceptors/verification_requirement.dart

@@ -0,0 +1,61 @@
+/// Канал верификации, которого не хватает для публичного действия.
+enum VerificationChannel { phone, email }
+
+/// Разбор 405-контракта верификации (type/reason/missing) в список каналов.
+///
+/// Бэкенд отвечает на публичное действие без подтверждения так:
+/// `{"type": "unverificated_phone", "reason": "verification_required", "missing": ["email"]}`.
+/// Старые ответы не содержали поля `missing` — тогда не хватало только телефона.
+class VerificationRequirement {
+  const VerificationRequirement({required this.missing});
+
+  /// Каналы, подтверждение которых требует бэкенд.
+  final List<VerificationChannel> missing;
+
+  bool get needsEmail => missing.contains(VerificationChannel.email);
+
+  bool get needsPhone => missing.contains(VerificationChannel.phone);
+
+  /// Возвращает null, если ответ не является отказом верификации.
+  static VerificationRequirement? tryParse(Object? data) {
+    if (data is! Map) {
+      return null;
+    }
+    if (data['type'] != 'unverificated_phone') {
+      return null;
+    }
+
+    final Object? rawMissing = data['missing'];
+    if (rawMissing is! List) {
+      // Legacy-контракт: поля missing не было, значит не подтверждён телефон.
+      return const VerificationRequirement(
+        missing: [VerificationChannel.phone],
+      );
+    }
+
+    var hasPhone = false;
+    var hasEmail = false;
+    for (final Object? value in rawMissing) {
+      // Неизвестные значения игнорируем, чтобы новые каналы бэкенда не ломали разбор.
+      if (value == 'phone') {
+        hasPhone = true;
+      } else if (value == 'email') {
+        hasEmail = true;
+      }
+    }
+
+    // Пустой или нераспознанный missing трактуем как legacy-контракт «телефон».
+    if (!hasPhone && !hasEmail) {
+      return const VerificationRequirement(
+        missing: [VerificationChannel.phone],
+      );
+    }
+
+    return VerificationRequirement(
+      missing: [
+        if (hasPhone) VerificationChannel.phone,
+        if (hasEmail) VerificationChannel.email,
+      ],
+    );
+  }
+}

lib/core/locator_service.dart

@@ -5,6 +5,7 @@ import 'package:eatvio_app/core/di/cubit_registrations.dart';
 import 'package:eatvio_app/core/di/external_registrations.dart';
 import 'package:eatvio_app/core/di/repository_registrations.dart';
 import 'package:eatvio_app/core/di/service_registrations.dart';
+import 'package:eatvio_app/core/di/session_registrations.dart';
 import 'package:eatvio_app/core/prefs.dart';
 import 'package:eatvio_app/core/websockets/ws_manager.dart';
 import 'package:get_it/get_it.dart';
@@ -38,4 +39,6 @@ Future<void> init({required AppBuildType buildType}) async {
   sl.registerLazySingleton<WsManager>(
     () => WsManager(wsService: sl(), errorReporter: sl()),
   );
+
+  SessionRegistrations.registerAll();
 }

lib/core/notifications/push_navigation_handler.dart

@@ -62,12 +62,16 @@ class PushNavigationHandler {
     final endedPayload = VideoCallEndedPushPayload.tryParse(data);
     if (endedPayload != null) {
       developer.log(
-        'PushNavigationHandler: dismiss incoming call UI, source=$source',
+        'PushNavigationHandler: dismiss incoming call UI, source=$source '
+        'call_id=${endedPayload.callId ?? '-'} '
+        'reason=${endedPayload.reason?.name ?? '-'}',
         name: 'PushNavigationHandler',
       );
       unawaited(
         VideoCallEndedPushHandler.dismissIncomingCallUi(
           conversationUuid: endedPayload.conversationUuid,
+          callId: endedPayload.callId,
+          reason: endedPayload.reason,
         ),
       );
       return;

lib/core/prefs_keys.dart

@@ -5,4 +5,5 @@ enum PrefsKeys {
   marketingBottomSheetHasBeenShown,
   isEmailVerificationSkipped,
   customBaseUrl,
+  apiBaseUrl,
 }

lib/core/routing/auth_routes.dart

@@ -34,7 +34,7 @@ class AuthRoutes {
         name: 'verifyScreen',
         builder: (context, state) => VerifyScreen(passKey: state.extra as String),
       ),
-      GoRoute(path: RouteConstants.verifyEmailScreen, name: 'verifyEmailScreen', builder: (context, state) => const VerifyEmailScreen()),
+      GoRoute(path: RouteConstants.verifyEmailScreen, name: 'verifyEmailScreen', builder: (context, state) => VerifyEmailScreen(returnOnSuccess: state.extra == true)),
       GoRoute(
         path: RouteConstants.registerViaSocialScreen,
         name: 'registerViaSocialScreen',

lib/core/routing/main_navigation_routes.dart

@@ -1,6 +1,5 @@
 import 'package:eatvio_app/core/routing/route_constants.dart';
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
-import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_state.dart';
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/widgets/bottom_nav_scope.dart';
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart';
 import 'package:eatvio_app/features/chat/presentation/pages/chats_screen.dart';
@@ -24,14 +23,10 @@ class MainNavigationRoutes {
     return [
       ShellRoute(
         builder: (context, state, child) {
-          // Инициализация ProfileAvatarCubit при первом использовании ShellRoute
           final profileAvatarCubit = context.read<ProfileAvatarCubit>();
-          if (profileAvatarCubit.state is ProfileAvatarStateLoading) {
-            // Вызываем getMyProfile() только если состояние loading (первый запуск)
-            WidgetsBinding.instance.addPostFrameCallback((_) {
-              profileAvatarCubit.getMyProfile();
-            });
-          }
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            profileAvatarCubit.ensureFreshForCurrentSession();
+          });
 
           return _MainShellWithNavScope(currentLocation: state.matchedLocation, child: child);
         },

lib/core/session/session_lifecycle_service.dart

@@ -0,0 +1,122 @@
+import 'dart:async';
+
+import 'package:appmetrica_plugin/appmetrica_plugin.dart';
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/app_config.dart';
+import 'package:eatvio_app/core/app_router.dart';
+import 'package:eatvio_app/core/error_reporting/error_reporter.dart';
+import 'package:eatvio_app/core/firebase_api.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/prefs.dart';
+import 'package:eatvio_app/core/prefs_keys.dart';
+import 'package:eatvio_app/core/routing/route_constants.dart';
+import 'package:eatvio_app/core/token_storage.dart';
+import 'package:eatvio_app/core/websockets/ws_manager.dart';
+import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_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/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
+import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_cubit.dart';
+import 'package:eatvio_app/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart';
+import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
+import 'package:go_router/go_router.dart';
+
+enum SessionEndReason { logout, unauthorized, accountDeleted }
+
+class SessionLifecycleService {
+  SessionLifecycleService({
+    required WsManager wsManager,
+    required ErrorReporter errorReporter,
+  }) : _wsManager = wsManager,
+       _errorReporter = errorReporter;
+
+  final WsManager _wsManager;
+  final ErrorReporter _errorReporter;
+
+  int? _authenticatedFingerprint;
+  bool _endingSession = false;
+
+  Future<void> endSession({required SessionEndReason reason}) async {
+    if (_endingSession) return;
+    _endingSession = true;
+    try {
+      await _run(() => _wsManager.clear());
+      await _run(TokenStorage.removeTokenInStorage);
+      await _run(SocketIdStorage.removeSocketIdInStorage);
+      await _run(() => sl<ProfileAvatarCubit>().reset());
+      await _run(() => sl<ChatsCubit>().reset());
+      await _run(() => sl<NotificationsCubit>().reset());
+      await _run(() => sl<NewMessagesCubit>().reset());
+      await _run(() => sl<FeedCubit>().reset());
+      await _run(() async => ProfileCubit.clearMyProfileReference());
+      await _run(() => sl<VideoCallSessionCubit>().endCall());
+      await _run(() async => AppMetrica.setUserProfileID(null));
+      await _run(
+        () => sl<Prefs>().remove(PrefsKeys.isEmailVerificationSkipped),
+      );
+      await _run(() => sl<Prefs>().remove(PrefsKeys.registrationDate));
+      _authenticatedFingerprint = null;
+      await _run(() async {
+        final context = AppRouter.navigatorKey.currentContext;
+        if (context == null) return;
+        final path =
+            AppRouter.appRouter.routeInformationProvider.value.uri.path;
+        if (path != RouteConstants.authScreen) {
+          context.go(RouteConstants.authScreen);
+        }
+      });
+    } finally {
+      _endingSession = false;
+    }
+  }
+
+  Future<void> onAuthenticated() async {
+    String? token;
+    try {
+      token = await TokenStorage.getTokenFromStorage();
+    } catch (e, st) {
+      await _report(e, st);
+      return;
+    }
+    if (token == null || token.isEmpty) return;
+    final fingerprint = token.hashCode;
+    if (_authenticatedFingerprint == fingerprint) return;
+    _authenticatedFingerprint = fingerprint;
+
+    await _run(() async {
+      await _wsManager.clear();
+      await _wsManager.initialize();
+    });
+    await _run(() => sl<ProfileAvatarCubit>().getMyProfile());
+    await _run(() => sl<ChatsCubit>().getChatRoomsWithLoading());
+    await _run(() => sl<NotificationsCubit>().getNotifications());
+    await _run(() => sl<FirebaseApi>().registerPushToken());
+  }
+
+  Future<void> logout() async {
+    try {
+      await _run(() => sl<FirebaseApi>().unregisterPushTokens());
+      await _run(
+        () => sl<Dio>().post('${sl<AppConfig>().baseUrl}/api/profile/logout'),
+      );
+    } finally {
+      await endSession(reason: SessionEndReason.logout);
+    }
+  }
+
+  Future<void> _run(FutureOr<void> Function() action) async {
+    try {
+      await action();
+    } catch (e, st) {
+      await _report(e, st);
+    }
+  }
+
+  Future<void> _report(Object error, StackTrace stackTrace) {
+    return _errorReporter.report(
+      error,
+      stackTrace,
+      origin: 'SessionLifecycleService',
+    );
+  }
+}

lib/core/websockets/ws_manager.dart

@@ -18,7 +18,7 @@ class WsManager {
   final ErrorReporter _errorReporter;
 
   WsManager({required this.wsService, required ErrorReporter errorReporter})
-      : _errorReporter = errorReporter;
+    : _errorReporter = errorReporter;
 
   PusherChannelsClient? client;
   int? userId;
@@ -43,14 +43,32 @@ class WsManager {
   /// Контроллер создаётся один раз и не закрывается в [clear]: подписчики
   /// (чаты, окно чата) переживают логаут/повторный вход и продолжают получать
   /// сигналы. Если контроллер всё же закрыт, он пересоздаётся в [initialize].
-  StreamController<void> _reconnectController = StreamController<void>.broadcast();
+  StreamController<void> _reconnectController =
+      StreamController<void>.broadcast();
 
   Stream<ChannelReadEvent>? _directChatStream;
   Stream<ChannelReadEvent>? _clientTypingStream;
 
-  Stream<ChannelReadEvent>? get newMessagesStream => _privateMessagesChannel?.bind('App\\Events\\ChatMessageUpdated');
+  Stream<ChannelReadEvent>? get newMessagesStream =>
+      _privateMessagesChannel?.bind('App\\Events\\ChatMessageUpdated');
 
-  Stream<ChannelReadEvent>? get newNotificationsStream => _privateNotificationChannel?.bind('Illuminate\\Notifications\\Events\\BroadcastNotificationCreated');
+  /// The callee rejected the ring. Broadcast to the caller and the callee.
+  Stream<ChannelReadEvent>? get videoCallDeclinedStream =>
+      _privateMessagesChannel?.bind('video-call-declined');
+
+  /// The call was cancelled or hung up. Same channel the web client uses.
+  Stream<ChannelReadEvent>? get videoCallEndedStream =>
+      _privateMessagesChannel?.bind('video-call-ended');
+
+  /// Another device accepted the ring. Ringing on this device must stop,
+  /// except on the device that accepted.
+  Stream<ChannelReadEvent>? get videoCallAcceptedStream =>
+      _privateMessagesChannel?.bind('video-call-accepted');
+
+  Stream<ChannelReadEvent>? get newNotificationsStream =>
+      _privateNotificationChannel?.bind(
+        'Illuminate\\Notifications\\Events\\BroadcastNotificationCreated',
+      );
 
   Stream<ChannelReadEvent>? get directChatStream => _directChatStream;
 
@@ -86,15 +104,9 @@ class WsManager {
           connectionErrorHandler: (exception, trace, refresh) {
             refresh();
           },
-          minimumReconnectDelayDuration: const Duration(
-            seconds: 1,
-          ),
-          defaultActivityDuration: const Duration(
-            seconds: 30,
-          ),
-          waitForPongDuration: const Duration(
-            seconds: 30,
-          ),
+          minimumReconnectDelayDuration: const Duration(seconds: 1),
+          defaultActivityDuration: const Duration(seconds: 30),
+          waitForPongDuration: const Duration(seconds: 30),
         );
 
         String? extractSocketId(String? data) {
@@ -107,7 +119,9 @@ class WsManager {
           }
         }
 
-        _connectionEstablishedSubscription = client?.eventStream.listen((event) async {
+        _connectionEstablishedSubscription = client?.eventStream.listen((
+          event,
+        ) async {
           if (event.name == 'pusher:connection_established') {
             final data = event.data;
             final socketId = extractSocketId(data);
@@ -124,7 +138,8 @@ class WsManager {
         await _initPrivateMessagesChannel();
 
         _lifecycleSubscription = client?.lifecycleStream.listen((data) {
-          if (data == PusherChannelsClientLifeCycleState.establishedConnection) {
+          if (data ==
+              PusherChannelsClientLifeCycleState.establishedConnection) {
             handleConnectionEstablished();
           }
         });
@@ -166,12 +181,13 @@ class WsManager {
     final token = await TokenStorage.getTokenFromStorage();
     _privateNotificationChannel = client?.privateChannel(
       '$newNotificationsChannelName.$userId',
-      authorizationDelegate: EndpointAuthorizableChannelTokenAuthorizationDelegate.forPrivateChannel(
-        authorizationEndpoint: Uri.parse('${sl<AppConfig>().baseUrl}/broadcasting/auth'),
-        headers: {
-          'Authorization': 'Bearer $token',
-        },
-      ),
+      authorizationDelegate:
+          EndpointAuthorizableChannelTokenAuthorizationDelegate.forPrivateChannel(
+            authorizationEndpoint: Uri.parse(
+              '${sl<AppConfig>().baseUrl}/broadcasting/auth',
+            ),
+            headers: {'Authorization': 'Bearer $token'},
+          ),
     );
   }
 
@@ -179,12 +195,13 @@ class WsManager {
     final token = await TokenStorage.getTokenFromStorage();
     _privateMessagesChannel = client?.privateChannel(
       '$newMessagesChannelName.$userId',
-      authorizationDelegate: EndpointAuthorizableChannelTokenAuthorizationDelegate.forPrivateChannel(
-        authorizationEndpoint: Uri.parse('${sl<AppConfig>().baseUrl}/broadcasting/auth'),
-        headers: {
-          'Authorization': 'Bearer $token',
-        },
-      ),
+      authorizationDelegate:
+          EndpointAuthorizableChannelTokenAuthorizationDelegate.forPrivateChannel(
+            authorizationEndpoint: Uri.parse(
+              '${sl<AppConfig>().baseUrl}/broadcasting/auth',
+            ),
+            headers: {'Authorization': 'Bearer $token'},
+          ),
     );
   }
 
@@ -193,14 +210,17 @@ class WsManager {
     final token = await TokenStorage.getTokenFromStorage();
     _privateDirectChatChannel = client?.privateChannel(
       '$directChatChannelName.$chatId',
-      authorizationDelegate: EndpointAuthorizableChannelTokenAuthorizationDelegate.forPrivateChannel(
-        authorizationEndpoint: Uri.parse('${sl<AppConfig>().baseUrl}/broadcasting/auth'),
-        headers: {
-          'Authorization': 'Bearer $token',
-        },
-      ),
+      authorizationDelegate:
+          EndpointAuthorizableChannelTokenAuthorizationDelegate.forPrivateChannel(
+            authorizationEndpoint: Uri.parse(
+              '${sl<AppConfig>().baseUrl}/broadcasting/auth',
+            ),
+            headers: {'Authorization': 'Bearer $token'},
+          ),
+    );
+    _directChatStream = _privateDirectChatChannel?.bind(
+      'App\\Events\\ChatMessageUpdated',
     );
-    _directChatStream = _privateDirectChatChannel?.bind('App\\Events\\ChatMessageUpdated');
     _clientTypingStream = _privateDirectChatChannel?.bind('client-typing');
   }
 
@@ -208,12 +228,13 @@ class WsManager {
     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',
-        },
-      ),
+      authorizationDelegate:
+          EndpointAuthorizableChannelTokenAuthorizationDelegate.forPresenceChannel(
+            authorizationEndpoint: Uri.parse(
+              '${sl<AppConfig>().baseUrl}/broadcasting/auth',
+            ),
+            headers: {'Authorization': 'Bearer $token'},
+          ),
     );
   }
 
@@ -240,7 +261,8 @@ class WsManager {
     void Function(bool isOnline) onCounterpartOnlineChanged,
   ) {
     _presenceDirectChatListeners.removeWhere(
-      (listener) => listener.onCounterpartOnlineChanged == onCounterpartOnlineChanged,
+      (listener) =>
+          listener.onCounterpartOnlineChanged == onCounterpartOnlineChanged,
     );
     if (_presenceDirectChatListeners.isEmpty) {
       unsubscribePresenceDirectChatChannel();
@@ -254,21 +276,26 @@ class WsManager {
 
     _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) {
+    _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) {
+    _presenceMemberRemovedSubscription = channel.whenMemberRemoved().listen((
+      event,
+    ) {
       final memberUserId = _parsePresenceMemberUserId(event.data);
       if (memberUserId == null) return;
       _notifyPresenceListeners(memberUserId, isOnline: false);
@@ -280,11 +307,15 @@ class WsManager {
     if (channel == null) return;
     final members = channel.state?.members;
     if (members == null) return;
-    final isOnline = members.getMemberInfo(counterpartUserId.toString()) != null;
+    final isOnline =
+        members.getMemberInfo(counterpartUserId.toString()) != null;
     _notifyPresenceListeners(counterpartUserId, isOnline: isOnline);
   }
 
-  void _notifyPresenceListeners(int counterpartUserId, {required bool isOnline}) {
+  void _notifyPresenceListeners(
+    int counterpartUserId, {
+    required bool isOnline,
+  }) {
     for (final listener in _presenceDirectChatListeners) {
       if (listener.counterpartUserId == counterpartUserId) {
         listener.onCounterpartOnlineChanged(isOnline);

lib/core/widgets/bottom_sheet_with_blur.dart

@@ -3,7 +3,11 @@ import 'dart:ui';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 
-Future<void> showBottomSheetWithBlur({
+/// Показывает modal bottom sheet с blur-фоном.
+///
+/// Дженерик [T] пробрасывает значение, переданное в `Navigator.pop(T)`
+/// внутри шита (по умолчанию `null`).
+Future<T?> showBottomSheetWithBlur<T>({
   required BuildContext context,
   required Widget child,
   double? height = 200,
@@ -11,7 +15,7 @@ Future<void> showBottomSheetWithBlur({
   bool enableDrag = true,
   bool userRootNavigator = false,
 }) {
-  return showModalBottomSheet(
+  return showModalBottomSheet<T>(
     context: context,
     isScrollControlled: true,
     barrierColor: appTheme.transparentBlack,

lib/features/auth/presentation/bloc/auth_cubit/auth_cubit.dart

@@ -3,6 +3,7 @@ import 'dart:developer';
 import 'package:eatvio_app/core/firebase_api.dart';
 import 'package:eatvio_app/core/prefs.dart';
 import 'package:eatvio_app/core/prefs_keys.dart';
+import 'package:eatvio_app/core/session/session_lifecycle_service.dart';
 import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/core/utils/toasts.dart';
 import 'package:eatvio_app/features/auth/presentation/bloc/auth_cubit/auth_state.dart';
@@ -17,15 +18,26 @@ class AuthCubit extends Cubit<AuthState> {
   final ProfileRepository profileRepository;
   final FirebaseApi firebaseApi;
   final Prefs prefs;
+  final SessionLifecycleService sessionLifecycleService;
 
-  AuthCubit({required this.authRepository, required this.prefs, required this.profileRepository, required this.firebaseApi}) : super(const AuthState());
+  AuthCubit({
+    required this.authRepository,
+    required this.prefs,
+    required this.profileRepository,
+    required this.firebaseApi,
+    required this.sessionLifecycleService,
+  }) : super(const AuthState());
 
   Future<bool> getTokenByCredentials(String email, String password) async {
     emit(const AuthState.loading());
     try {
-      final token = (await authRepository.getTokenByCredentials(email, password)).token;
+      final token = (await authRepository.getTokenByCredentials(
+        email,
+        password,
+      )).token;
       emit(AuthState.loaded(token: token));
       await TokenStorage.saveTokenInStorage(token);
+      await sessionLifecycleService.onAuthenticated();
       return true;
     } catch (e, st) {
       await reportFrom(e, st, this);
@@ -48,7 +60,8 @@ class AuthCubit extends Cubit<AuthState> {
 
   Future<void> registerAnonymousPushToken() async {
     try {
-      final hasAnonymousTokenBeenSent = prefs.getBool(PrefsKeys.hasAnonymousTokenBeenSent) ?? false;
+      final hasAnonymousTokenBeenSent =
+          prefs.getBool(PrefsKeys.hasAnonymousTokenBeenSent) ?? false;
       if (!hasAnonymousTokenBeenSent) {
         await firebaseApi.registerAnonymousPushToken();
         prefs.setBool(PrefsKeys.hasAnonymousTokenBeenSent, true);

lib/features/auth/presentation/bloc/oauth_cubit/oauth_cubit.dart

@@ -1,7 +1,9 @@
 import 'dart:developer';
 import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/firebase_api.dart';
 import 'package:eatvio_app/core/mixins/registration_date_cache_mixin.dart';
 import 'package:eatvio_app/core/prefs.dart';
+import 'package:eatvio_app/core/session/session_lifecycle_service.dart';
 import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/features/auth/models/oauth_verification_request_response.dart';
 import 'package:eatvio_app/features/auth/presentation/bloc/oauth_cubit/oauth_state.dart';
@@ -11,12 +13,24 @@ import 'package:eatvio_app/core/error_reporting/report_from.dart';
 
 class OAuthCubit extends Cubit<OAuthState> with RegistrationDateCacheMixin {
   final AuthRepository authRepository;
+  final FirebaseApi firebaseApi;
+  final SessionLifecycleService sessionLifecycleService;
 
-  OAuthCubit({required this.authRepository, required Prefs prefs}) : super(const OAuthState()) {
+  OAuthCubit({
+    required this.authRepository,
+    required this.firebaseApi,
+    required this.sessionLifecycleService,
+    required Prefs prefs,
+  }) : super(const OAuthState()) {
     this.prefs = prefs;
   }
 
-  Future<void> signInViaSocialMedia({required String provider, required String accessToken, required String refreshToken, required String clientId}) async {
+  Future<void> signInViaSocialMedia({
+    required String provider,
+    required String accessToken,
+    required String refreshToken,
+    required String clientId,
+  }) async {
     try {
       emit(const OAuthState.loading());
 
@@ -28,7 +42,8 @@ class OAuthCubit extends Cubit<OAuthState> with RegistrationDateCacheMixin {
       );
 
       log('OAuthCubit: Got token model: ${tokenModel.token}');
-      TokenStorage.saveTokenInStorage(tokenModel.token);
+      await TokenStorage.saveTokenInStorage(tokenModel.token);
+      await sessionLifecycleService.onAuthenticated();
       emit(OAuthState.loaded(token: tokenModel.token));
     } on DioException catch (e, st) {
       await reportFrom(e, st, this);
@@ -45,7 +60,8 @@ class OAuthCubit extends Cubit<OAuthState> with RegistrationDateCacheMixin {
           if (errorStr.contains('Некорректный формат email')) {
             errorsList.add(RegistrationValidationErrors.incorrectEmailFormat);
           }
-          if (errorStr.contains('почта уже существует') || errorStr.contains('Эл. почта уже существует')) {
+          if (errorStr.contains('почта уже существует') ||
+              errorStr.contains('Эл. почта уже существует')) {
             errorsList.add(RegistrationValidationErrors.emailExist);
           }
         }
@@ -53,14 +69,20 @@ class OAuthCubit extends Cubit<OAuthState> with RegistrationDateCacheMixin {
       if (phoneErrors != null && phoneErrors.isNotEmpty) {
         for (final error in phoneErrors) {
           final errorStr = error.toString();
-          if (errorStr.contains('phone уже существует') || errorStr.contains('телефон уже существует')) {
+          if (errorStr.contains('phone уже существует') ||
+              errorStr.contains('телефон уже существует')) {
             errorsList.add(RegistrationValidationErrors.phoneExist);
           }
         }
       }
 
       if (errorsList.isNotEmpty) {
-        emit(OAuthState.error(errorMessage: 'validation_error', registrationValidationErrors: errorsList));
+        emit(
+          OAuthState.error(
+            errorMessage: 'validation_error',
+            registrationValidationErrors: errorsList,
+          ),
+        );
       } else {
         emit(OAuthState.error(errorMessage: e.toString()));
       }
@@ -103,7 +125,8 @@ class OAuthCubit extends Cubit<OAuthState> with RegistrationDateCacheMixin {
         height: height,
         clientId: clientId,
       );
-      TokenStorage.saveTokenInStorage(token);
+      await TokenStorage.saveTokenInStorage(token);
+      await sessionLifecycleService.onAuthenticated();
       cacheRegistrationDate(DateTime.now());
       emit(OAuthState.loaded(token: token));
     } on DioException catch (e, st) {
@@ -120,7 +143,8 @@ class OAuthCubit extends Cubit<OAuthState> with RegistrationDateCacheMixin {
           if (errorStr.contains('Некорректный формат email')) {
             errorsList.add(RegistrationValidationErrors.incorrectEmailFormat);
           }
-          if (errorStr.contains('почта уже существует') || errorStr.contains('Эл. почта уже существует')) {
+          if (errorStr.contains('почта уже существует') ||
+              errorStr.contains('Эл. почта уже существует')) {
             errorsList.add(RegistrationValidationErrors.emailExist);
           }
         }
@@ -128,14 +152,17 @@ class OAuthCubit extends Cubit<OAuthState> with RegistrationDateCacheMixin {
       if (phoneErrors != null && phoneErrors.isNotEmpty) {
         for (final error in phoneErrors) {
           final errorStr = error.toString();
-          if (errorStr.contains('phone уже существует') || errorStr.contains('телефон уже существует')) {
+          if (errorStr.contains('phone уже существует') ||
+              errorStr.contains('телефон уже существует')) {
             errorsList.add(RegistrationValidationErrors.phoneExist);
           }
         }
       }
       if (dateOfBirth != null && dateOfBirth.isNotEmpty) {
         if (dateOfBirth.contains('Некорректный формат даты рождения')) {
-          errorsList.add(RegistrationValidationErrors.incorrectDateOfBirthFormat);
+          errorsList.add(
+            RegistrationValidationErrors.incorrectDateOfBirthFormat,
+          );
         }
       }
       if (errorsList.isNotEmpty) {
@@ -146,13 +173,23 @@ class OAuthCubit extends Cubit<OAuthState> with RegistrationDateCacheMixin {
     return null;
   }
 
-  Future<OAuthVerificationRequestResponse?> requestOAuthVerification({String? email, String? phone}) async {
+  Future<OAuthVerificationRequestResponse?> requestOAuthVerification({
+    String? email,
+    String? phone,
+  }) async {
     try {
       emit(const OAuthState.loading());
-      log('OAuthCubit: Requesting verification code for email: $email, phone: $phone');
-      final response = await authRepository.requestOAuthVerification(email: email, phone: phone);
+      log(
+        'OAuthCubit: Requesting verification code for email: $email, phone: $phone',
+      );
+      final response = await authRepository.requestOAuthVerification(
+        email: email,
+        phone: phone,
+      );
       if (response != null) {
-        log('OAuthCubit: Verification code requested successfully, masked email: ${response.email}');
+        log(
+          'OAuthCubit: Verification code requested successfully, masked email: ${response.email}',
+        );
       }
       // Сбрасываем состояние после успешного запроса кода
       emit(const OAuthState());
@@ -184,7 +221,9 @@ class OAuthCubit extends Cubit<OAuthState> with RegistrationDateCacheMixin {
   }) async {
     try {
       emit(const OAuthState.loading());
-      log('OAuthCubit: Confirming OAuth verification - provider: $provider, verificationType: $verificationType, code: $code');
+      log(
+        'OAuthCubit: Confirming OAuth verification - provider: $provider, verificationType: $verificationType, code: $code',
+      );
       final response = await authRepository.confirmOAuthVerification(
         provider: provider,
         accessToken: accessToken,
@@ -202,8 +241,11 @@ class OAuthCubit extends Cubit<OAuthState> with RegistrationDateCacheMixin {
         weight: weight,
         height: height,
       );
-      log('OAuthCubit: OAuth verification confirmed successfully, token received');
-      TokenStorage.saveTokenInStorage(response.token);
+      log(
+        'OAuthCubit: OAuth verification confirmed successfully, token received',
+      );
+      await TokenStorage.saveTokenInStorage(response.token);
+      await sessionLifecycleService.onAuthenticated();
       emit(OAuthState.loaded(token: response.token));
     } catch (e, st) {
       await reportFrom(e, st, this);
@@ -212,4 +254,3 @@ class OAuthCubit extends Cubit<OAuthState> with RegistrationDateCacheMixin {
     }
   }
 }
-

lib/features/auth/presentation/pages/auth_screen.dart

@@ -4,12 +4,10 @@ import 'package:eatvio_app/app_keys.dart';
 import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/app_router.dart';
 import 'package:eatvio_app/core/const.dart';
-import 'package:eatvio_app/core/firebase_api.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/core/utils/image_constant.dart';
 import 'package:eatvio_app/core/utils/toasts.dart';
-import 'package:eatvio_app/core/websockets/ws_manager.dart';
 import 'package:eatvio_app/core/widgets/custom_divider.dart';
 import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:eatvio_app/features/auth/presentation/bloc/auth_cubit/auth_cubit.dart';
@@ -18,8 +16,6 @@ import 'package:eatvio_app/features/auth/presentation/bloc/oauth_cubit/oauth_cub
 import 'package:eatvio_app/features/auth/presentation/bloc/oauth_cubit/oauth_state.dart';
 import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
 import 'package:eatvio_app/core/di/cubit_registrations.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/dev_tools/presentation/dev_tools_screen.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/cupertino.dart';
@@ -68,23 +64,8 @@ class _AuthScreenState extends State<AuthScreen> {
     super.dispose();
   }
 
-  Future<void> _reconnectWebSocket(BuildContext context) async {
-    try {
-      await sl<WsManager>().clear();
-      await sl<WsManager>().initialize();
-    } catch (e) {
-      rethrow;
-    }
-    if (context.mounted) {
-      try {
-        await sl<ProfileAvatarCubit>().getMyProfile();
-        await sl<ChatsCubit>().getChatRoomsWithLoading();
-        await sl<FirebaseApi>().registerPushToken();
-        showSuccessToast('Успешный вход');
-      } catch (e) {
-        rethrow;
-      }
-    }
+  Future<void> _reconnectWebSocket() async {
+    showSuccessToast('Успешный вход');
     AppRouter.navigatorKey.currentContext?.go('/feed-screen', extra: {'needToInitializeWebSocket': false});
   }
 
@@ -202,18 +183,7 @@ class _AuthScreenState extends State<AuthScreen> {
   }
 
   Future<void> _reconnectAfterAuth() async {
-    final context = AppRouter.navigatorKey.currentContext;
-    if (context == null) return;
-    try {
-      await sl<WsManager>().clear();
-      await sl<WsManager>().initialize();
-      await sl<ProfileAvatarCubit>().getMyProfile();
-      await sl<ChatsCubit>().getChatRoomsWithLoading();
-      await sl<FirebaseApi>().registerPushToken();
-      showSuccessToast('Успешный вход');
-    } catch (e) {
-      log(e.toString());
-    }
+    showSuccessToast('Успешный вход');
     AppRouter.navigatorKey.currentContext?.go('/feed-screen', extra: {'needToInitializeWebSocket': false});
   }
 
@@ -395,7 +365,7 @@ class _AuthScreenState extends State<AuthScreen> {
                                     final isAuthenticated = await authCubit.getTokenByCredentials(emailController.text, passwordController.text);
                                     if (isAuthenticated) {
                                       if (context.mounted) {
-                                        await _reconnectWebSocket(context);
+                                        await _reconnectWebSocket();
                                       }
                                     }
                                     setState(() {

lib/features/auth/presentation/pages/register_via_social_screen.dart

@@ -9,11 +9,7 @@ import 'package:eatvio_app/features/auth/presentation/bloc/oauth_cubit/oauth_sta
 import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
 import 'package:eatvio_app/core/app_router.dart';
 import 'package:eatvio_app/core/locator_service.dart';
-import 'package:eatvio_app/core/websockets/ws_manager.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/create_diet/presentation/widgets/error_widget.dart';
-import 'package:eatvio_app/core/firebase_api.dart';
 import 'package:eatvio_app/core/utils/toasts.dart';
 import 'package:eatvio_app/core/utils/validation_utils.dart';
 import 'package:flutter/gestures.dart';
@@ -62,23 +58,8 @@ class _RegisterViaSocialScreenState extends State<RegisterViaSocialScreen> {
     _initializeFieldsFromAuthResult();
   }
 
-  Future<void> _reconnectWebSocket(BuildContext context) async {
-    try {
-      await sl<WsManager>().clear();
-      await sl<WsManager>().initialize();
-    } catch (e) {
-      rethrow;
-    }
-    if (context.mounted) {
-      try {
-        await sl<ProfileAvatarCubit>().getMyProfile();
-        await sl<ChatsCubit>().getChatRoomsWithLoading();
-        await sl<FirebaseApi>().registerPushToken();
-        showSuccessToast('Успешная регистрация');
-      } catch (e) {
-        rethrow;
-      }
-    }
+  Future<void> _reconnectWebSocket() async {
+    showSuccessToast('Успешная регистрация');
     AppRouter.appRouter.go('/feed-screen', extra: {'needToInitializeWebSocket': false});
   }
 
@@ -451,7 +432,7 @@ class _RegisterViaSocialScreenState extends State<RegisterViaSocialScreen> {
                     Builder(
                       builder: (context) {
                         WidgetsBinding.instance.addPostFrameCallback((_) {
-                          _reconnectWebSocket(context);
+                          _reconnectWebSocket();
                         });
                         return const SizedBox.shrink();
                       },
@@ -795,7 +776,7 @@ class _RegisterViaSocialScreenState extends State<RegisterViaSocialScreen> {
 
       // Перезагружаем веб-сокет и переходим на главный экран
       if (widgetContext.mounted) {
-        _reconnectWebSocket(widgetContext);
+        _reconnectWebSocket();
       }
     } catch (e, stackTrace) {
       log('OAuth Verification Confirm Error: $e', error: e, stackTrace: stackTrace);

lib/features/auth/presentation/pages/scan_qr_code_screen.dart

@@ -3,13 +3,10 @@ import 'dart:io';
 import 'package:dio/dio.dart';
 import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/app_router.dart';
-import 'package:eatvio_app/core/firebase_api.dart';
 import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/session/session_lifecycle_service.dart';
 import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/core/utils/toasts.dart';
-import 'package:eatvio_app/core/websockets/ws_manager.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:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:qr_code_scanner_plus/qr_code_scanner_plus.dart';
@@ -39,7 +36,10 @@ class _ScanQRCodeScreenState extends State<ScanQRCodeScreen> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: const Text('Сканирование QR-кода'), centerTitle: true),
+      appBar: AppBar(
+        title: const Text('Сканирование QR-кода'),
+        centerTitle: true,
+      ),
       body: Column(
         children: <Widget>[
           Expanded(
@@ -60,30 +60,33 @@ class _ScanQRCodeScreenState extends State<ScanQRCodeScreen> {
       try {
         final scannedUrl = scanData.code;
         final uri = Uri.parse(scannedUrl ?? '');
-        final scannedBaseUrl = (uri.hasAuthority) ? '${uri.scheme}://${uri.host}' : '';
+        final scannedBaseUrl = (uri.hasAuthority)
+            ? '${uri.scheme}://${uri.host}'
+            : '';
         sl<AppConfig>().setBaseUrl(scannedBaseUrl);
         sl<Dio>().options.baseUrl = scannedBaseUrl;
-        final response = await Dio().getUri(uri, options: Options(headers: {'accept': 'application/json', 'content-type': 'application/json'}));
+        final response = await Dio().getUri(
+          uri,
+          options: Options(
+            headers: {
+              'accept': 'application/json',
+              'content-type': 'application/json',
+            },
+          ),
+        );
         final token = response.data['token'];
         await TokenStorage.saveTokenInStorage(token);
-        try {
-          await sl<WsManager>().clear();
-          await sl<WsManager>().initialize();
-        } catch (e) {
-          rethrow;
-        }
-        try {
-          await sl<ProfileAvatarCubit>().getMyProfile();
-          await sl<ChatsCubit>().getChatRoomsWithLoading();
-          await sl<FirebaseApi>().registerPushToken();
-        } catch (e) {
-          rethrow;
-        }
-        AppRouter.navigatorKey.currentContext?.go('/feed-screen', extra: {'needToInitializeWebSocket': false});
+        await sl<SessionLifecycleService>().onAuthenticated();
+        AppRouter.navigatorKey.currentContext?.go(
+          '/feed-screen',
+          extra: {'needToInitializeWebSocket': false},
+        );
         showSuccessToast('Добро пожаловать!');
       } catch (e) {
         await controller.resumeCamera();
-        showErrorToast('Что-то пошло не так. Попробуйте обновить страницу с QR-кодом или войдите с помощью логина и пароля.');
+        showErrorToast(
+          'Что-то пошло не так. Попробуйте обновить страницу с QR-кодом или войдите с помощью логина и пароля.',
+        );
       }
     });
   }

lib/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_cubit.dart

@@ -6,6 +6,13 @@ class NewMessagesCubit extends Cubit<NewMessagesState> {
 
   NewMessagesCubit() : super(const NewMessagesState.empty());
 
+  void reset() {
+    _messagesCount = 0;
+    if (!isClosed) {
+      emit(const NewMessagesState.empty());
+    }
+  }
+
   void incrementCounter() {
     _messagesCount++;
     emit(NewMessagesState.loaded(messagesCount: _messagesCount));

lib/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart

@@ -1,18 +1,22 @@
 import 'dart:async';
 
 import 'package:appmetrica_plugin/appmetrica_plugin.dart';
-import 'package:eatvio_app/core/app_router.dart';
+import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_state.dart';
 import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:eatvio_app/core/error_reporting/report_from.dart';
-import 'package:go_router/go_router.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 class ProfileAvatarCubit extends Cubit<ProfileAvatarState> {
   final ProfileRepository profileRepository;
 
-  ProfileAvatarCubit({required this.profileRepository}) : super(const ProfileAvatarState.loading());
+  ProfileAvatarCubit({required this.profileRepository})
+    : super(const ProfileAvatarState.loading());
+
+  int _requestId = 0;
+  int? _sessionFingerprint;
+  bool _ensuring = false;
 
   int _calculateAge(String birthdate) {
     try {
@@ -25,7 +29,8 @@ class ProfileAvatarCubit extends Cubit<ProfileAvatarState> {
         final now = DateTime.now();
         int age = now.year - birthYear;
 
-        if (now.month < birthMonth || (now.month == birthMonth && now.day < birthDay)) {
+        if (now.month < birthMonth ||
+            (now.month == birthMonth && now.day < birthDay)) {
           age--;
         }
 
@@ -38,30 +43,82 @@ class ProfileAvatarCubit extends Cubit<ProfileAvatarState> {
     return 0;
   }
 
+  void reset() {
+    _requestId++;
+    _sessionFingerprint = null;
+    unawaited(AppMetrica.setUserProfileID(null).catchError((Object _) {}));
+    if (!isClosed) emit(const ProfileAvatarState.loading());
+  }
+
+  Future<void> ensureFreshForCurrentSession() async {
+    final token = await TokenStorage.getTokenFromStorage();
+    if (token == null || token.isEmpty) {
+      reset();
+      return;
+    }
+
+    final fingerprint = token.hashCode;
+    if (_sessionFingerprint == fingerprint &&
+        state is ProfileAvatarStateLoaded) {
+      return;
+    }
+
+    if (_ensuring) {
+      return;
+    }
+
+    _ensuring = true;
+    try {
+      await getMyProfile();
+    } finally {
+      _ensuring = false;
+    }
+  }
+
   Future<void> getMyProfile() async {
+    final requestId = ++_requestId;
+    final token = await TokenStorage.getTokenFromStorage();
+    final fingerprint = token?.hashCode;
+    if (isClosed || requestId != _requestId) return;
+
     emit(const ProfileAvatarState.loading());
     try {
       final profile = await profileRepository.getMyProfile();
+      if (isClosed || requestId != _requestId) return;
+
       final profileDetails = await profileRepository.getMyProfileDetails();
+      if (isClosed || requestId != _requestId) return;
+
+      _sessionFingerprint = fingerprint;
       emit(ProfileAvatarState.loaded(profile: profile));
+
       try {
         final notificationStatus = await Permission.notification.status;
+        if (isClosed || requestId != _requestId) return;
         final isNotificationEnabled = notificationStatus.isGranted;
         AppMetricaUserProfile userProfile = AppMetricaUserProfile([
           AppMetricaNameAttribute.withValue(profile.name),
-          AppMetricaGenderAttribute.withValue(profileDetails.gender == 'male' ? AppMetricaGender.male : AppMetricaGender.female),
-          AppMetricaBirthDateAttribute.withAge(_calculateAge(profileDetails.birthdate)),
-          AppMetricaNotificationEnabledAttribute.withValue(isNotificationEnabled),
+          AppMetricaGenderAttribute.withValue(
+            profileDetails.gender == 'male'
+                ? AppMetricaGender.male
+                : AppMetricaGender.female,
+          ),
+          AppMetricaBirthDateAttribute.withAge(
+            _calculateAge(profileDetails.birthdate),
+          ),
+          AppMetricaNotificationEnabledAttribute.withValue(
+            isNotificationEnabled,
+          ),
         ]);
         AppMetrica.setUserProfileID(profile.slug);
         AppMetrica.reportUserProfile(userProfile);
       } catch (e, st) {
         await reportFrom(e, st, this);
-        // Игнорируем ошибки плагинов, профиль уже загружен
       }
     } catch (e, st) {
+      if (isClosed || requestId != _requestId) return;
       await reportFrom(e, st, this);
-      AppRouter.navigatorKey.currentContext?.go('/auth-screen');
+      if (isClosed || requestId != _requestId) return;
       emit(ProfileAvatarState.error(errorMessage: e.toString()));
     }
   }

lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart

@@ -39,6 +39,8 @@ class BottomNavigationBarWidget extends StatefulWidget {
 class _BottomNavigationBarWidgetState extends State<BottomNavigationBarWidget> {
   int currentBottomNavBarIndex = 1;
   List<String>? pages;
+  int? _pagesProfileId;
+  bool? _pagesIsConsultant;
   int tapsCount = 0;
 
   List<String> _getPages(bool isConsultant) {
@@ -179,7 +181,16 @@ class _BottomNavigationBarWidgetState extends State<BottomNavigationBarWidget> {
           final isConsultant = profileModel.roles.contains('consultant');
 
           // Инициализируем pages на основе profileModel
-          pages ??= _getPages(isConsultant);
+          if (pages == null ||
+              _pagesProfileId != profileModel.id ||
+              _pagesIsConsultant != isConsultant) {
+            _pagesProfileId = profileModel.id;
+            _pagesIsConsultant = isConsultant;
+            pages = _getPages(isConsultant);
+            if (currentBottomNavBarIndex >= pages!.length) {
+              currentBottomNavBarIndex = 0;
+            }
+          }
 
           // Expose tab switching to descendants (e.g. notification widget)
           final controller = BottomNavScope.maybeOf(context);

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

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:developer';
 
+import 'package:eatvio_app/core/device/device_hw_id_provider.dart';
 import 'package:eatvio_app/core/enums/base_state.dart';
 import 'package:eatvio_app/core/websockets/ws_manager.dart';
 import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
@@ -10,7 +11,9 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_sta
 import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
 import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
 import 'package:eatvio_app/features/video_calls/services/video_call_chat_signal.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_end_reason.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_socket_signal.dart';
 import 'package:eatvio_app/features/video_calls/services/video_call_incoming_push_presenter.dart';
 import 'package:eatvio_app/features/video_calls/services/video_call_push_payload.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -23,11 +26,19 @@ class ChatsCubit extends Cubit<ChatsState> {
   StreamSubscription? newIncomingMessagesSubscription;
   StreamSubscription? newLastMessageSubscription;
   StreamSubscription<void>? reconnectedSubscription;
+  StreamSubscription? videoCallDeclinedSubscription;
+  StreamSubscription? videoCallEndedSubscription;
+  StreamSubscription? videoCallAcceptedSubscription;
   final Set<int> _presentedVideoCallMessageIds = {};
 
   /// Test seam. Production uses CallKit.
   Future<void> Function(VideoCallPushPayload payload)? presentIncomingVideoCall;
-  Future<void> Function()? dismissIncomingVideoCall;
+
+  /// Test seam. Production reads [DeviceHwIdProvider.current].
+  Future<String?> Function()? currentDeviceHwId;
+  Future<void> Function(String? conversationUuid)? dismissIncomingVideoCall;
+  Future<void> Function({String? conversationUuid, String? callId})?
+  endActiveVideoCall;
 
   ChatsCubit({
     required this.chatRepository,
@@ -46,6 +57,17 @@ class ChatsCubit extends Cubit<ChatsState> {
   int page = 1;
   late int lastPage;
 
+  /// Clears all user-scoped state. WS subscriptions stay intact so that
+  /// `getChatRoomsWithLoading` can re-load the new user's chats.
+  void reset() {
+    _query = null;
+    page = 1;
+    lastPage = 1;
+    if (!isClosed) {
+      emit(ChatsState());
+    }
+  }
+
   Future<void> connectToWebSocket() async {
     try {
       await newIncomingMessagesSubscription?.cancel();
@@ -55,6 +77,37 @@ class ChatsCubit extends Cubit<ChatsState> {
         _handleNewMessageViaSocket(event.data);
       });
 
+      await videoCallDeclinedSubscription?.cancel();
+      videoCallDeclinedSubscription = wsManager.videoCallDeclinedStream?.listen(
+        (event) {
+          unawaited(
+            _closeCallFromSocket(
+              VideoCallSocketSignal.tryParseDeclined(event.data),
+            ),
+          );
+        },
+      );
+
+      await videoCallEndedSubscription?.cancel();
+      videoCallEndedSubscription = wsManager.videoCallEndedStream?.listen((
+        event,
+      ) {
+        unawaited(
+          _closeCallFromSocket(VideoCallSocketSignal.tryParseEnded(event.data)),
+        );
+      });
+
+      await videoCallAcceptedSubscription?.cancel();
+      videoCallAcceptedSubscription = wsManager.videoCallAcceptedStream?.listen(
+        (event) {
+          unawaited(
+            _closeCallFromSocket(
+              VideoCallSocketSignal.tryParseEnded(event.data),
+            ),
+          );
+        },
+      );
+
       await reconnectedSubscription?.cancel();
       reconnectedSubscription = wsManager.reconnected.listen((_) {
         unawaited(getChatRooms());
@@ -170,6 +223,7 @@ class ChatsCubit extends Cubit<ChatsState> {
     try {
       final json = jsonDecode(data) as Map<String, dynamic>;
       final message = ChatMessageModel.fromJson(json);
+      final callId = _stringField(json, const ['call_id', 'callId']);
 
       final currentUserId = wsManager.userId;
       final isOwn = currentUserId != null && message.authorId == currentUserId;
@@ -217,6 +271,7 @@ class ChatsCubit extends Cubit<ChatsState> {
         message,
         isOwn: isOwn,
         chatRooms: currentChatRooms,
+        callId: callId,
       );
     } catch (e, st) {
       await reportFrom(e, st, this);
@@ -227,12 +282,15 @@ class ChatsCubit extends Cubit<ChatsState> {
     ChatMessageModel message, {
     required bool isOwn,
     required List<ChatRoom> chatRooms,
+    String? callId,
   }) {
     final kind = VideoCallChatSignal.kindOf(message);
     if (kind == VideoCallChatSignalKind.ended) {
-      unawaited(_dismissIncomingVideoCallUi());
+      unawaited(_dismissIncomingVideoCallUi(message.roomId));
       unawaited(
-        VideoCallEndedPushHandler.endActiveCallIfMatches(message.roomId),
+        VideoCallEndedPushHandler.endActiveCallIfMatches(
+          conversationUuid: message.roomId,
+        ),
       );
       return;
     }
@@ -246,6 +304,7 @@ class ChatsCubit extends Cubit<ChatsState> {
       message: message,
       callerName: caller?.name,
       callerAvatarUrl: caller?.profilePhotoUrl,
+      callId: callId,
     );
     if (payload == null) return;
     unawaited(_showIncomingVideoCall(payload));
@@ -260,10 +319,45 @@ class ChatsCubit extends Cubit<ChatsState> {
     }
   }
 
-  Future<void> _dismissIncomingVideoCallUi() async {
+  Future<void> _closeCallFromSocket(VideoCallSocketSignal? signal) async {
+    if (signal == null) return;
+    if (await _acceptedOnThisDevice(signal)) return;
+    if (signal.endsActiveCall) {
+      final endActive = endActiveVideoCall;
+      if (endActive != null) {
+        await endActive(
+          conversationUuid: signal.conversationUuid,
+          callId: signal.callId,
+        );
+      } else {
+        await VideoCallEndedPushHandler.endActiveCallIfMatches(
+          conversationUuid: signal.conversationUuid,
+          callId: signal.callId,
+        );
+      }
+    }
+    final dismiss = dismissIncomingVideoCall;
+    if (dismiss != null) {
+      await dismiss(signal.conversationUuid);
+      return;
+    }
+    await VideoCallEndedPushHandler.dismissIncomingCallUi(
+      conversationUuid: signal.conversationUuid,
+      callId: signal.callId,
+      reason: signal.reason,
+    );
+  }
+
+  Future<void> _dismissIncomingVideoCallUi(String? conversationUuid) async {
     try {
-      await (dismissIncomingVideoCall ??
-          VideoCallEndedPushHandler.dismissIncomingCallUi)();
+      final dismiss = dismissIncomingVideoCall;
+      if (dismiss != null) {
+        await dismiss(conversationUuid);
+        return;
+      }
+      await VideoCallEndedPushHandler.dismissIncomingCallUi(
+        conversationUuid: conversationUuid,
+      );
     } catch (e, st) {
       log(
         'ChatsCubit: failed to dismiss incoming video call: $e',
@@ -272,6 +366,34 @@ class ChatsCubit extends Cubit<ChatsState> {
     }
   }
 
+  /// `video-call-accepted` also reaches the device that just answered.
+  /// Closing CallKit there hangs up the call that is starting.
+  Future<bool> _acceptedOnThisDevice(VideoCallSocketSignal signal) async {
+    if (signal.reason != VideoCallEndReason.accepted) return false;
+    final acceptedId = signal.acceptedDeviceId?.trim();
+    if (acceptedId == null || acceptedId.isEmpty) return false;
+    try {
+      final current =
+          (await (currentDeviceHwId ?? DeviceHwIdProvider.current)())?.trim();
+      if (current == null || current.isEmpty) return false;
+      return current.toLowerCase() == acceptedId.toLowerCase();
+    } catch (e, st) {
+      log(
+        'ChatsCubit: failed to read hw id for accepted call: $e',
+        stackTrace: st,
+      );
+      return false;
+    }
+  }
+
+  String? _stringField(Map<String, dynamic> json, List<String> keys) {
+    for (final key in keys) {
+      final value = json[key];
+      if (value is String && value.trim().isNotEmpty) return value.trim();
+    }
+    return null;
+  }
+
   ChatUser? _callerFromRooms(
     ChatMessageModel message,
     List<ChatRoom> chatRooms,
@@ -300,6 +422,9 @@ class ChatsCubit extends Cubit<ChatsState> {
   @override
   Future<void> close() {
     newIncomingMessagesSubscription?.cancel();
+    videoCallDeclinedSubscription?.cancel();
+    videoCallEndedSubscription?.cancel();
+    videoCallAcceptedSubscription?.cancel();
     reconnectedSubscription?.cancel();
     return super.close();
   }

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

@@ -30,6 +30,7 @@ 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/managers/video_call_manager.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';
@@ -1009,6 +1010,7 @@ class _ChatScreenState extends State<ChatScreen> {
     ChatRoomStateLoaded state,
     ChatUserModel chatCounterpart,
   ) {
+    sl<VideoCallManager>().permitParticipantTokenRequest();
     GoRouter.of(context).pushNamed(
       VideoCallScreen.name,
       extra: <String, dynamic>{

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

@@ -135,9 +135,9 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
                             textEditingController.clear();
                           });
                         }
-                        final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.user.slug);
-                        if (context.mounted) {
-                          AppRouter.navigatorKey.currentContext?.pushReplacementNamed('chatScreen', extra: {'uuid': chatIdOrError});
+                        final chatId = await sl<ChatRepository>().getChatByUserSlug(widget.user.slug);
+                        if (chatId != null && chatId.isNotEmpty && context.mounted) {
+                          AppRouter.navigatorKey.currentContext?.pushReplacementNamed('chatScreen', extra: {'uuid': chatId});
                         }
                       }
                     },
@@ -189,9 +189,9 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
               if (images.isNotEmpty) {
                 List<File> files = images.map((image) => File(image.path)).toList();
                 await sl<ChatRepository>().sendMessage(files: files, slug: widget.user.slug);
-                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.user.slug);
-                if (mounted) {
-                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed('chatScreen', extra: {'uuid': chatIdOrError});
+                final chatId = await sl<ChatRepository>().getChatByUserSlug(widget.user.slug);
+                if (chatId != null && chatId.isNotEmpty && mounted) {
+                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed('chatScreen', extra: {'uuid': chatId});
                 }
               }
             },
@@ -205,9 +205,9 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
               if (images.isNotEmpty) {
                 List<File> files = images.map((image) => File(image.path)).toList();
                 await sl<ChatRepository>().sendMessage(files: files, slug: widget.user.slug);
-                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.user.slug);
-                if (mounted) {
-                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed('chatScreen', extra: {'uuid': chatIdOrError});
+                final chatId = await sl<ChatRepository>().getChatByUserSlug(widget.user.slug);
+                if (chatId != null && chatId.isNotEmpty && mounted) {
+                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed('chatScreen', extra: {'uuid': chatId});
                 }
               }
             },
@@ -243,9 +243,9 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
               if (result != null) {
                 List<File> files = result.paths.map((path) => File(path!)).toList();
                 await sl<ChatRepository>().sendMessage(files: files, slug: widget.user.slug);
-                final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.user.slug);
-                if (mounted) {
-                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed('chatScreen', extra: {'uuid': chatIdOrError});
+                final chatId = await sl<ChatRepository>().getChatByUserSlug(widget.user.slug);
+                if (chatId != null && chatId.isNotEmpty && mounted) {
+                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed('chatScreen', extra: {'uuid': chatId});
                 }
               }
             },

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

@@ -106,7 +106,11 @@ class _NotificationBannerState extends State<NotificationBanner> {
                             onTap: () {
                               final planId = (context.read<ChatRoomCubit>().state as ChatRoomStateLoaded).chatRoom.chosenPlan?.id;
                               if (planId != null) {
-                                showConsultationPaymentFlow(context, planId: planId);
+                                showConsultationPaymentFlow(
+                                  context,
+                                  planId: planId,
+                                  amount: widget.planPrice,
+                                );
                               }
                             },
                             child: Text(s.pay, style: TextStyles.textLSemibold.copyWith(color: appTheme.blueA400)),

lib/features/chat/repositories/chat_repository.dart

@@ -137,11 +137,12 @@ class ChatRepository {
 
   }
 
-  Future<String> getChatByUserSlug(String slug) async {
+  Future<String?> getChatByUserSlug(String slug) async {
     final response = await chatService.getChatByUserSlug(slug: slug);
-    if (response.response.statusCode == 404) {
-      return '404';
+    final data = response.data;
+    if (data is Map && data['id'] is String && (data['id'] as String).isNotEmpty) {
+      return data['id'] as String;
     }
-    return response.data['id'];
+    return null;
   }
 }

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

@@ -14,6 +14,8 @@ class BecomeConsultantScreen extends StatefulWidget {
 class _BecomeConsultantScreenState extends State<BecomeConsultantScreen> {
   @override
   Widget build(BuildContext context) {
+    final bottomInset = MediaQuery.paddingOf(context).bottom;
+
     return Scaffold(
       appBar: AppBar(
         title: const Text('Стать консультантом'),
@@ -24,14 +26,18 @@ class _BecomeConsultantScreenState extends State<BecomeConsultantScreen> {
           icon: const Icon(Icons.close),
         ),
       ),
-      body: const Padding(
-        padding: EdgeInsets.all(16),
-        child: Text(
+      body: SingleChildScrollView(
+        physics: const BouncingScrollPhysics(),
+        padding: EdgeInsets.fromLTRB(16, 16, 16, 16 + 52 + 8 + bottomInset),
+        child: const Text(
           'Чтобы стать консультантом необходимо пройти короткую регистрацию. Подготовьте свои дипломы и/или сертификаты в формате jpg, они Вам пригодятся для проверки и подтверждения. Также необходимо будет указать ссылки на Ваши соц. сети и указать тип лица (физ. лицо или юр. лицо). На данный момент доступна регистрация в качестве физ. лица.\n\nВнутри Итвио разница между обычным пользователем и консультантом заключается в дополнительных возможностях последнего создавать публичные диеты, рецепты и планы питания; участвовать в ежемесячных рейтингах.',
           style: TextStyle(fontSize: 16),
         ),
       ),
-      bottomSheet: _startRegistrationButton(),
+      bottomSheet: Padding(
+        padding: EdgeInsets.fromLTRB(16, 0, 16, 8 + bottomInset),
+        child: _startRegistrationButton(),
+      ),
     );
   }
 
@@ -44,7 +50,7 @@ class _BecomeConsultantScreenState extends State<BecomeConsultantScreen> {
       borderRadius: BorderRadius.circular(20),
       child: Ink(
         height: 52,
-        width: MediaQuery.of(context).size.width - 32,
+        width: double.infinity,
         decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(20),
           color: appTheme.blueA400,

lib/features/consultations/models/consultation_model.dart

@@ -9,6 +9,7 @@ part 'consultation_model.g.dart';
 abstract class ConsultationModel with _$ConsultationModel {
   factory ConsultationModel({
     required int id,
+    @JsonKey(name: 'chat_id') String? chatId,
     @JsonKey(name: 'last_state') required ChosenPlanStateEnum chosenPlanState,
     @JsonKey(name: 'plan_title') required String planTitle,
     @JsonKey(name: 'user_name') required String userName,

lib/features/consultations/presentation/cubit/consultations_cubit.dart

@@ -1,6 +1,7 @@
 import 'dart:developer';
 
 import 'package:eatvio_app/core/enums/base_state.dart';
+import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
 import 'package:eatvio_app/features/consultations/presentation/cubit/consultations_state.dart';
 import 'package:eatvio_app/features/consultations/repositories/consultations_repository.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -8,7 +9,8 @@ import 'package:eatvio_app/core/error_reporting/report_from.dart';
 
 class ConsultationsCubit extends Cubit<ConsultationsState> {
   final ConsultationsRepository consultationsRepository;
-  ConsultationsCubit({required this.consultationsRepository}) : super(ConsultationsState());
+  final ChatRepository chatRepository;
+  ConsultationsCubit({required this.consultationsRepository, required this.chatRepository}) : super(ConsultationsState());
 
   Future<void> loadConsultations() async {
     try {
@@ -20,4 +22,14 @@ class ConsultationsCubit extends Cubit<ConsultationsState> {
       emit(state.copyWith(state: BaseState.error));
     }
   }
+
+  Future<String?> getChatIdByUserSlug(String slug) async {
+    try {
+      return await chatRepository.getChatByUserSlug(slug);
+    } catch (e, st) {
+      await reportFrom(e, st, this);
+      log(e.toString(), stackTrace: st);
+      return null;
+    }
+  }
 }

lib/features/consultations/presentation/widgets/consultation_card_widget.dart

@@ -3,14 +3,17 @@ import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/core/widgets/custom_divider.dart';
 import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
+import 'package:eatvio_app/core/utils/toasts.dart';
 import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
 import 'package:eatvio_app/features/consultations/models/consultation_model.dart';
+import 'package:eatvio_app/features/consultations/presentation/cubit/consultations_cubit.dart';
 import 'package:eatvio_app/features/diary/presentation/pages/diary_screen.dart';
 import 'package:eatvio_app/features/my_finance/presentation/pages/card_settings.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/generated/l10n.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
 
 class ConsultationCardWidget extends StatefulWidget {
@@ -34,6 +37,7 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
   final List<Color> legendColors = const [Colors.white, Color(0xFFF0C497), Color(0xFFFF9500), Color(0xFF2F80ED), Color(0xFF4CD964)];
 
   late final List<(int, DiaryModel)> givenDaysWithDayNumber;
+  bool _isOpeningChat = false;
   final List<List<DiaryStateEnum>> legendStates = [
     [DiaryStateEnum.init],
     [DiaryStateEnum.started, DiaryStateEnum.lastDayStarted],
@@ -279,7 +283,7 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
                 const SizedBox(width: 8),
                 InkWell(
                   borderRadius: BorderRadius.circular(20),
-                  onTap: () {},
+                  onTap: _isOpeningChat ? null : _openChat,
                   child: Ink(
                     height: 52,
                     width: 52,
@@ -308,6 +312,22 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
     );
   }
 
+  Future<void> _openChat() async {
+    if (_isOpeningChat) return;
+    setState(() => _isOpeningChat = true);
+    var chatId = widget.consultationsModel.chatId;
+    if (chatId == null || chatId.isEmpty) {
+      chatId = await context.read<ConsultationsCubit>().getChatIdByUserSlug(widget.consultationsModel.userSlug);
+    }
+    if (!mounted) return;
+    setState(() => _isOpeningChat = false);
+    if (chatId == null || chatId.isEmpty) {
+      showErrorToast(S.of(context).msg_something_went_wrong);
+      return;
+    }
+    GoRouter.of(context).pushNamed('chatScreen', extra: {'uuid': chatId});
+  }
+
   Row _legendTitle(String text, Color color) {
     return Row(
       crossAxisAlignment: CrossAxisAlignment.start,

lib/features/diary/models/diary_day_model.dart

@@ -18,8 +18,13 @@ enum PortionState {
   @JsonValue('eaten_edited')
   eatenEdited,
   commented,
+  @JsonValue('commented_from_diet')
+  commentedFromDiet,
   @JsonValue('reviewed_by_user')
   reviewedByUser,
+  @JsonValue('reviewed_from_diet')
+  reviewedFromDiet,
+  unknown,
 }
 
 @freezed
@@ -138,7 +143,7 @@ abstract class PortionModel with _$PortionModel {
     @JsonKey(name: "quantity") required int quantity,
     @JsonKey(name: "portion") required String portion,
     @JsonKey(name: "from_diet") required bool fromDiet,
-    @JsonKey(name: "state") required PortionState portionState,
+    @JsonKey(name: "state", unknownEnumValue: PortionState.unknown) required PortionState portionState,
   }) = _PortionModel;
 
   factory PortionModel.fromJson(Map<String, dynamic> json) => _$PortionModelFromJson(json);

lib/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart

@@ -12,9 +12,19 @@ class FeedCubit extends Cubit<FeedState> {
   bool _hasMore = true;
   bool isLoading = false;
   String? _query;
+  int _requestId = 0;
 
   FeedCubit({required this.feedRepository}) : super(const FeedState.loading());
 
+  void reset() {
+    _requestId++;
+    _nextCursor = null;
+    _hasMore = true;
+    isLoading = false;
+    _query = null;
+    if (!isClosed) emit(const FeedState.loading());
+  }
+
   void updateFeedBlogPostList(FeedBlogPostModel? feedBlogPostModel, bool wasLikedByMe) {
     if (feedBlogPostModel == null || isClosed || state is! FeedStateLoaded) return;
     final List<FeedBlogPostModel> feedBlogPostList = [...(state as FeedStateLoaded).feedBlogPostList];
@@ -39,17 +49,18 @@ class FeedCubit extends Cubit<FeedState> {
   }
 
   Future<void> loadFeedBlogPostList({String? query, int? currentUserId}) async {
+    final requestId = ++_requestId;
     try {
       _query = query;
       _nextCursor = null;
       _hasMore = true;
       final feed = await feedRepository.getFeed(search: query, currentUserId: currentUserId);
+      if (isClosed || requestId != _requestId) return;
       _nextCursor = feed.nextCursor;
       _hasMore = _nextCursor != null;
-      if (!isClosed) {
-        emit(FeedState.loaded(feedBlogPostList: feed.posts, isLoading: false));
-      }
+      emit(FeedState.loaded(feedBlogPostList: feed.posts, isLoading: false));
     } catch (e, st) {
+      if (isClosed || requestId != _requestId) return;
       await reportFrom(e, st, this);
       if (!isClosed) {
         emit(FeedState.error(errorMessage: e.toString()));
@@ -62,14 +73,16 @@ class FeedCubit extends Cubit<FeedState> {
       return;
     }
 
+    final requestId = _requestId;
     isLoading = true;
     emit((state as FeedStateLoaded).copyWith(isLoading: true));
 
     try {
       final feed = await feedRepository.getFeed(search: _query, cursor: _nextCursor, currentUserId: currentUserId);
+      if (isClosed || requestId != _requestId) return;
       _nextCursor = feed.nextCursor;
       _hasMore = _nextCursor != null;
-      if (!isClosed && state is FeedStateLoaded) {
+      if (state is FeedStateLoaded) {
         emit(
           FeedState.loaded(
             feedBlogPostList: [...(state as FeedStateLoaded).feedBlogPostList, ...feed.posts],
@@ -78,14 +91,15 @@ class FeedCubit extends Cubit<FeedState> {
         );
       }
     } catch (e, st) {
+      if (isClosed || requestId != _requestId) return;
       await reportFrom(e, st, this);
-      if (!isClosed && state is FeedStateLoaded) {
+      if (state is FeedStateLoaded) {
         emit((state as FeedStateLoaded).copyWith(isLoading: false));
-      } else if (!isClosed) {
+      } else {
         emit(FeedState.error(errorMessage: e.toString()));
       }
     } finally {
-      isLoading = false;
+      if (requestId == _requestId) isLoading = false;
     }
   }
 

lib/features/menu/presentation/bloc/menu_cubit/menu_cubit.dart

@@ -1,5 +1,6 @@
 import 'dart:developer';
 
+import 'package:eatvio_app/core/session/session_lifecycle_service.dart';
 import 'package:eatvio_app/features/menu/presentation/bloc/menu_cubit/menu_state.dart';
 import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -7,7 +8,11 @@ import 'package:eatvio_app/core/error_reporting/report_from.dart';
 
 class MenuCubit extends Cubit<MenuState> {
   final ProfileRepository profileRepository;
-  MenuCubit(this.profileRepository) : super(const MenuState.initial());
+  final SessionLifecycleService sessionLifecycleService;
+  MenuCubit(this.profileRepository, this.sessionLifecycleService)
+    : super(const MenuState.initial());
+
+  Future<void> logout() => sessionLifecycleService.logout();
 
   Future<void> getMyProfile() async {
     emit(const MenuState.loading());
@@ -23,7 +28,10 @@ class MenuCubit extends Cubit<MenuState> {
 
   Future<String?> makePassKey() async {
     try {
-      final passKey = await profileRepository.getPassKey(routeName: 'product_nutritional_value.index', routeParams: {});
+      final passKey = await profileRepository.getPassKey(
+        routeName: 'product_nutritional_value.index',
+        routeParams: {},
+      );
       return passKey;
     } catch (e, st) {
       await reportFrom(e, st, this);

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

@@ -1,22 +1,15 @@
-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';
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
 import 'package:eatvio_app/core/widgets/data_error_widget.dart';
 import 'package:eatvio_app/core/widgets/loader.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
-import 'package:eatvio_app/core/websockets/ws_manager.dart';
 import 'package:eatvio_app/features/consultant_rating/presentation/consultant_rating_screen.dart';
 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';
@@ -155,6 +148,7 @@ class MenuScreen extends StatelessWidget {
 
   Future<Null> Function() _onTapLogout(BuildContext context) {
     return () async {
+      final menuCubit = context.read<MenuCubit>();
       showDialog(
         context: context,
         builder: (context) => CupertinoAlertDialog(
@@ -162,24 +156,8 @@ class MenuScreen extends StatelessWidget {
           actions: [
             CupertinoDialogAction(
               onPressed: () async {
-                try {
-                  await sl<Dio>().post('${sl<AppConfig>().baseUrl}/api/profile/logout');
-                } 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) {
-                    GoRouter.of(context).go('/auth-screen', extra: true);
-                  }
-                }
+                Navigator.of(context).pop();
+                await menuCubit.logout();
               },
               isDestructiveAction: true,
               child: const Text("Выйти"),

lib/features/notifications/presentation/notifications_cubit/notifications_cubit.dart

@@ -16,6 +16,11 @@ class NotificationsCubit extends Cubit<NotificationsState> {
   StreamSubscription? _newNotificationsSubscription;
   NotificationsCubit({required this.wsManager, required this.notificationsRepository}) : super(const NotificationsState.empty());
 
+  void reset() {
+    _notifications.clear();
+    if (!isClosed) emit(const NotificationsState.empty());
+  }
+
   Future<void> connectToWebSocket() async {
     try {
       await _newNotificationsSubscription?.cancel();

lib/features/payment/presentation/payment_flow.dart

@@ -14,6 +14,7 @@ import 'package:flutter/material.dart';
 Future<void> showConsultationPaymentFlow(
   BuildContext context, {
   required int planId,
+  double? amount,
   Future<bool?> Function(BuildContext)? showGate,
   Future<PromoCodeResult?> Function(
     BuildContext, {
@@ -21,7 +22,7 @@ Future<void> showConsultationPaymentFlow(
     Future<bool> Function()? onRemove,
     PromoCodeModel? initialPromo,
   })? showForm,
-  Future<void> Function(BuildContext, {required int planId})? showSbp,
+  Future<void> Function(BuildContext, {required int planId, double? amount})? showSbp,
   Future<PromoValidateResponse> Function({
     required int planId,
     required String promoCode,
@@ -65,7 +66,7 @@ Future<void> showConsultationPaymentFlow(
     }
 
     if (!context.mounted) return;
-    await sbp(context, planId: planId);
+    await sbp(context, planId: planId, amount: amount);
     return;
   }
 
@@ -92,7 +93,7 @@ Future<void> showConsultationPaymentFlow(
   }
 
   if (!context.mounted) return;
-  await sbp(context, planId: planId);
+  await sbp(context, planId: planId, amount: amount);
 }
 
 Future<bool?> _showGate(BuildContext context) {
@@ -113,8 +114,8 @@ Future<PromoCodeResult?> _showForm(
   );
 }
 
-Future<void> _showSbp(BuildContext context, {required int planId}) {
-  return showSbpBanksBottomSheet(context, planId: planId);
+Future<void> _showSbp(BuildContext context, {required int planId, double? amount}) {
+  return showSbpBanksBottomSheet(context, planId: planId, amount: amount);
 }
 
 Future<PromoValidateResponse> _defaultValidatePromo({

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

@@ -8,18 +8,23 @@ 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/features/payment/presentation/widgets/sbp_qr_bottom_sheet.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}) {
+Future<void> showSbpBanksBottomSheet(
+  BuildContext context, {
+  required int planId,
+  double? amount,
+}) {
   final height = MediaQuery.sizeOf(context).height * 0.55;
   return showBottomSheetWithBlur(
     context: context,
     height: height,
-    child: SbpBanksBottomSheet(planId: planId),
+    child: SbpBanksBottomSheet(planId: planId, amount: amount),
   );
 }
 
@@ -28,9 +33,13 @@ Future<void> showSbpBanksBottomSheet(BuildContext context, {required int planId}
 /// При открытии вызывает [ConsultationPaymentCubit.startPayment] с [planId]
 /// и показывает [Loader], пока загружаются checkout_url и список банков.
 class SbpBanksBottomSheet extends StatefulWidget {
-  const SbpBanksBottomSheet({super.key, required this.planId, this.cubit});
+  const SbpBanksBottomSheet({super.key, required this.planId, this.amount, this.cubit});
 
   final int planId;
+
+  /// Сумма к оплате в рублях — передаётся в QR-шит для отображения.
+  final double? amount;
+
   final ConsultationPaymentCubit? cubit;
 
   @override
@@ -77,6 +86,32 @@ class _SbpBanksBottomSheetState extends State<SbpBanksBottomSheet> {
               style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
               textAlign: TextAlign.center,
             ),
+            // QR-кнопка доступна сразу после получения checkout_url,
+            // не дожидаясь списка банков: на устройствах без банковских
+            // приложений (iOS в РФ) это единственный путь оплаты.
+            BlocBuilder<ConsultationPaymentCubit, ConsultationPaymentState>(
+              buildWhen: (previous, current) =>
+                  previous.checkoutUrl != current.checkoutUrl,
+              builder: (context, state) {
+                final checkoutUrl = state.checkoutUrl;
+                if (checkoutUrl == null || checkoutUrl.isEmpty) {
+                  return const SizedBox.shrink();
+                }
+                return Padding(
+                  padding: const EdgeInsets.only(top: 16),
+                  child: CustomOutlinedButton(
+                    text: s.pay_by_qr_code,
+                    height: 52,
+                    buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
+                    buttonStyle: ButtonStyle(
+                      side: const WidgetStatePropertyAll(BorderSide.none),
+                      backgroundColor: WidgetStatePropertyAll(appTheme.blueA400),
+                    ),
+                    onPressed: _onShowQrTap,
+                  ),
+                );
+              },
+            ),
             const SizedBox(height: 16),
             Expanded(
               child: BlocBuilder<ConsultationPaymentCubit, ConsultationPaymentState>(
@@ -122,6 +157,23 @@ class _SbpBanksBottomSheetState extends State<SbpBanksBottomSheet> {
     );
   }
 
+  /// Открывает QR-шит поверх шита банков; при подтверждённой оплате
+  /// закрывает и родительский шит.
+  Future<void> _onShowQrTap() async {
+    final paid = await showSbpQrBottomSheet(
+      context,
+      planId: widget.planId,
+      cubit: _cubit,
+      amount: widget.amount,
+    );
+    if (paid == true && mounted) {
+      final navigator = Navigator.of(context);
+      if (navigator.canPop()) {
+        navigator.pop();
+      }
+    }
+  }
+
   Future<void> _onBankTap(C2bmemberModel bank) async {
     final opened = await _cubit.openBank(bank: bank);
     if (opened && mounted) {

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

@@ -0,0 +1,316 @@
+import 'dart:async';
+
+import 'package:eatvio_app/core/app_config.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/features/chat/repositories/chat_repository.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:qr_flutter/qr_flutter.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+/// Тестовый симулятор оплаты СБП (только для стендов разработки/stage).
+const String _testPayUrlBase = 'https://testpay.alfabank.ru/sbp-page?qrcId=';
+const String _nspkUrlPrefix = 'https://qr.nspk.ru/';
+const Duration _pollInterval = Duration(seconds: 3);
+const Duration _autoCloseDelay = Duration(seconds: 2);
+
+/// Показывает bottom sheet с QR-кодом СБП для оплаты консультации
+/// с другого устройства.
+///
+/// Возвращает `true`, если оплата подтверждена polling-ом статуса плана.
+Future<bool?> showSbpQrBottomSheet(
+  BuildContext context, {
+  required int planId,
+  required ConsultationPaymentCubit cubit,
+  double? amount,
+}) {
+  return showBottomSheetWithBlur<bool>(
+    context: context,
+    height: null,
+    child: SbpQrBottomSheet(
+      planId: planId,
+      cubit: cubit,
+      amount: amount,
+    ),
+  );
+}
+
+/// QR-код оплаты СБП: рендерит [ConsultationPaymentState.checkoutUrl]
+/// (payload вида `https://qr.nspk.ru/{qrcId}`), ожидает оплату через
+/// polling статуса chosen_plan и показывает успех.
+class SbpQrBottomSheet extends StatefulWidget {
+  const SbpQrBottomSheet({
+    super.key,
+    required this.planId,
+    required this.cubit,
+    this.amount,
+    this.chatRepository,
+    this.pollInterval = _pollInterval,
+  });
+
+  final int planId;
+  final ConsultationPaymentCubit cubit;
+
+  /// Сумма к оплате в рублях (показывается над QR, если передана).
+  final double? amount;
+
+  /// Переопределяется в тестах; по умолчанию берётся из DI.
+  final ChatRepository? chatRepository;
+
+  final Duration pollInterval;
+
+  @override
+  State<SbpQrBottomSheet> createState() => _SbpQrBottomSheetState();
+}
+
+class _SbpQrBottomSheetState extends State<SbpQrBottomSheet> {
+  late final ChatRepository _chatRepository;
+  late final Timer _pollTimer;
+  bool _paid = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _chatRepository = widget.chatRepository ?? sl<ChatRepository>();
+    _pollTimer = Timer.periodic(widget.pollInterval, (_) => _pollStatus());
+    _pollStatus();
+  }
+
+  @override
+  void dispose() {
+    _pollTimer.cancel();
+    super.dispose();
+  }
+
+  Future<void> _pollStatus() async {
+    if (_paid || !mounted) return;
+    try {
+      final plan = await _chatRepository.getChosenPlan(id: widget.planId);
+      if (plan.chosenPlanState.isStateAfterPaidState()) {
+        _onPaid();
+      }
+    } catch (_) {
+      // Сетевые сбои polling-а игнорируем — следующий тик повторит проверку.
+    }
+  }
+
+  void _onPaid() {
+    if (_paid || !mounted) return;
+    setState(() => _paid = true);
+    Future.delayed(_autoCloseDelay, () {
+      if (!mounted) return;
+      Navigator.of(context).pop(true);
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    return BlocProvider<ConsultationPaymentCubit>.value(
+      value: widget.cubit,
+      child: BlocBuilder<ConsultationPaymentCubit, ConsultationPaymentState>(
+        builder: (context, state) {
+          final checkoutUrl = state.checkoutUrl;
+          if (checkoutUrl == null || checkoutUrl.isEmpty) {
+            return const SizedBox.shrink();
+          }
+          return SingleChildScrollView(
+            padding: const EdgeInsets.symmetric(horizontal: 16),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                const SizedBox(height: 8),
+                const BottomSheetHandlerBar(),
+                const SizedBox(height: 20),
+                Text(
+                  _paid ? s.sbp_qr_paid_title : s.sbp_qr_title,
+                  style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+                  textAlign: TextAlign.center,
+                ),
+                const SizedBox(height: 16),
+                if (_paid)
+                  _PaidContent(description: s.sbp_qr_paid_description)
+                else ...[
+                  if (widget.amount != null) ...[
+                    Text(
+                      s.sbp_qr_amount_label,
+                      style: TextStyles.textMMedium.copyWith(color: appTheme.gray600),
+                      textAlign: TextAlign.center,
+                    ),
+                    const SizedBox(height: 4),
+                    Text(
+                      '${widget.amount!.toStringAsFixed(0)} ₽',
+                      style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+                      textAlign: TextAlign.center,
+                    ),
+                    const SizedBox(height: 16),
+                  ],
+                  _QrCodeCard(checkoutUrl: checkoutUrl),
+                  const SizedBox(height: 16),
+                  _HowToPay(
+                    step1: s.sbp_qr_step1,
+                    step2: s.sbp_qr_step2,
+                    step3: s.sbp_qr_step3,
+                  ),
+                  const SizedBox(height: 16),
+                  _TestPayButton(checkoutUrl: checkoutUrl),
+                  const SizedBox(height: 16),
+                  Text(
+                    s.sbp_qr_waiting_payment,
+                    style: TextStyles.textMMedium.copyWith(color: appTheme.gray600),
+                    textAlign: TextAlign.center,
+                  ),
+                ],
+                const SizedBox(height: 24),
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
+
+class _QrCodeCard extends StatelessWidget {
+  const _QrCodeCard({required this.checkoutUrl});
+
+  final String checkoutUrl;
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Container(
+        padding: const EdgeInsets.all(12),
+        decoration: BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.circular(16),
+          border: Border.all(color: appTheme.blueGray300),
+        ),
+        child: QrImageView(
+          key: const ValueKey('sbp_qr_code'),
+          data: checkoutUrl,
+          size: 200,
+          backgroundColor: Colors.white,
+        ),
+      ),
+    );
+  }
+}
+
+class _HowToPay extends StatelessWidget {
+  const _HowToPay({required this.step1, required this.step2, required this.step3});
+
+  final String step1;
+  final String step2;
+  final String step3;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        color: appTheme.blueA400.withValues(alpha: 0.08),
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(step1, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
+          const SizedBox(height: 4),
+          Text(step2, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
+          const SizedBox(height: 4),
+          Text(step3, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
+        ],
+      ),
+    );
+  }
+}
+
+/// Кнопка открытия тестового симулятора оплаты Альфа-Банка.
+///
+/// Видна только когда QR выдан непродовым бэкендом: тестовый qrcId от
+/// продового в приложении не отличить (формат одинаковый), различает их
+/// именно то, какой бэкенд выдал checkout_url — на стендах разработки/stage
+/// Альфа подключена в sandbox и выдаёт QR тестового терминала. Поэтому
+/// критерий — текущий base URL API не продуктовый (см. [AppConfig.isProdApi]).
+class _TestPayButton extends StatelessWidget {
+  const _TestPayButton({required this.checkoutUrl});
+
+  final String checkoutUrl;
+
+  bool get _visible {
+    if (sl<AppConfig>().isProdApi) return false;
+    return checkoutUrl.startsWith(_nspkUrlPrefix);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (!_visible) return const SizedBox.shrink();
+    final s = S.of(context);
+    return Container(
+      padding: const EdgeInsets.all(12),
+      decoration: BoxDecoration(
+        color: const Color(0xFFFFF3E0),
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Column(
+        children: [
+          Text(
+            s.sbp_qr_test_hint,
+            style: TextStyles.textXSSemibold.copyWith(color: appTheme.gray600),
+            textAlign: TextAlign.center,
+          ),
+          const SizedBox(height: 8),
+          OutlinedButton(
+            onPressed: () => _openTestPayment(),
+            child: Text(s.sbp_qr_open_test_payment),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _openTestPayment() async {
+    final qrcId = checkoutUrl.replaceFirst(_nspkUrlPrefix, '');
+    final uri = Uri.parse('$_testPayUrlBase$qrcId');
+    try {
+      await launchUrl(uri, mode: LaunchMode.externalApplication);
+    } catch (_) {
+      // Не смогли открыть браузер — пользователь оплатит по QR.
+    }
+  }
+}
+
+class _PaidContent extends StatelessWidget {
+  const _PaidContent({required this.description});
+
+  final String description;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        const SizedBox(height: 8),
+        Container(
+          width: 64,
+          height: 64,
+          decoration: const BoxDecoration(color: Color(0xFFE8F5E9), shape: BoxShape.circle),
+          child: const Icon(Icons.check_rounded, color: Color(0xFF4CAF50), size: 40),
+        ),
+        const SizedBox(height: 12),
+        Text(
+          description,
+          style: TextStyles.textMMedium.copyWith(color: appTheme.gray600),
+          textAlign: TextAlign.center,
+        ),
+      ],
+    );
+  }
+}

lib/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart

@@ -22,6 +22,10 @@ class ProfileCubit extends Cubit<ProfileState> {
   /// Bottom-nav / own profile instance, used to refresh posts after create/update/delete.
   static ProfileCubit? myProfileCubit;
 
+  static void clearMyProfileReference() {
+    myProfileCubit = null;
+  }
+
   ProfileCubit({required this.profileRepository, required this.chatRepository, required this.consultantRepository}) : super(const ProfileState.loading());
 
   Future<void> getProfileBySlug(String slug) async {
@@ -141,13 +145,13 @@ class ProfileCubit extends Cubit<ProfileState> {
 
   Future<String?> getChatRoomIdBySlug({required String slug}) async {
     try {
-      final chatIdOrError = await chatRepository.getChatByUserSlug(slug);
-      final userProfile = await profileRepository.getProfileBySlug(slug);
-      if (chatIdOrError == '404') {
+      final chatId = await chatRepository.getChatByUserSlug(slug);
+      if (chatId == null || chatId.isEmpty) {
+        final userProfile = await profileRepository.getProfileBySlug(slug);
         AppRouter.navigatorKey.currentContext?.pushNamed('emptyChatScreen', extra: userProfile);
       } else {
-        AppRouter.navigatorKey.currentContext?.pushNamed('chatScreen', extra: {'uuid': chatIdOrError});
-        return chatIdOrError;
+        AppRouter.navigatorKey.currentContext?.pushNamed('chatScreen', extra: {'uuid': chatId});
+        return chatId;
       }
     } catch (e, st) {
       await reportFrom(e, st, this);

lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart

@@ -1,11 +1,9 @@
 import 'dart:developer';
 
 import 'package:eatvio_app/core/app_router.dart';
-import 'package:eatvio_app/core/firebase_api.dart';
-import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/mixins/registration_date_cache_mixin.dart';
 import 'package:eatvio_app/core/prefs.dart';
-
+import 'package:eatvio_app/core/session/session_lifecycle_service.dart';
 import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
@@ -18,7 +16,8 @@ import 'package:go_router/go_router.dart';
 
 class RegistrationCubit extends Cubit<RegistrationState> with RegistrationDateCacheMixin {
   final RegistrationRepository registrationRepository;
-  RegistrationCubit({required this.registrationRepository, required Prefs prefs})
+  final SessionLifecycleService sessionLifecycleService;
+  RegistrationCubit({required this.registrationRepository, required this.sessionLifecycleService, required Prefs prefs})
     : super(
         const RegistrationState(
           sheet: UserRegistrationSheet(
@@ -62,7 +61,7 @@ class RegistrationCubit extends Cubit<RegistrationState> with RegistrationDateCa
         state.sheet.copyWith(phone: state.sheet.phone.replaceAll(' ', '').replaceAll('(', '').replaceAll(')', ''), responseBody: '{}'),
       );
       await TokenStorage.saveTokenInStorage(token);
-      await sl<FirebaseApi>().registerPushToken();
+      await sessionLifecycleService.onAuthenticated();
       RegistrationAnalyticsService.reportRegistrationComplete();
       cacheRegistrationDate(DateTime.now());
       AppRouter.navigatorKey.currentContext?.replaceNamed('verifyEmailScreen');

lib/features/registration/presentation/pages/verify_email_screen.dart

@@ -15,7 +15,11 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
 
 class VerifyEmailScreen extends StatefulWidget {
-  const VerifyEmailScreen({super.key});
+  const VerifyEmailScreen({super.key, this.returnOnSuccess = false});
+
+  /// Вернуться на предыдущий экран вместо перехода в ленту после подтверждения.
+  /// Используется, когда экран открыт из публичного действия (пост, лайк, комментарий).
+  final bool returnOnSuccess;
 
   @override
   State<VerifyEmailScreen> createState() => _VerifyEmailScreenState();
@@ -89,7 +93,12 @@ class _VerifyEmailScreenState extends State<VerifyEmailScreen> {
                 _startTimer();
               } else if (state is VerifyEmailStateVerifySuccess) {
                 showSuccessToast('Почта успешно подтверждена');
-                goRouter.pushNamed('feedScreen');
+                if (widget.returnOnSuccess) {
+                  // Экран открыт из публичного действия — возвращаемся назад с результатом.
+                  goRouter.pop(true);
+                } else {
+                  goRouter.pushNamed('feedScreen');
+                }
               } else if (state is VerifyEmailStateVerifyError) {
                 showErrorToast("Неверный код. Попробуйте снова.");
                 for (var controller in _controllers) {
@@ -166,18 +175,20 @@ class _VerifyEmailScreenState extends State<VerifyEmailScreen> {
                         },
                       ),
                       const SizedBox(height: 16),
-                      CustomOutlinedButton(
-                        text: 'Позже',
-                        height: 52,
-                        buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.black900),
-                        buttonStyle: ButtonStyle(
-                          side: const WidgetStatePropertyAll(BorderSide.none),
-                          backgroundColor: WidgetStatePropertyAll(appTheme.gray.withValues(alpha: 0.1)),
+                      // При переходе из публичного действия уйти без подтверждения нельзя.
+                      if (!widget.returnOnSuccess)
+                        CustomOutlinedButton(
+                          text: 'Позже',
+                          height: 52,
+                          buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.black900),
+                          buttonStyle: ButtonStyle(
+                            side: const WidgetStatePropertyAll(BorderSide.none),
+                            backgroundColor: WidgetStatePropertyAll(appTheme.gray.withValues(alpha: 0.1)),
+                          ),
+                          onPressed: () {
+                            context.read<VerifyEmailCubit>().skipVerification();
+                          },
                         ),
-                        onPressed: () {
-                          context.read<VerifyEmailCubit>().skipVerification();
-                        },
-                      ),
                     ],
                   ),
                 ),

lib/features/registration_v2/cubit/registration_cubit.dart

@@ -1,6 +1,8 @@
 import 'dart:developer';
 
 import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/firebase_api.dart';
+import 'package:eatvio_app/core/session/session_lifecycle_service.dart';
 import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
 import 'package:eatvio_app/core/utils/validation_utils.dart';
@@ -13,7 +15,13 @@ import 'package:gpassword/gpassword.dart';
 
 class RegistrationCubitV2 extends Cubit<RegistrationStateV2> {
   final RegistrationRepositoryV2 registrationRepository;
-  RegistrationCubitV2({required this.registrationRepository}) : super(const RegistrationStateV2());
+  final FirebaseApi firebaseApi;
+  final SessionLifecycleService sessionLifecycleService;
+  RegistrationCubitV2({
+    required this.registrationRepository,
+    required this.firebaseApi,
+    required this.sessionLifecycleService,
+  }) : super(const RegistrationStateV2());
 
   void setFirstName(String firstName) {
     emit(state.copyWith(firstName: firstName));
@@ -194,9 +202,12 @@ class RegistrationCubitV2 extends Cubit<RegistrationStateV2> {
     bool didApiComplainOnValidation = false;
     String errorMessage = '';
     try {
-      final token = await registrationRepository.register(registrationModel: registrationModel);
+      final token = await registrationRepository.register(
+        registrationModel: registrationModel,
+      );
       if (token != null) {
-        TokenStorage.saveTokenInStorage(token);
+        await TokenStorage.saveTokenInStorage(token);
+        await sessionLifecycleService.onAuthenticated();
         emit(state.copyWith(registrationError: null));
         return (true, false);
       }
@@ -214,11 +225,21 @@ class RegistrationCubitV2 extends Cubit<RegistrationStateV2> {
         for (var error in emailErrors) {
           allErrors.add(error.toString());
           if (error.toString() == 'Некорректный формат email') {
-            emit(state.copyWith(isEmailValid: false, emailDisplayError: 'Некорректный формат email'));
+            emit(
+              state.copyWith(
+                isEmailValid: false,
+                emailDisplayError: 'Некорректный формат email',
+              ),
+            );
             didApiComplainOnValidation = true;
           }
           if (error.toString() == 'Такой Эл. почта уже существует.') {
-            emit(state.copyWith(isEmailValid: false, emailDisplayError: 'Такая Эл. почта уже существует.'));
+            emit(
+              state.copyWith(
+                isEmailValid: false,
+                emailDisplayError: 'Такая Эл. почта уже существует.',
+              ),
+            );
             didApiComplainOnValidation = true;
           }
         }
@@ -227,7 +248,12 @@ class RegistrationCubitV2 extends Cubit<RegistrationStateV2> {
         for (var error in phoneErrors) {
           allErrors.add(error.toString());
           if (error.toString() == 'Такой phone уже существует.') {
-            emit(state.copyWith(isPhoneValid: false, phoneDisplayError: 'Такой номер телефона уже существует.'));
+            emit(
+              state.copyWith(
+                isPhoneValid: false,
+                phoneDisplayError: 'Такой номер телефона уже существует.',
+              ),
+            );
             didApiComplainOnValidation = true;
           }
         }
@@ -236,7 +262,12 @@ class RegistrationCubitV2 extends Cubit<RegistrationStateV2> {
         for (var error in dateOfBirth) {
           allErrors.add(error.toString());
           if (error.toString() == 'Некорректный формат даты рождения') {
-            emit(state.copyWith(isBirthdayValid: false, dateOfBirthDisplayError: 'Некорректный формат даты рождения'));
+            emit(
+              state.copyWith(
+                isBirthdayValid: false,
+                dateOfBirthDisplayError: 'Некорректный формат даты рождения',
+              ),
+            );
             didApiComplainOnValidation = true;
           }
         }

lib/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart

@@ -1,3 +1,5 @@
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/session/session_lifecycle_service.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultation_request_model.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/repositories/consultant_repository.dart';
 import 'package:eatvio_app/features/consultations/repositories/consultations_repository.dart';
@@ -17,12 +19,14 @@ class SettingsCubit extends Cubit<SettingsState> {
   final SettingsRepository settingsRepository;
   final ConsultantRepository consultantRepository;
   final ConsultationsRepository consultationsRepository;
+  final SessionLifecycleService sessionLifecycleService;
 
   SettingsCubit({
-    required this.profileRepository, 
-    required this.settingsRepository, 
+    required this.profileRepository,
+    required this.settingsRepository,
     required this.consultantRepository,
     required this.consultationsRepository,
+    required this.sessionLifecycleService,
   }) : super(const SettingsState.loading());
 
   Future<void> init() async {
@@ -30,10 +34,12 @@ class SettingsCubit extends Cubit<SettingsState> {
     late final ConsultationRequestModel? consultantInfo;
     late final bool hasActiveConsultation;
     late final OAuthAccountsDataModel? oauthAccounts;
-    
+
     try {
       if (profile.phoneConfirmationState.contains('confirmed')) {
-        consultantInfo = await consultantRepository.getMyRequestStatus(profile.slug);
+        consultantInfo = await consultantRepository.getMyRequestStatus(
+          profile.slug,
+        );
       } else {
         consultantInfo = null;
       }
@@ -41,14 +47,14 @@ class SettingsCubit extends Cubit<SettingsState> {
       await reportFrom(e, st, this);
       consultantInfo = null;
     }
-    
+
     try {
       hasActiveConsultation = await _checkActiveConsultation();
     } catch (e, st) {
       await reportFrom(e, st, this);
       hasActiveConsultation = false;
     }
-    
+
     try {
       final oauthResponse = await settingsRepository.getOAuthAccounts();
       oauthAccounts = oauthResponse.data;
@@ -56,7 +62,7 @@ class SettingsCubit extends Cubit<SettingsState> {
       await reportFrom(e, st, this);
       oauthAccounts = null;
     }
-    
+
     try {
       emit(
         SettingsState.loaded(
@@ -74,9 +80,13 @@ class SettingsCubit extends Cubit<SettingsState> {
     }
   }
 
-  Future<void> updateProfileDetails({required ProfileDetailsModel profileDetailsModel}) async {
+  Future<void> updateProfileDetails({
+    required ProfileDetailsModel profileDetailsModel,
+  }) async {
     try {
-      await settingsRepository.updateProfileDetails(profileDetailsModel: profileDetailsModel);
+      await settingsRepository.updateProfileDetails(
+        profileDetailsModel: profileDetailsModel,
+      );
     } catch (e, st) {
       await reportFrom(e, st, this);
     } finally {
@@ -84,9 +94,13 @@ class SettingsCubit extends Cubit<SettingsState> {
     }
   }
 
-  Future<void> updateProfileSettings({required ProfileSettingsModel profileSettingsModel}) async {
+  Future<void> updateProfileSettings({
+    required ProfileSettingsModel profileSettingsModel,
+  }) async {
     try {
-      await settingsRepository.updateProfileSettings(profileSettingsModel: profileSettingsModel);
+      await settingsRepository.updateProfileSettings(
+        profileSettingsModel: profileSettingsModel,
+      );
     } catch (e, st) {
       await reportFrom(e, st, this);
     } finally {
@@ -97,9 +111,15 @@ class SettingsCubit extends Cubit<SettingsState> {
   Future<bool> deleteAccount() async {
     try {
       await profileRepository.deleteAccount();
+      await sessionLifecycleService.endSession(
+        reason: SessionEndReason.accountDeleted,
+      );
       return true;
     } catch (e, st) {
       await reportFrom(e, st, this);
+      if (e is DioException && e.response?.statusCode == 401) {
+        return true;
+      }
       return false;
     }
   }
@@ -135,11 +155,14 @@ class SettingsCubit extends Cubit<SettingsState> {
 
   Future<bool> _checkActiveConsultation() async {
     try {
-      final userPurchases = await consultationsRepository.getUserPurchases(null, null);
+      final userPurchases = await consultationsRepository.getUserPurchases(
+        null,
+        null,
+      );
       final activeStates = ChosenPlanStateEnum.getActiveStates();
-      
-      return userPurchases.any((purchase) => 
-        activeStates.contains(purchase.chosenPlanState)
+
+      return userPurchases.any(
+        (purchase) => activeStates.contains(purchase.chosenPlanState),
       );
     } catch (e, st) {
       await reportFrom(e, st, this);

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

@@ -698,7 +698,6 @@ class _DeleteAccountBottomSheet extends State<DeleteAccountBottomSheet> {
             onPressed: () async {
               final result = await widget.cubit.deleteAccount();
               if (result == true) {
-                AppRouter.navigatorKey.currentContext?.go('/auth-screen');
                 return;
               }
               AppRouter.navigatorKey.currentContext?.pop();

lib/features/video_calls/managers/video_call_manager.dart

@@ -11,6 +11,7 @@ import 'package:eatvio_app/features/video_calls/services/video_call_foreground_c
 import 'package:eatvio_app/features/video_calls/services/video_call_lifecycle_binding.dart';
 import 'package:eatvio_app/features/video_calls/services/video_call_peer_departure.dart';
 import 'package:eatvio_app/features/video_calls/services/video_call_notification_navigator.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_remote_end_registry.dart';
 import 'package:eatvio_app/features/video_calls/services/video_call_task_handler.dart';
 import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
 import 'package:eatvio_app/features/video_calls/presentation/widgets/video_call_top_overlay.dart';
@@ -18,6 +19,7 @@ import 'package:eatvio_app/features/video_calls/repositories/video_call_reposito
 import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart';
 import 'package:flutter_foreground_task/flutter_foreground_task.dart';
 import 'package:livekit_client/livekit_client.dart' as lk;
 import 'package:permission_handler/permission_handler.dart';
@@ -32,12 +34,15 @@ class VideoCallManager {
     VideoCallForegroundCoordinator? foregroundCoordinator,
     VideoCallLifecycleBinding? lifecycleBinding,
     VideoCallAudioSessionCoordinator? audioSessionCoordinator,
+    Future<String?> Function()? resolveHwId,
   }) : _videoCallRepository = videoCallRepository,
        _profileRepository = profileRepository,
        _foreground = foregroundCoordinator ?? VideoCallForegroundCoordinator(),
        _lifecycleBinding = lifecycleBinding ?? VideoCallLifecycleBinding(),
        _audioSession =
-           audioSessionCoordinator ?? VideoCallAudioSessionCoordinator() {
+           audioSessionCoordinator ?? VideoCallAudioSessionCoordinator(),
+       _resolveHwId = resolveHwId ?? DeviceHwIdProvider.current {
+    _audioSession.onIosAudioSessionActivated = _restartIosCaptureIfMicOn;
     FlutterForegroundTask.addTaskDataCallback(_onForegroundTaskData);
     if (Platform.isIOS) {
       // LiveKit rewrites the audio session whenever a remote audio track
@@ -52,6 +57,7 @@ class VideoCallManager {
   final VideoCallForegroundCoordinator _foreground;
   final VideoCallLifecycleBinding _lifecycleBinding;
   final VideoCallAudioSessionCoordinator _audioSession;
+  final Future<String?> Function() _resolveHwId;
 
   static const lk.AudioCaptureOptions _micCaptureOptions =
       lk.AudioCaptureOptions(
@@ -77,6 +83,9 @@ class VideoCallManager {
   bool _liveKitDisposed = true;
   bool _callEndedNotified = true;
   bool _forceEndRequested = false;
+  bool _sessionMayRequestToken = false;
+  String? _activeCallId;
+  final Map<String, DateTime> _leftConversationAt = {};
   final Set<String> _callAcceptNotifiedConversationUuids = {};
   bool _callStageEntered = false;
   bool _joinInProgress = false;
@@ -100,6 +109,14 @@ class VideoCallManager {
 
   bool get callEndedNotified => _callEndedNotified;
 
+  String? get activeCallId => _activeCallId;
+
+  void rememberCallId(String? callId) {
+    final id = callId?.trim();
+    if (id == null || id.isEmpty) return;
+    _activeCallId = id;
+  }
+
   bool get isActiveCall =>
       _snapshot.connectPhase == VideoCallConnectPhase.connected &&
       _callStageEntered &&
@@ -178,13 +195,29 @@ class VideoCallManager {
     );
   }
 
-  Future<void> startCall({
+  /// Lets the next [startCall] ask the server for a token.
+  ///
+  /// Only the call button and an accepted incoming call set this. A screen
+  /// that reappears after hang-up must not request a token: that request is
+  /// what rings the other person again.
+  void permitParticipantTokenRequest() {
+    _sessionMayRequestToken = true;
+  }
+
+  Future<bool> startCall({
     required String conversationUuid,
     String? counterpartName,
     String? localParticipantName,
     bool micEnabled = false,
     bool videoEnabled = false,
   }) async {
+    final allowed = mayRequestParticipantToken(
+      sessionPermitted: _sessionMayRequestToken,
+      leftAt: _leftConversationAt[conversationUuid],
+      now: DateTime.now(),
+    );
+    if (!allowed) return false;
+
     if (_room != null &&
         !_liveKitDisposed &&
         _snapshot.conversationUuid == conversationUuid) {
@@ -199,7 +232,7 @@ class VideoCallManager {
         );
         _ensureLifecycleAttached();
         unawaited(_startCallAudioSession());
-        return;
+        return true;
       }
       if (!_callStageEntered &&
           _snapshot.connectPhase == VideoCallConnectPhase.connected &&
@@ -213,11 +246,28 @@ class VideoCallManager {
           ),
         );
         _ensureLifecycleAttached();
-        return;
+        return true;
       }
     }
 
-    await endCall();
+    final previousUuid = _snapshot.conversationUuid;
+    final hasLiveRoom = _room != null && !_liveKitDisposed;
+    if (shouldPreserveCallKitWhenStartingCall(
+      previousConversationUuid: previousUuid,
+      nextConversationUuid: conversationUuid,
+    )) {
+      // The accepted CallKit call owns the iOS microphone. A full endCall
+      // here deactivates that session before the mic track exists.
+      if (hasLiveRoom) {
+        _disposeRoomEphemerals();
+        await _disconnectLiveKitWithTimeout();
+        _liveKitDisposed = false;
+        _callStageEntered = false;
+      }
+    } else {
+      await endCall();
+    }
+    _sessionMayRequestToken = true;
 
     _resetSessionFlagsForNewRoom();
     _callEndedNotified = false;
@@ -255,9 +305,10 @@ class VideoCallManager {
     );
 
     await _prepareLiveKitConnection();
+    return true;
   }
 
-  Future<void> onCallScreenVisible({
+  Future<bool> onCallScreenVisible({
     required String conversationUuid,
     String? counterpartName,
     String? localParticipantName,
@@ -267,7 +318,7 @@ class VideoCallManager {
     if (_snapshot.conversationUuid != conversationUuid ||
         _room == null ||
         _liveKitDisposed) {
-      await startCall(
+      return startCall(
         conversationUuid: conversationUuid,
         counterpartName: counterpartName,
         localParticipantName: localParticipantName,
@@ -286,6 +337,7 @@ class VideoCallManager {
         unawaited(_ensureLocalParticipantNamePublished());
         _syncRemoteParticipantNameFromRoom();
       }
+      return true;
     }
   }
 
@@ -409,36 +461,49 @@ class VideoCallManager {
     final shouldNotifyBackend = shouldNotifyCallEnded(
       alreadyNotified: _callEndedNotified,
       hasConversation: uuid.isNotEmpty,
-      peerStillInRoom: _roomHasRemoteUser(),
     );
     if (uuid.isNotEmpty) {
       _callEndedNotified = true;
+      _leftConversationAt[uuid] = DateTime.now();
     }
+    _sessionMayRequestToken = false;
     _disposeRoomEphemerals();
-    await _disconnectLiveKitOnly();
+    await _disconnectLiveKitWithTimeout();
     if (shouldNotifyBackend) {
       try {
-        await _videoCallRepository.notifyCallEnded(uuid);
+        await _videoCallRepository.notifyCallEnded(
+          uuid,
+          callId: backendVideoCallId(
+            callId: _activeCallId,
+            conversationUuid: uuid,
+          ),
+        );
       } catch (_) {}
     }
     await _foreground.stopOngoingCall();
     await _stopCallAudioSession();
+    await _dismissIosCallKitAfterHangup(uuid);
     _lifecycleBinding.detach();
     _callStageEntered = false;
     _videoPausedForBackground = false;
     _liveKitDisposed = true;
     _myProfileNameFuture = null;
+    _activeCallId = null;
     _emitSnapshot(VideoCallManagerSnapshot.initial);
   }
 
   /// Notifies backend that this device accepted an incoming call so ringing
   /// stops on the user's other devices.
-  Future<void> notifyIncomingCallAccepted(String conversationUuid) async {
+  Future<void> notifyIncomingCallAccepted(
+    String conversationUuid, {
+    String? callId,
+  }) async {
     final uuid = conversationUuid.trim();
     if (uuid.isEmpty) return;
+    rememberCallId(callId);
     if (_callAcceptNotifiedConversationUuids.contains(uuid)) return;
 
-    final hwId = (await DeviceHwIdProvider.current())?.trim();
+    final hwId = (await _resolveHwId())?.trim();
     if (hwId == null || hwId.length < 8) return;
 
     _callAcceptNotifiedConversationUuids.add(uuid);
@@ -446,29 +511,43 @@ class VideoCallManager {
       await _videoCallRepository.notifyCallAccepted(
         conversationUuid: uuid,
         hwId: hwId,
+        callId: _activeCallId ?? callId,
       );
     } catch (_) {
       _callAcceptNotifiedConversationUuids.remove(uuid);
     }
   }
 
-  /// Decline from incoming UI before joining the LiveKit room.
+  /// Drops local call state after the system decline button.
+  ///
+  /// `POST /video-call/decline` is sent from iOS and Android at the tap, so
+  /// other devices stop ringing even when this isolate is not running.
   Future<void> declineIncomingCall(String conversationUuid) async {
     final uuid = conversationUuid.trim();
-    if (uuid.isEmpty) {
-      await endCall();
-      return;
-    }
+    await _cleanupLocalCallAfterDecline(
+      conversationUuid: uuid.isEmpty ? null : uuid,
+    );
+  }
 
-    if (_snapshot.conversationUuid == uuid) {
-      await endCall();
-      return;
+  Future<void> _cleanupLocalCallAfterDecline({String? conversationUuid}) async {
+    final uuid = conversationUuid?.trim();
+    if (uuid != null && uuid.isNotEmpty) {
+      _leftConversationAt[uuid] = DateTime.now();
     }
-
-    await endCall();
-    try {
-      await _videoCallRepository.notifyCallEnded(uuid);
-    } catch (_) {}
+    _callEndedNotified = true;
+    _sessionMayRequestToken = false;
+    _disposeRoomEphemerals();
+    await _disconnectLiveKitWithTimeout();
+    await _foreground.stopOngoingCall();
+    await _stopCallAudioSession();
+    await _dismissIosCallKitAfterHangup(uuid);
+    _lifecycleBinding.detach();
+    _callStageEntered = false;
+    _videoPausedForBackground = false;
+    _liveKitDisposed = true;
+    _myProfileNameFuture = null;
+    _activeCallId = null;
+    _emitSnapshot(VideoCallManagerSnapshot.initial);
   }
 
   /// [currentUiEnabled] reflects what the user sees on the mic control
@@ -500,6 +579,7 @@ class VideoCallManager {
         audioCaptureOptions: _micCaptureOptions,
       );
       if (next) {
+        await _bindIosCallKitAudioEngine();
         await _audioSession.restartCapture();
       }
     } catch (_) {
@@ -699,6 +779,7 @@ class VideoCallManager {
           true,
           audioCaptureOptions: _micCaptureOptions,
         );
+        await _bindIosCallKitAudioEngine();
         await _audioSession.restartCapture();
       } catch (_) {}
     }
@@ -870,16 +951,17 @@ class VideoCallManager {
         }
         _emitSnapshot(_snapshot.copyWith(linkIssue: VideoCallLinkIssue.lost));
       })
-      ..on<lk.ParticipantDisconnectedEvent>((_) {
+      ..on<lk.ParticipantDisconnectedEvent>((event) {
         final room = _room;
         if (room == null) return;
+        final departedIdentity = event.participant.identity;
         if (!shouldForceEndCallAfterPeerLeft(
           callStageEntered: _callStageEntered,
           sessionConnected:
               _snapshot.connectPhase == VideoCallConnectPhase.connected,
-          remoteIdentities: room.remoteParticipants.values.map(
-            (participant) => participant.identity,
-          ),
+          remoteIdentities: room.remoteParticipants.values
+              .map((participant) => participant.identity)
+              .where((identity) => identity != departedIdentity),
         )) {
           return;
         }
@@ -977,13 +1059,21 @@ class VideoCallManager {
   Future<void> _prepareLiveKitConnection() async {
     final room = _room;
     if (room == null) return;
+    if (!_tokenRequestAllowed(_snapshot.conversationUuid)) return;
     _emitSnapshot(_snapshot.copyWith(connectError: null));
     try {
-      final tokenResponse = await _videoCallRepository.getParticipantToken(
-        _snapshot.conversationUuid,
-      );
+      final tokenResponse = await _videoCallRepository
+          .getParticipantToken(
+            _snapshot.conversationUuid,
+            callId: backendVideoCallId(
+              callId: _activeCallId,
+              conversationUuid: _snapshot.conversationUuid,
+            ),
+          )
+          .timeout(const Duration(seconds: 12));
       if (_liveKitDisposed) return;
 
+      rememberCallId(tokenResponse.callId);
       _preparedWsUrl = tokenResponse.wsUrl;
       _preparedToken = tokenResponse.token;
 
@@ -1025,17 +1115,25 @@ class VideoCallManager {
     var wsUrl = _preparedWsUrl;
     var token = _preparedToken;
     if (wsUrl == null || token == null) {
-      final tokenResponse = await _videoCallRepository.getParticipantToken(
-        _snapshot.conversationUuid,
-      );
+      if (!_tokenRequestAllowed(_snapshot.conversationUuid)) return;
+      final tokenResponse = await _videoCallRepository
+          .getParticipantToken(
+            _snapshot.conversationUuid,
+            callId: backendVideoCallId(
+              callId: _activeCallId,
+              conversationUuid: _snapshot.conversationUuid,
+            ),
+          )
+          .timeout(const Duration(seconds: 12));
       if (_liveKitDisposed) return;
+      rememberCallId(tokenResponse.callId);
       wsUrl = tokenResponse.wsUrl;
       token = tokenResponse.token;
       _preparedWsUrl = wsUrl;
       _preparedToken = token;
     }
 
-    await room.connect(wsUrl, token);
+    await room.connect(wsUrl, token).timeout(const Duration(seconds: 15));
     if (_liveKitDisposed) return;
 
     await _ensureLocalParticipantNamePublished();
@@ -1046,6 +1144,13 @@ class VideoCallManager {
     );
   }
 
+  Future<void> _disconnectLiveKitWithTimeout() {
+    return _disconnectLiveKitOnly().timeout(
+      const Duration(seconds: 3),
+      onTimeout: () {},
+    );
+  }
+
   Future<void> _disconnectLiveKitOnly() async {
     if (_room == null) return;
     await _stopCallAudioSession();
@@ -1089,6 +1194,11 @@ class VideoCallManager {
     if (status.isGranted) return true;
     status = await Permission.microphone.request();
     if (status.isGranted) return true;
+    if (Platform.isIOS) {
+      // CallKit already opened a recording session. A stale permission
+      // status must not block publishing the incoming microphone.
+      return true;
+    }
     final ctx2 = _navigatorContext;
     if (ctx2 == null || !ctx2.mounted) return false;
     final s = S.of(ctx2);
@@ -1103,11 +1213,11 @@ class VideoCallManager {
     return false;
   }
 
-  bool _roomHasRemoteUser() {
-    final room = _room;
-    if (room == null) return false;
-    return videoCallRoomStillHasRemoteUser(
-      room.remoteParticipants.values.map((participant) => participant.identity),
+  bool _tokenRequestAllowed(String conversationUuid) {
+    return mayRequestParticipantToken(
+      sessionPermitted: _sessionMayRequestToken,
+      leftAt: _leftConversationAt[conversationUuid],
+      now: DateTime.now(),
     );
   }
 
@@ -1148,10 +1258,13 @@ class VideoCallManager {
 
     if (micOn) {
       try {
-        await lp?.setMicrophoneEnabled(
-          true,
-          audioCaptureOptions: _micCaptureOptions,
-        );
+        await lp
+            ?.setMicrophoneEnabled(
+              true,
+              audioCaptureOptions: _micCaptureOptions,
+            )
+            .timeout(const Duration(seconds: 8));
+        await _bindIosCallKitAudioEngine();
         await _audioSession.restartCapture();
       } catch (_) {
         effectiveMic = false;
@@ -1193,6 +1306,26 @@ class VideoCallManager {
     _lastMutedMicTotalEnergy = null;
   }
 
+  Future<void> _bindIosCallKitAudioEngine() async {
+    if (!Platform.isIOS) return;
+    await _audioSession.startCallKitCapture();
+  }
+
+  /// CallKit activates the session on accept and again when the call is
+  /// marked connected. The second activation can stop AudioEngine after the
+  /// microphone track is already published, so recording has to start again.
+  Future<void> _restartIosCaptureIfMicOn() async {
+    if (!_iosMicCaptureReady) return;
+    // The plugin posts an audio-interruption ended notice in the same
+    // didActivate. Starting immediately loses to that notice.
+    await Future<void>.delayed(const Duration(milliseconds: 300));
+    if (!_iosMicCaptureReady) return;
+    await _audioSession.startCallKitCapture();
+  }
+
+  bool get _iosMicCaptureReady =>
+      Platform.isIOS && _snapshot.micEnabled && _callStageEntered;
+
   Future<void> _startCallAudioSession() async {
     if (!_canHandleCallAudio) return;
     try {
@@ -1205,4 +1338,31 @@ class VideoCallManager {
       await _audioSession.stop();
     } catch (_) {}
   }
+
+  /// Incoming iOS keeps CallKit up for the whole call so the microphone
+  /// session stays. Hang-up has to close that CallKit call.
+  ///
+  /// An empty id used to match every active call, including the one the
+  /// callee just answered, and CallKit then deactivated the microphone.
+  Future<void> _dismissIosCallKitAfterHangup(String? conversationUuid) async {
+    if (!Platform.isIOS) return;
+    final uuid = conversationUuid?.trim().toLowerCase() ?? '';
+    if (uuid.isEmpty) return;
+    try {
+      final activeCalls = await FlutterCallkitIncoming.activeCalls();
+      if (activeCalls.isEmpty) return;
+      for (final call in activeCalls) {
+        final handle = call.handle?.trim().toLowerCase();
+        final extraUuid =
+            call.extra?['conversationUuid']?.toString().trim().toLowerCase() ??
+            call.extra?['conversation_uuid']?.toString().trim().toLowerCase();
+        final matches = handle == uuid || extraUuid == uuid;
+        if (!matches) continue;
+        VideoCallRemoteEndRegistry.mark(call.id);
+        try {
+          await FlutterCallkitIncoming.endCall(call.id);
+        } catch (_) {}
+      }
+    } catch (_) {}
+  }
 }

lib/features/video_calls/models/video_call_models.dart

@@ -9,6 +9,9 @@ abstract class VideoCallTokenResponse with _$VideoCallTokenResponse {
     required String token,
     required String roomName,
     required String wsUrl,
+    @JsonKey(name: 'call_id') String? callId,
+    @JsonKey(name: 'call_status') String? callStatus,
+    @JsonKey(name: 'call_expires_at') String? callExpiresAt,
   }) = _VideoCallTokenResponse;
 
   factory VideoCallTokenResponse.fromJson(Map<String, Object?> json) =>
@@ -29,8 +32,11 @@ abstract class VideoCallAdminTokenResponse with _$VideoCallAdminTokenResponse {
 
 @freezed
 abstract class VideoCallEndedResponse with _$VideoCallEndedResponse {
-  const factory VideoCallEndedResponse({required bool sent}) =
-      _VideoCallEndedResponse;
+  const factory VideoCallEndedResponse({
+    required bool sent,
+    @JsonKey(name: 'call_id') String? callId,
+    String? status,
+  }) = _VideoCallEndedResponse;
 
   factory VideoCallEndedResponse.fromJson(Map<String, Object?> json) =>
       _$VideoCallEndedResponseFromJson(json);
@@ -41,8 +47,24 @@ abstract class VideoCallAcceptResponse with _$VideoCallAcceptResponse {
   const factory VideoCallAcceptResponse({
     required bool sent,
     @JsonKey(name: 'devices_notified') required int devicesNotified,
+    @JsonKey(name: 'call_id') String? callId,
+    String? status,
+    @JsonKey(name: 'already_accepted') bool? alreadyAccepted,
   }) = _VideoCallAcceptResponse;
 
   factory VideoCallAcceptResponse.fromJson(Map<String, Object?> json) =>
       _$VideoCallAcceptResponseFromJson(json);
 }
+
+@freezed
+abstract class VideoCallDeclineResponse with _$VideoCallDeclineResponse {
+  const factory VideoCallDeclineResponse({
+    required bool sent,
+    @JsonKey(name: 'devices_notified') required int devicesNotified,
+    @JsonKey(name: 'call_id') String? callId,
+    String? status,
+  }) = _VideoCallDeclineResponse;
+
+  factory VideoCallDeclineResponse.fromJson(Map<String, Object?> json) =>
+      _$VideoCallDeclineResponseFromJson(json);
+}

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

@@ -5,6 +5,7 @@ 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_notification_navigator.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_peer_departure.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';
@@ -83,10 +84,19 @@ class VideoCallSessionCubit extends BaseCubit<VideoCallSessionState> {
     }
     if (_isCallSessionInactive(snapshot)) {
       unawaited(_systemPipCoordinator.disarm());
-      if (_callScreenRouteVisible) {
+      if (isTransientIdleSnapshotWhileCallScreenVisible(
+        callScreenVisible: _callScreenRouteVisible,
+        conversationUuid: snapshot.conversationUuid,
+        needsManualReconnect: snapshot.linkIssue.needsManualReconnect,
+        connectError: snapshot.connectError,
+      )) {
         // [VideoCallManager.startCall] briefly emits idle while replacing the room.
         return;
       }
+      if (_callScreenRouteVisible) {
+        emit(_sessionStateFromSnapshot(snapshot));
+        return;
+      }
       _resetLobbyReadyTracking();
       emit(const VideoCallSessionState());
       unawaited(_restoreSystemUiAfterCall());
@@ -171,7 +181,7 @@ class VideoCallSessionCubit extends BaseCubit<VideoCallSessionState> {
     );
   }
 
-  Future<void> onCallScreenVisible({
+  Future<bool> onCallScreenVisible({
     required String conversationUuid,
     String? counterpartName,
     String? localParticipantName,
@@ -225,7 +235,7 @@ class VideoCallSessionCubit extends BaseCubit<VideoCallSessionState> {
       WidgetsBinding.instance.addPostFrameCallback((_) {
         unawaited(_applyVideoCallSystemUi());
       });
-      return;
+      return true;
     }
 
     if (isResumingActiveCall) {
@@ -246,7 +256,7 @@ class VideoCallSessionCubit extends BaseCubit<VideoCallSessionState> {
           counterpartName: counterpartName,
           localParticipantName: localParticipantName,
           counterpartIsConsultant: counterpartIsConsultant ?? false,
-          micEnabled: false,
+          micEnabled: isIncomingAccepted,
           videoEnabled: false,
           callStageEntered: false,
           connectError: null,
@@ -255,13 +265,17 @@ class VideoCallSessionCubit extends BaseCubit<VideoCallSessionState> {
           entryMode: effectiveEntryMode,
         ),
       );
-      await _videoCallManager.startCall(
+      final started = await _videoCallManager.startCall(
         conversationUuid: conversationUuid,
         counterpartName: counterpartName,
         localParticipantName: localParticipantName,
-        micEnabled: false,
+        micEnabled: isIncomingAccepted,
         videoEnabled: false,
       );
+      if (!started) {
+        if (!isClosed) emit(const VideoCallSessionState());
+        return false;
+      }
       emit(state.copyWith(entryMode: effectiveEntryMode));
       if (isIncomingAccepted) {
         await _tryAutoEnterCallStage();
@@ -273,6 +287,7 @@ class VideoCallSessionCubit extends BaseCubit<VideoCallSessionState> {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       unawaited(_applyVideoCallSystemUi());
     });
+    return true;
   }
 
   Future<void> _ensureSystemPipArmedIfInCall() async {
@@ -356,7 +371,14 @@ class VideoCallSessionCubit extends BaseCubit<VideoCallSessionState> {
     _autoEnterInFlight = true;
     try {
       await _requestMicBeforeIncomingEnter();
-      await enterCallStage();
+      for (var attempt = 0; attempt < 3; attempt++) {
+        if (isClosed || state.callStageEntered) return;
+        if (state.entryMode != VideoCallEntryMode.incomingAccepted) return;
+        if (state.connectPhase != VideoCallConnectPhase.connected) return;
+        await enterCallStage();
+        if (state.callStageEntered) return;
+        await Future<void>.delayed(Duration(milliseconds: 350 * (attempt + 1)));
+      }
     } finally {
       _autoEnterInFlight = false;
     }
@@ -366,10 +388,11 @@ class VideoCallSessionCubit extends BaseCubit<VideoCallSessionState> {
   Future<void> _requestMicBeforeIncomingEnter() async {
     if (state.entryMode != VideoCallEntryMode.incomingAccepted) return;
 
-    final granted = await _requestMicPermissionForCall();
-    if (!granted || isClosed) return;
+    await _requestMicPermissionForCall();
+    if (isClosed) return;
+    if (state.isMicActiveForUi) return;
 
-    await _videoCallManager.toggleMic(state.isMicActiveForUi);
+    await _videoCallManager.toggleMic(false);
   }
 
   @visibleForTesting
@@ -377,7 +400,14 @@ class VideoCallSessionCubit extends BaseCubit<VideoCallSessionState> {
 
   Future<bool> _requestMicPermissionForCall() async {
     try {
-      final status = await Permission.microphone.request();
+      final current = await Permission.microphone.status;
+      if (current.isGranted) return true;
+      // The incoming-call activity can keep this future pending when the app
+      // was already open. The call has to leave the loading screen anyway.
+      final status = await Permission.microphone.request().timeout(
+        const Duration(seconds: 3),
+        onTimeout: () => PermissionStatus.denied,
+      );
       return status.isGranted;
     } catch (_) {
       return false;
@@ -390,7 +420,8 @@ class VideoCallSessionCubit extends BaseCubit<VideoCallSessionState> {
     if (_videoCallManager.callEndedNotified) return;
     final inCall =
         state.callStageEntered ||
-        state.connectPhase == VideoCallConnectPhase.connected;
+        state.connectPhase == VideoCallConnectPhase.connected ||
+        state.connectPhase == VideoCallConnectPhase.connecting;
     if (!inCall) return;
 
     _handlingRemoteCallEnd = true;

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

@@ -80,18 +80,22 @@ class _VideoCallScreenState extends State<VideoCallScreen> {
     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,
-        ),
-      );
+      unawaited(_openCallSession());
     });
   }
 
+  Future<void> _openCallSession() async {
+    final started = await _cubit.onCallScreenVisible(
+      conversationUuid: widget.conversationUuid,
+      counterpartName: widget.counterpartName,
+      localParticipantName: widget.localParticipantName,
+      counterpartIsConsultant: widget.counterpartIsConsultant,
+      entryMode: widget.entryMode,
+    );
+    if (!mounted || started) return;
+    if (context.canPop()) context.pop();
+  }
+
   Future<void> _initCounterpartMetadata() async {
     var isOnline = widget.counterpartIsOnline ?? false;
     var lastSeenText = widget.counterpartLastSeenText ?? '';

lib/features/video_calls/repositories/video_call_repository.dart

@@ -8,9 +8,13 @@ class VideoCallRepository {
 
   static const Map<String, dynamic> _emptyJsonBody = <String, dynamic>{};
 
-  Future<VideoCallTokenResponse> getParticipantToken(String conversationUuid) {
+  Future<VideoCallTokenResponse> getParticipantToken(
+    String conversationUuid, {
+    String? callId,
+  }) {
     return videoCallService.getParticipantToken(
       conversationUuid: conversationUuid,
+      callId: callId,
     );
   }
 
@@ -18,20 +22,46 @@ class VideoCallRepository {
     return videoCallService.getAdminToken(conversationUuid: conversationUuid);
   }
 
-  Future<VideoCallEndedResponse> notifyCallEnded(String conversationUuid) {
+  Future<VideoCallEndedResponse> notifyCallEnded(
+    String conversationUuid, {
+    String? callId,
+  }) {
+    final body = <String, dynamic>{
+      if (callId != null && callId.trim().isNotEmpty) 'call_id': callId.trim(),
+    };
     return videoCallService.notifyCallEnded(
       conversationUuid: conversationUuid,
-      body: _emptyJsonBody,
+      body: body.isEmpty ? _emptyJsonBody : body,
     );
   }
 
   Future<VideoCallAcceptResponse> notifyCallAccepted({
     required String conversationUuid,
     required String hwId,
+    String? callId,
   }) {
     return videoCallService.notifyCallAccepted(
       conversationUuid: conversationUuid,
-      body: <String, dynamic>{'hw_id': hwId},
+      body: <String, dynamic>{
+        'hw_id': hwId,
+        if (callId != null && callId.trim().isNotEmpty)
+          'call_id': callId.trim(),
+      },
+    );
+  }
+
+  Future<VideoCallDeclineResponse> notifyCallDeclined({
+    required String conversationUuid,
+    required String hwId,
+    String? callId,
+  }) {
+    return videoCallService.notifyCallDeclined(
+      conversationUuid: conversationUuid,
+      body: <String, dynamic>{
+        'hw_id': hwId,
+        if (callId != null && callId.trim().isNotEmpty)
+          'call_id': callId.trim(),
+      },
     );
   }
 }

lib/features/video_calls/services/video_call_audio_session_coordinator.dart

@@ -5,6 +5,7 @@ import 'package:flutter/services.dart';
 
 typedef VideoCallAudioSessionFactory = Future<AudioSession> Function();
 typedef IosCallAudioSessionHandler = Future<void> Function(String method);
+typedef IosAdmHandler = Future<void> Function();
 
 /// Configures and owns the platform audio session for an active VoIP call.
 class VideoCallAudioSessionCoordinator {
@@ -12,18 +13,38 @@ class VideoCallAudioSessionCoordinator {
     VideoCallAudioSessionFactory? audioSessionFactory,
     bool? isIos,
     IosCallAudioSessionHandler? iosCallAudioSession,
+    IosAdmHandler? stopLocalRecording,
+    IosAdmHandler? startLocalRecording,
   }) : _audioSessionFactory =
            audioSessionFactory ?? (() => AudioSession.instance),
        _isIos = isIos ?? Platform.isIOS,
-       _iosCallAudioSession = iosCallAudioSession ?? _invokeIosCallAudioSession;
+       _iosCallAudioSession = iosCallAudioSession ?? _invokeIosCallAudioSession,
+       _stopLocalRecording = stopLocalRecording ?? _invokeStopLocalRecording,
+       _startLocalRecording =
+           startLocalRecording ?? _invokeStartLocalRecording {
+    if (iosCallAudioSession == null && _isIos) {
+      _activationListener = this;
+      _iosChannel.setMethodCallHandler(_onIosAudioSessionCall);
+    }
+  }
 
   static const MethodChannel _iosChannel = MethodChannel(
     'com.eatvioapp/call_audio_session',
   );
+  static const MethodChannel _webrtcChannel = MethodChannel(
+    'FlutterWebRTC.Method',
+  );
 
   final VideoCallAudioSessionFactory _audioSessionFactory;
   final bool _isIos;
   final IosCallAudioSessionHandler _iosCallAudioSession;
+  final IosAdmHandler _stopLocalRecording;
+  final IosAdmHandler _startLocalRecording;
+  static VideoCallAudioSessionCoordinator? _activationListener;
+
+  /// Called when CallKit activates the audio session, including the second
+  /// activation from `setCallConnected`.
+  Future<void> Function()? onIosAudioSessionActivated;
 
   static final AudioSessionConfiguration callConfiguration =
       AudioSessionConfiguration(
@@ -54,6 +75,36 @@ class VideoCallAudioSessionCoordinator {
     return _iosChannel.invokeMethod<void>(method);
   }
 
+  static Future<void> _onIosAudioSessionCall(MethodCall call) async {
+    if (call.method != 'audioSessionActivated') return;
+    await _activationListener?.onIosAudioSessionActivated?.call();
+  }
+
+  static Future<void> _ensureWebRtcInitialized() async {
+    try {
+      await _webrtcChannel.invokeMethod<void>(
+        'initialize',
+        <String, dynamic>{'options': <String, dynamic>{}},
+      );
+    } catch (_) {}
+  }
+
+  static Future<void> _invokeStopLocalRecording() async {
+    await _ensureWebRtcInitialized();
+    await _webrtcChannel.invokeMethod<void>(
+      'stopLocalRecording',
+      <String, dynamic>{},
+    );
+  }
+
+  static Future<void> _invokeStartLocalRecording() async {
+    await _ensureWebRtcInitialized();
+    await _webrtcChannel.invokeMethod<void>(
+      'startLocalRecording',
+      <String, dynamic>{},
+    );
+  }
+
   Future<void> start() async {
     if (_isIos) {
       await _iosCallAudioSession('activate');
@@ -66,7 +117,7 @@ class VideoCallAudioSessionCoordinator {
       await session.configure(callConfiguration);
       _configured = true;
     }
-    await session.setActive(true);
+    await session.setActive(true).timeout(const Duration(seconds: 5));
   }
 
   Future<bool> reactivate() async {
@@ -97,9 +148,24 @@ class VideoCallAudioSessionCoordinator {
     } catch (_) {}
   }
 
+  /// flutter-webrtc 1.2 uses AudioEngine ADM. `isAudioEnabled` does not start
+  /// that engine. `initAndStartRecording` has to run after the microphone
+  /// track exists. Do not stop first: that tears the capture graph down and
+  /// the published track stays silent.
+  Future<void> startCallKitCapture() async {
+    if (!_isIos) return;
+    try {
+      await _startLocalRecording();
+      _iosActive = true;
+    } catch (_) {}
+  }
+
   Future<void> stop() async {
     if (_isIos) {
       _iosActive = false;
+      try {
+        await _stopLocalRecording();
+      } catch (_) {}
       try {
         await _iosCallAudioSession('deactivate');
       } catch (_) {}

lib/features/video_calls/services/video_call_callkit_coordinator.dart

@@ -8,7 +8,10 @@ import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart
 import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_cubit.dart';
 import 'package:eatvio_app/features/video_calls/presentation/bloc/video_call_session/video_call_session_state.dart';
 import 'package:eatvio_app/features/video_calls/services/video_call_fcm_handler.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_peer_departure.dart';
 import 'package:eatvio_app/features/video_calls/services/video_call_notification_navigator.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_remote_end_registry.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_tombstone_registry.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_callkit_incoming/entities/call_event.dart';
@@ -34,6 +37,7 @@ class VideoCallCallKitCoordinator {
   final Map<String, CallKitParams> _callKitParamsById = {};
   final Set<String> _acceptNavigationCompletedIds = {};
   final Map<String, Future<void>> _acceptDeliveriesInFlight = {};
+  final Map<String, Future<void>> _acceptDeliveriesByConversation = {};
   final Set<String> _suppressedEndCallKitIds = {};
   String? _activeCallKitId;
   bool _initialized = false;
@@ -48,6 +52,7 @@ class VideoCallCallKitCoordinator {
 
   _PendingIncomingAccept? _pendingIncomingAccept;
   _AndroidAcceptResumeObserver? _androidResumeObserver;
+  _AppResumeObserver? _iosResumeObserver;
   bool _pendingAcceptDrainScheduled = false;
 
   Future<void> initialize() async {
@@ -75,9 +80,19 @@ class VideoCallCallKitCoordinator {
             _scheduleNativeVoipDiagnosticsDrain();
           case 'acceptedVoipCall':
             await _handleNativeAcceptedVoipCall(call.arguments);
+          case 'declinedVoipCall':
+            await _handleNativeDeclinedVoipCall(call.arguments);
+          case 'tombstoneCallId':
+            _handleNativeTombstoneCallId(call.arguments);
         }
       });
       await _firebaseApi.registerPushToken();
+      _iosResumeObserver = _AppResumeObserver(
+        onResumed: () {
+          unawaited(_drainPendingNativeAcceptedVoipCall());
+        },
+      );
+      WidgetsBinding.instance.addObserver(_iosResumeObserver!);
       await _drainPendingNativeAcceptedVoipCall();
       WidgetsBinding.instance.addPostFrameCallback((_) {
         _scheduleNativeVoipDiagnosticsDrain();
@@ -102,12 +117,19 @@ class VideoCallCallKitCoordinator {
   }
 
   Future<void> _onAndroidCallPushMethodCall(MethodCall call) async {
-    if (call.method == 'onCallKitLaunchIntent') {
-      log(
-        'VideoCallCallKitCoordinator: received onCallKitLaunchIntent push from native',
-        name: 'VideoCallCallKit',
-      );
-      await _handleAndroidCallKitLaunchIntent(call.arguments);
+    switch (call.method) {
+      case 'onCallKitLaunchIntent':
+        log(
+          'VideoCallCallKitCoordinator: received onCallKitLaunchIntent push from native',
+          name: 'VideoCallCallKit',
+        );
+        await _handleAndroidCallKitLaunchIntent(call.arguments);
+      case 'onCallKitDecline':
+        log(
+          'VideoCallCallKitCoordinator: received onCallKitDecline from native',
+          name: 'VideoCallCallKit',
+        );
+        await _handleAndroidCallKitDecline(call.arguments);
     }
   }
 
@@ -221,12 +243,32 @@ class VideoCallCallKitCoordinator {
     );
   }
 
+  Future<void> _handleAndroidCallKitDecline(Object? arguments) async {
+    final data = _stringKeyedMap(arguments);
+    final extra = _stringKeyedMap(data['extra']);
+    final callKitId =
+        _parseString(data, const ['id', 'uuid']) ??
+        _parseString(extra, const ['conversationUuid', 'conversation_uuid']);
+    if (callKitId == null) return;
+
+    try {
+      await _androidCallPushChannel.invokeMethod<Object?>('drainPendingCallKitDecline');
+    } catch (_) {}
+
+    await _handleDecline(callKitId, eventExtra: extra);
+  }
+
   void dispose() {
     final observer = _androidResumeObserver;
     if (observer != null) {
       WidgetsBinding.instance.removeObserver(observer);
       _androidResumeObserver = null;
     }
+    final iosObserver = _iosResumeObserver;
+    if (iosObserver != null) {
+      WidgetsBinding.instance.removeObserver(iosObserver);
+      _iosResumeObserver = null;
+    }
     unawaited(_eventSubscription?.cancel());
     _eventSubscription = null;
     _callKitParamsById.clear();
@@ -362,7 +404,11 @@ class VideoCallCallKitCoordinator {
       );
       return;
     }
-    await _handleDecline(id);
+    await _handleDecline(
+      id,
+      eventExtra: _callKitEventParams(event)?.extra,
+      skipBackendNotify: Platform.isIOS && event is CallEventActionCallDecline,
+    );
   }
 
   Future<void> _handleEndedEvent(CallEvent event) async {
@@ -374,7 +420,7 @@ class VideoCallCallKitCoordinator {
       );
       return;
     }
-    await _handleEnded(id);
+    await _handleEnded(id, eventExtra: _callKitEventParams(event)?.extra);
   }
 
   Future<void> _captureCallKitEventToSentry(CallEvent event) async {
@@ -488,8 +534,9 @@ class VideoCallCallKitCoordinator {
       return;
     }
 
+    final callId = _parseCallId(extra);
     await _deliverIncomingAccept(
-      callKitId: conversationUuid,
+      callKitId: callId ?? conversationUuid,
       conversationUuid: conversationUuid,
       counterpartName: _parseString(extra, const [
         'counterpartName',
@@ -515,6 +562,17 @@ class VideoCallCallKitCoordinator {
     );
   }
 
+  void _handleNativeTombstoneCallId(Object? arguments) {
+    final data = _stringKeyedMap(arguments);
+    final callId = _parseString(data, const ['id', 'call_id', 'callId']);
+    if (callId == null || callId.isEmpty) return;
+    VideoCallTombstoneRegistry.mark(callId);
+    log(
+      'VideoCallCallKitCoordinator: native tombstone call_id=$callId',
+      name: 'VideoCallCallKit',
+    );
+  }
+
   Future<void> _handleNativeAcceptedVoipCall(Object? arguments) async {
     if (!Platform.isIOS) return;
 
@@ -541,6 +599,9 @@ class VideoCallCallKitCoordinator {
       return;
     }
 
+    final callId = _parseCallId(extra) ?? callKitId;
+    _manager.rememberCallId(callId);
+
     await _deliverIncomingAccept(
       callKitId: callKitId,
       conversationUuid: conversationUuid,
@@ -572,6 +633,39 @@ class VideoCallCallKitCoordinator {
     );
   }
 
+  /// Local cleanup after iOS CallKit decline. The backend request is already
+  /// sent from AppDelegate, including when this isolate is suspended.
+  Future<void> _handleNativeDeclinedVoipCall(Object? arguments) async {
+    if (!Platform.isIOS) return;
+
+    final data = _stringKeyedMap(arguments);
+    final extra = _stringKeyedMap(data['extra']);
+    if (callKitExtraMarksEndedPush(Map<String, dynamic>.from(extra))) return;
+
+    final callKitId = _parseString(data, const ['id', 'uuid']);
+    if (callKitId != null &&
+        (_suppressedEndCallKitIds.contains(callKitId) ||
+            VideoCallRemoteEndRegistry.contains(callKitId))) {
+      return;
+    }
+
+    final conversationUuid = _parseConversationUuid(
+      extra,
+      handle: _parseString(data, const ['handle']),
+    );
+    final callId = backendVideoCallId(
+      callId:
+          _parseCallId(extra) ??
+          (callKitId != null && callKitId.contains('-') ? callKitId : null),
+      conversationUuid: conversationUuid,
+    );
+    log(
+      'VideoCallCallKitCoordinator: native declinedVoipCall conversation=$conversationUuid callId=$callId',
+      name: 'VideoCallCallKit',
+    );
+    await _manager.declineIncomingCall(conversationUuid);
+  }
+
   Future<void> _handleAccept(String callKitId) async {
     if (_acceptNavigationCompletedIds.contains(callKitId)) return;
 
@@ -653,6 +747,13 @@ class VideoCallCallKitCoordinator {
       name: 'VideoCallCallKit',
     );
 
+    final conversationKey = conversationUuid.trim().toLowerCase();
+    final conversationDelivery = _acceptDeliveriesByConversation[conversationKey];
+    if (conversationDelivery != null) {
+      await conversationDelivery;
+      return;
+    }
+
     _rememberPendingIncomingAccept(
       callKitId: callKitId,
       conversationUuid: conversationUuid,
@@ -679,12 +780,16 @@ class VideoCallCallKitCoordinator {
       counterpartIsConsultant: counterpartIsConsultant,
     );
     _acceptDeliveriesInFlight[callKitId] = delivery;
+    _acceptDeliveriesByConversation[conversationKey] = delivery;
     try {
       await delivery;
     } finally {
       if (identical(_acceptDeliveriesInFlight[callKitId], delivery)) {
         _acceptDeliveriesInFlight.remove(callKitId);
       }
+      if (identical(_acceptDeliveriesByConversation[conversationKey], delivery)) {
+        _acceptDeliveriesByConversation.remove(conversationKey);
+      }
     }
   }
 
@@ -698,10 +803,26 @@ class VideoCallCallKitCoordinator {
   }) async {
     if (_acceptNavigationCompletedIds.contains(callKitId)) return;
 
-    _suppressedEndCallKitIds.add(callKitId);
-    unawaited(_manager.notifyIncomingCallAccepted(conversationUuid));
+    final params = _paramsForCallId(callKitId);
+    final callId =
+        _parseCallId(params?.extra ?? const <String, Object?>{}) ??
+        (callKitId.contains('-') ? callKitId : null);
+    if (callId != null) {
+      _manager.rememberCallId(callId);
+    }
+    unawaited(
+      _manager.notifyIncomingCallAccepted(conversationUuid, callId: callId),
+    );
+
+    // Android accept starts an ongoing-call service that holds the mic.
+    // Joining LiveKit while that service is still up never leaves the
+    // loading screen when the app was already in the foreground.
+    _suppressCallEnd(callKitId);
+    _suppressCallEnd(conversationUuid);
+    if (callId != null) _suppressCallEnd(callId);
 
     try {
+      await _finishCallKitAfterAccept(callKitId);
       await _waitForAcceptNavigationReady();
 
       final navigated = await _openConnectingScreenAfterAccept(
@@ -737,8 +858,6 @@ class VideoCallCallKitCoordinator {
         );
         unawaited(_drainPendingIncomingAcceptWithRetries());
       }
-
-      await FlutterCallkitIncoming.endCall(callKitId);
     } catch (error, stackTrace) {
       log(
         'VideoCallCallKitCoordinator: accept delivery failed, callKitId=$callKitId: $error',
@@ -746,12 +865,22 @@ class VideoCallCallKitCoordinator {
         stackTrace: stackTrace,
       );
     } finally {
-      unawaited(
-        Future<void>.delayed(const Duration(seconds: 2), () {
-          _suppressedEndCallKitIds.remove(callKitId);
-          _acceptNavigationCompletedIds.remove(callKitId);
-        }),
-      );
+      // Android ends CallKit right after accept, so the plugin ENDED event
+      // must be ignored briefly. iOS keeps CallKit for the whole call: a
+      // later ENDED is a real hang-up and must not be swallowed.
+      if (Platform.isAndroid) {
+        final suppressedIds = <String>{
+          callKitId,
+          conversationUuid,
+          ?callId,
+        };
+        unawaited(
+          Future<void>.delayed(const Duration(seconds: 2), () {
+            _suppressedEndCallKitIds.removeAll(suppressedIds);
+            _acceptNavigationCompletedIds.remove(callKitId);
+          }),
+        );
+      }
     }
   }
 
@@ -783,6 +912,12 @@ class VideoCallCallKitCoordinator {
       return;
     }
 
+    _suppressCallEnd(pending.callKitId);
+    _suppressCallEnd(pending.conversationUuid);
+    try {
+      await _finishCallKitAfterAccept(pending.callKitId);
+    } catch (_) {}
+
     await _waitForAcceptNavigationReady();
     await _settleUiAfterResume();
 
@@ -805,9 +940,44 @@ class VideoCallCallKitCoordinator {
         );
       } catch (_) {}
     }
-    try {
-      await FlutterCallkitIncoming.endCall(pending.callKitId);
-    } catch (_) {}
+  }
+
+  /// After answer: Android dismisses the incoming notification. iOS keeps the
+  /// CallKit call so the audio session stays, and marks it connected so the
+  /// plugin stops treating every later `endCall` as the last PushKit report.
+  Future<void> _finishCallKitAfterAccept(String callKitId) async {
+    if (Platform.isIOS) {
+      try {
+        await FlutterCallkitIncoming.setCallConnected(callKitId);
+      } catch (_) {}
+      return;
+    }
+    _suppressCallEnd(callKitId);
+    await FlutterCallkitIncoming.endCall(callKitId);
+    if (!Platform.isAndroid) return;
+    await _waitUntilAndroidCallKitReleased();
+  }
+
+  /// Telecom keeps the microphone while the incoming connection is active.
+  /// Joining LiveKit before it is gone never leaves the loading screen when
+  /// the app was already in the foreground.
+  Future<void> _waitUntilAndroidCallKitReleased() async {
+    final deadline = DateTime.now().add(const Duration(milliseconds: 1500));
+    while (DateTime.now().isBefore(deadline)) {
+      try {
+        final calls = await FlutterCallkitIncoming.activeCalls();
+        if (calls.isEmpty) return;
+      } catch (_) {
+        return;
+      }
+      await Future<void>.delayed(const Duration(milliseconds: 100));
+    }
+  }
+
+  void _suppressCallEnd(String id) {
+    final trimmed = id.trim();
+    if (trimmed.isEmpty) return;
+    _suppressedEndCallKitIds.add(trimmed);
   }
 
   Future<void> _settleUiAfterResume() async {
@@ -842,6 +1012,7 @@ class VideoCallCallKitCoordinator {
     bool? counterpartIsConsultant,
   }) async {
     FlutterNativeSplash.remove();
+    _manager.permitParticipantTokenRequest();
 
     return VideoCallNotificationNavigator.openIncomingCall(
       conversationUuid: conversationUuid,
@@ -853,7 +1024,11 @@ class VideoCallCallKitCoordinator {
     );
   }
 
-  Future<void> _handleDecline(String callKitId) async {
+  Future<void> _handleDecline(
+    String callKitId, {
+    Map<String, dynamic>? eventExtra,
+    bool skipBackendNotify = false,
+  }) async {
     if (_suppressedEndCallKitIds.contains(callKitId)) {
       log(
         'VideoCallCallKitCoordinator: ignore spurious end/decline during accept, callKitId=$callKitId',
@@ -863,11 +1038,36 @@ class VideoCallCallKitCoordinator {
     }
 
     final params = _paramsForCallId(callKitId);
-    final extra = params?.extra ?? <String, dynamic>{};
+    final extra = params?.extra ?? eventExtra ?? <String, dynamic>{};
     final conversationUuid = _parseConversationUuid(
       extra,
       handle: params?.handle ?? callKitId,
     );
+    final remoteEndDismissal =
+        callKitDeclineIsEndedPush(
+          cachedExtra: params?.extra,
+          eventExtra: eventExtra,
+        ) ||
+        VideoCallRemoteEndRegistry.contains(callKitId);
+
+    if (remoteEndDismissal) {
+      // The call is already closed on the native side. Another endCall is
+      // not needed: while the plugin's push flag is set it would end the
+      // last reported call instead of this id, which may be a newer ring.
+      log(
+        'VideoCallCallKitCoordinator: remote end dismissal, callKitId=$callKitId',
+        name: 'VideoCallCallKit',
+      );
+      _forgetCallKitId(callKitId);
+      return;
+    }
+
+    if (skipBackendNotify) {
+      // AppDelegate already POSTed /decline. This plugin event must not send
+      // /ended for the same tap.
+      _forgetCallKitId(callKitId);
+      return;
+    }
 
     _suppressedEndCallKitIds.add(callKitId);
     try {
@@ -879,14 +1079,12 @@ class VideoCallCallKitCoordinator {
         }),
       );
     }
-    _callKitParamsById.remove(callKitId);
-    if (_activeCallKitId == callKitId) {
-      _activeCallKitId = null;
-    }
+    _forgetCallKitId(callKitId);
 
     if (_manager.isActiveCall ||
         _cubit.state.connectPhase != VideoCallConnectPhase.idle) {
       await _cubit.endCall();
+      VideoCallNotificationNavigator.closeCallRouteIfOpen();
       return;
     }
 
@@ -896,7 +1094,10 @@ class VideoCallCallKitCoordinator {
     }
   }
 
-  Future<void> _handleEnded(String callKitId) async {
+  Future<void> _handleEnded(
+    String callKitId, {
+    Map<String, dynamic>? eventExtra,
+  }) async {
     if (_suppressedEndCallKitIds.contains(callKitId)) {
       log(
         'VideoCallCallKitCoordinator: ignore spurious ended during accept, callKitId=$callKitId',
@@ -905,16 +1106,53 @@ class VideoCallCallKitCoordinator {
       return;
     }
 
-    _callKitParamsById.remove(callKitId);
-    if (_activeCallKitId == callKitId) {
-      _activeCallKitId = null;
+    // iOS reports an ended VoIP push to CallKit and closes it right away.
+    // That close is marked and must be remembered before the decline (or the
+    // later timeout) event for the same id arrives with no marker.
+    final remoteEnd =
+        callKitDeclineIsEndedPush(
+          cachedExtra: _paramsForCallId(callKitId)?.extra,
+          eventExtra: eventExtra,
+        ) ||
+        VideoCallRemoteEndRegistry.contains(callKitId);
+    if (remoteEnd) {
+      VideoCallRemoteEndRegistry.mark(callKitId);
     }
 
+    _forgetCallKitId(callKitId);
+
+    final inAppCall =
+        _manager.isActiveCall ||
+        _cubit.state.connectPhase != VideoCallConnectPhase.idle;
+
+    if (inAppCall) {
+      if (remoteEnd) {
+        await _cubit.handleRemoteCallEnded();
+      } else {
+        await _cubit.endCall();
+        VideoCallNotificationNavigator.closeCallRouteIfOpen();
+      }
+      return;
+    }
+
+    // Native already ends a remote-ended ringing call. Calling endCall
+    // again here overwrites the plugin's stored payload, so the decline
+    // that follows would lose the marker.
+    if (remoteEnd) return;
+
     try {
       await FlutterCallkitIncoming.endCall(callKitId);
     } catch (_) {}
   }
 
+  void _forgetCallKitId(String callKitId) {
+    _callKitParamsById.remove(callKitId);
+    _acceptNavigationCompletedIds.remove(callKitId);
+    if (_activeCallKitId == callKitId) {
+      _activeCallKitId = null;
+    }
+  }
+
   static String _parseConversationUuid(
     Map<String, Object?> extra, {
     String? handle,
@@ -933,6 +1171,10 @@ class VideoCallCallKitCoordinator {
     return '';
   }
 
+  static String? _parseCallId(Map<String, Object?> extra) {
+    return _parseString(extra, const ['call_id', 'callId']);
+  }
+
   static String? _parseString(Map<String, Object?> map, List<String> keys) {
     for (final key in keys) {
       final value = map[key];
@@ -998,6 +1240,19 @@ class _PendingIncomingAccept {
   final bool? counterpartIsConsultant;
 }
 
+class _AppResumeObserver with WidgetsBindingObserver {
+  _AppResumeObserver({required this.onResumed});
+
+  final VoidCallback onResumed;
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    if (state == AppLifecycleState.resumed) {
+      onResumed();
+    }
+  }
+}
+
 class _AndroidAcceptResumeObserver with WidgetsBindingObserver {
   _AndroidAcceptResumeObserver({required this.onResumed});
 

lib/features/video_calls/services/video_call_chat_signal.dart

@@ -57,6 +57,7 @@ abstract final class VideoCallChatSignal {
     required ChatMessageModel message,
     String? callerName,
     String? callerAvatarUrl,
+    String? callId,
   }) {
     if (kindOf(message) != VideoCallChatSignalKind.started) return null;
     final conversationUuid = message.roomId?.trim();
@@ -64,6 +65,7 @@ abstract final class VideoCallChatSignal {
 
     final resolvedName = callerName?.trim();
     final avatar = callerAvatarUrl?.trim();
+    final serverCallId = callId?.trim();
     return VideoCallPushPayload(
       conversationUuid: conversationUuid,
       counterpartName: resolvedName != null && resolvedName.isNotEmpty
@@ -71,6 +73,9 @@ abstract final class VideoCallChatSignal {
           : callerNameFromBody(message.data),
       counterpartAvatarUrl: avatar != null && avatar.isNotEmpty ? avatar : null,
       messageId: message.id > 0 ? message.id : null,
+      callId: serverCallId != null && serverCallId.isNotEmpty
+          ? serverCallId
+          : null,
     );
   }
 

lib/features/video_calls/services/video_call_end_reason.dart

@@ -0,0 +1,35 @@
+/// Cause of a `video_call_ended` push / Echo event.
+///
+/// This is not the session status. It tells the client how to close ringing
+/// or an active call.
+enum VideoCallEndReason {
+  accepted,
+  declined,
+  cancelled,
+  ended,
+  timeout;
+
+  static VideoCallEndReason? tryParse(Object? raw) {
+    if (raw == null) return null;
+    final normalized = raw.toString().trim().toLowerCase().replaceAll('-', '_');
+    if (normalized.isEmpty) return null;
+    for (final value in VideoCallEndReason.values) {
+      if (value.name == normalized) return value;
+    }
+    if (normalized == 'hangup' || normalized == 'hang_up') {
+      return VideoCallEndReason.ended;
+    }
+    return null;
+  }
+
+  /// Close ringing UI; do not tear down an already-accepted LiveKit call.
+  bool get dismissesRingingOnly =>
+      this == VideoCallEndReason.accepted ||
+      this == VideoCallEndReason.declined ||
+      this == VideoCallEndReason.cancelled ||
+      this == VideoCallEndReason.timeout;
+
+  /// Tear down an accepted in-progress call.
+  bool get endsActiveCall =>
+      this == VideoCallEndReason.ended || this == VideoCallEndReason.timeout;
+}

lib/features/video_calls/services/video_call_ended_push_handler.dart

@@ -1,8 +1,13 @@
+import 'dart:developer';
 import 'dart:io';
 
 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/services/video_call_end_reason.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_remote_end_registry.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_tombstone_registry.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_callkit_incoming/entities/call_kit_params.dart';
 import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart';
 
 /// Dismisses incoming call UI after a remote `video_call_ended` push.
@@ -13,42 +18,174 @@ abstract final class VideoCallEndedPushHandler {
 
   static Future<void> dismissIncomingCallUi({
     String? conversationUuid,
+    String? callId,
+    VideoCallEndReason? reason,
   }) async {
-    await endActiveCallIfMatches(conversationUuid);
+    final normalizedCallId = callId?.trim();
+    if (normalizedCallId != null && normalizedCallId.isNotEmpty) {
+      VideoCallTombstoneRegistry.mark(normalizedCallId);
+    }
+
+    log(
+      'VideoCallEndedPushHandler: dismiss '
+      'call_id=${normalizedCallId ?? '-'} '
+      'conversation=${conversationUuid ?? '-'} '
+      'reason=${reason?.name ?? '-'}',
+      name: 'VideoCallEndedPush',
+    );
+
+    final shouldEndActive = reason == null || reason.endsActiveCall;
+    if (shouldEndActive && reason != VideoCallEndReason.accepted) {
+      await endActiveCallIfMatches(
+        conversationUuid: conversationUuid,
+        callId: normalizedCallId,
+      );
+    }
+
     if (Platform.isAndroid) {
       try {
-        await _androidPushChannel.invokeMethod<void>('dismissIncomingCalls');
+        await _androidPushChannel.invokeMethod<void>(
+          'dismissIncomingCalls',
+          <String, String?>{
+            if (normalizedCallId != null && normalizedCallId.isNotEmpty)
+              'call_id': normalizedCallId,
+            if (conversationUuid != null && conversationUuid.trim().isNotEmpty)
+              'conversation_uuid': conversationUuid.trim(),
+          },
+        );
         return;
       } catch (_) {}
     }
 
-    await _dismissViaCallKit();
+    await _dismissViaCallKit(
+      conversationUuid: conversationUuid,
+      callId: normalizedCallId,
+    );
   }
 
-  static Future<void> endActiveCallIfMatches(String? conversationUuid) async {
+  /// Closes the CallKit / incoming UI without ending the LiveKit session.
+  /// Used when this client hangs up: CallKit stays up for the whole incoming
+  /// call on iOS and must be dismissed with the in-app hang-up.
+  static Future<void> dismissCallKitOnly({
+    String? conversationUuid,
+    String? callId,
+  }) {
+    return _dismissViaCallKit(
+      conversationUuid: conversationUuid,
+      callId: callId,
+    );
+  }
+
+  static Future<void> endActiveCallIfMatches({
+    String? conversationUuid,
+    String? callId,
+  }) async {
     final uuid = conversationUuid?.trim();
     if (uuid == null || uuid.isEmpty) return;
     if (!sl.isRegistered<VideoCallSessionCubit>()) return;
 
     final cubit = sl<VideoCallSessionCubit>();
     if (cubit.state.conversationUuid != uuid) return;
+    // callId is reserved for ringing dismiss matching; active sessions are
+    // still keyed by conversation until the cubit stores call_id.
     try {
       await cubit.handleRemoteCallEnded();
     } catch (_) {}
   }
 
-  static Future<void> _dismissViaCallKit() async {
+  static bool callMatches({
+    required CallKitParams call,
+    String? conversationUuid,
+    String? callId,
+  }) {
+    final normalizedCallId = callId?.trim().toLowerCase();
+    if (normalizedCallId != null && normalizedCallId.isNotEmpty) {
+      final id = call.id.trim().toLowerCase();
+      if (id.isNotEmpty && id == normalizedCallId) return true;
+      final extra = call.extra;
+      if (extra != null) {
+        for (final key in const ['call_id', 'callId']) {
+          final value = extra[key];
+          if (value is String &&
+              value.trim().toLowerCase() == normalizedCallId) {
+            return true;
+          }
+        }
+      }
+      // A ring that already has its own call id must not be closed by a
+      // stale ended event for another call in the same chat. A legacy ring
+      // whose id is only the conversation still has to close.
+      if (_callHasDistinctCallId(call)) return false;
+    }
+
+    final uuid = conversationUuid?.trim().toLowerCase();
+    if (uuid == null || uuid.isEmpty) return false;
+    return callMatchesConversation(call, uuid);
+  }
+
+  /// True when this ring already carries a server call id. Conversation
+  /// fallback would close a newer call in the same chat.
+  static bool _callHasDistinctCallId(CallKitParams call) {
+    final extra = call.extra;
+    if (extra == null) return false;
+    for (final key in const ['call_id', 'callId']) {
+      final value = extra[key];
+      if (value is String && value.trim().isNotEmpty) return true;
+    }
+    return false;
+  }
+
+  static bool callMatchesConversation(
+    CallKitParams call,
+    String conversationUuid,
+  ) {
+    final uuid = conversationUuid.trim().toLowerCase();
+    if (uuid.isEmpty) return false;
+    final handle = call.handle?.trim().toLowerCase();
+    if (handle != null && handle == uuid) return true;
+    final extra = call.extra;
+    if (extra == null) return false;
+    for (final key in const ['conversationUuid', 'conversation_uuid']) {
+      final value = extra[key];
+      if (value is String && value.trim().toLowerCase() == uuid) return true;
+    }
+    return false;
+  }
+
+  /// The close of a ringing call comes back from the plugin as a decline.
+  /// Each id is marked first, so the coordinator does not report that
+  /// decline to the backend as if the user had rejected the call.
+  static Future<void> _dismissViaCallKit({
+    String? conversationUuid,
+    String? callId,
+  }) async {
+    final uuid = conversationUuid?.trim();
+    final normalizedCallId = callId?.trim();
     try {
       final activeCalls = await FlutterCallkitIncoming.activeCalls();
+      final hasTarget =
+          (normalizedCallId != null && normalizedCallId.isNotEmpty) ||
+          (uuid != null && uuid.isNotEmpty);
+      if (!hasTarget) {
+        for (final call in activeCalls) {
+          VideoCallRemoteEndRegistry.mark(call.id);
+        }
+        await FlutterCallkitIncoming.endAllCalls();
+        return;
+      }
       for (final call in activeCalls) {
+        if (!callMatches(
+          call: call,
+          conversationUuid: uuid,
+          callId: normalizedCallId,
+        )) {
+          continue;
+        }
+        VideoCallRemoteEndRegistry.mark(call.id);
         try {
           await FlutterCallkitIncoming.endCall(call.id);
         } catch (_) {}
       }
     } catch (_) {}
-
-    try {
-      await FlutterCallkitIncoming.endAllCalls();
-    } catch (_) {}
   }
 }

lib/features/video_calls/services/video_call_ended_push_payload.dart

@@ -1,23 +1,58 @@
+import 'package:eatvio_app/features/video_calls/services/video_call_end_reason.dart';
 import 'package:eatvio_app/features/video_calls/services/video_call_push_payload.dart';
 
 /// Marker for a data-only `video_call_ended` push.
 class VideoCallEndedPushPayload {
-  const VideoCallEndedPushPayload({this.conversationUuid});
+  const VideoCallEndedPushPayload({
+    this.conversationUuid,
+    this.callId,
+    this.reason,
+    this.acceptedDeviceId,
+    this.acceptedClient,
+  });
 
   final String? conversationUuid;
+  final String? callId;
+  final VideoCallEndReason? reason;
+  final String? acceptedDeviceId;
+  final String? acceptedClient;
 
   static VideoCallEndedPushPayload? tryParse(Map<String, dynamic> data) {
     if (!VideoCallPushPayload.isEndedVideoCall(data)) return null;
-    final rawUuid =
-        data['conversationUuid'] ??
-        data['conversation_uuid'] ??
-        data['uuid'];
-    final conversationUuid = rawUuid?.toString().trim();
+
+    final conversationUuid = _string(data, const [
+      'conversationUuid',
+      'conversation_uuid',
+      'uuid',
+    ]);
+    final callId = _string(data, const ['call_id', 'callId']);
+    final acceptedDeviceId = _string(data, const [
+      'accepted_device_id',
+      'acceptedDeviceId',
+    ]);
+    final acceptedClient = _string(data, const [
+      'accepted_client',
+      'acceptedClient',
+    ]);
+
     return VideoCallEndedPushPayload(
-      conversationUuid:
-          conversationUuid == null || conversationUuid.isEmpty
-          ? null
-          : conversationUuid,
+      conversationUuid: conversationUuid,
+      callId: callId,
+      reason: VideoCallEndReason.tryParse(
+        data['reason'] ?? data['end_reason'] ?? data['endReason'],
+      ),
+      acceptedDeviceId: acceptedDeviceId,
+      acceptedClient: acceptedClient,
     );
   }
+
+  static String? _string(Map<String, dynamic> data, List<String> keys) {
+    for (final key in keys) {
+      final value = data[key];
+      if (value is String && value.trim().isNotEmpty) {
+        return value.trim();
+      }
+    }
+    return null;
+  }
 }

lib/features/video_calls/services/video_call_fcm_handler.dart

@@ -58,12 +58,16 @@ abstract final class VideoCallFcmHandler {
       }
 
       log(
-        'VideoCallFcmHandler: dismiss incoming call UI, source=$source',
+        'VideoCallFcmHandler: dismiss incoming call UI, source=$source '
+        'call_id=${endedPayload.callId ?? '-'} '
+        'reason=${endedPayload.reason?.name ?? '-'}',
         name: 'VideoCallFcm',
       );
       try {
         await VideoCallEndedPushHandler.dismissIncomingCallUi(
           conversationUuid: endedPayload.conversationUuid,
+          callId: endedPayload.callId,
+          reason: endedPayload.reason,
         );
       } catch (e, st) {
         log(

lib/features/video_calls/services/video_call_incoming_push_presenter.dart

@@ -1,25 +1,93 @@
+import 'dart:developer';
 import 'dart:io';
 
 import 'package:eatvio_app/features/video_calls/services/video_call_kit_id.dart';
 import 'package:eatvio_app/features/video_calls/services/video_call_push_payload.dart';
+import 'package:eatvio_app/features/video_calls/services/video_call_tombstone_registry.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_callkit_incoming/entities/entities.dart';
 import 'package:flutter_callkit_incoming/flutter_callkit_incoming.dart';
 
+typedef VideoCallIncomingClaim = Future<bool> Function(String callId);
+typedef VideoCallIncomingShow = Future<void> Function(CallKitParams params);
+typedef VideoCallIncomingDelay = Future<void> Function(Duration delay);
+typedef VideoCallAndroidIncomingShow =
+    Future<void> Function(VideoCallPushPayload payload);
+
+/// Shows the system incoming-call UI.
+///
+/// On iOS the VoIP push reports the call even when the app is in the
+/// foreground. A second report for the same id dismisses that UI, so the
+/// socket path waits for the push and presents CallKit only if the push
+/// never arrived.
 abstract final class VideoCallIncomingPushPresenter {
   static const String _androidAccentColor = '#2787F5';
 
-  static Future<void> showIncomingCall(VideoCallPushPayload payload) async {
+  /// Same texts as the native VoIP path in `AppDelegate.swift`.
+  static const String iosMissedCallSubtitle = 'Пропущенный видеозвонок';
+  static const String iosMissedCallCallbackText = 'Перезвонить';
+  static const MethodChannel _voipChannel = MethodChannel(
+    'com.eatvioapp/voip_diagnostics',
+  );
+  static const MethodChannel _androidPushChannel = MethodChannel(
+    'com.eatvioapp/video_call_push',
+  );
+
+  /// Absolute delays from the start of an iOS present attempt.
+  static const List<Duration> iosClaimPollDelays = <Duration>[
+    Duration.zero,
+    Duration(milliseconds: 300),
+    Duration(milliseconds: 800),
+    Duration(milliseconds: 1500),
+  ];
+
+  static Future<void> showIncomingCall(
+    VideoCallPushPayload payload, {
+    bool? isIos,
+    VideoCallIncomingClaim? isIncomingCallClaimed,
+    VideoCallIncomingClaim? reserveIncomingCall,
+    VideoCallIncomingShow? showCallkitIncoming,
+    VideoCallIncomingDelay? delay,
+    List<Duration>? claimPollDelays,
+    VideoCallAndroidIncomingShow? showAndroidIncoming,
+  }) async {
     final callerName = payload.counterpartName?.trim().isNotEmpty == true
         ? payload.counterpartName!.trim()
         : 'Итвио';
+    final ios = isIos ?? Platform.isIOS;
+    if (VideoCallTombstoneRegistry.contains(payload.callId)) {
+      log(
+        'VideoCallIncomingPushPresenter: skip tombstoned call_id=${payload.callId}',
+        name: 'VideoCallIncoming',
+      );
+      return;
+    }
+    if (!ios && (showAndroidIncoming != null || Platform.isAndroid)) {
+      await (showAndroidIncoming ?? _showAndroidIncoming)(payload);
+      return;
+    }
+    final callId = VideoCallKitId.resolve(
+      callId: payload.callId,
+      conversationUuid: payload.conversationUuid,
+      messageId: payload.messageId,
+      isIos: ios,
+    );
 
-    final callId = Platform.isIOS
-        ? VideoCallKitId.iosUuid(
-                conversationUuid: payload.conversationUuid,
-                messageId: payload.messageId,
-              ) ??
-              payload.conversationUuid
-        : payload.conversationUuid;
+    if (ios) {
+      final claimed = isIncomingCallClaimed ?? _isIncomingCallClaimed;
+      final reserve = reserveIncomingCall ?? _reserveIncomingCall;
+      final wait = delay ?? Future<void>.delayed;
+      final polls = claimPollDelays ?? iosClaimPollDelays;
+      final started = DateTime.now();
+      for (final checkpoint in polls) {
+        final remaining = checkpoint - DateTime.now().difference(started);
+        if (remaining > Duration.zero) {
+          await wait(remaining);
+        }
+        if (await _claimOrFalse(claimed, callId)) return;
+      }
+      if (!await _claimOrFalse(reserve, callId)) return;
+    }
 
     final params = CallKitParams(
       id: callId,
@@ -31,6 +99,7 @@ abstract final class VideoCallIncomingPushPresenter {
       duration: 45000,
       extra: <String, dynamic>{
         'conversationUuid': payload.conversationUuid,
+        if (payload.callId != null) 'call_id': payload.callId,
         if (payload.counterpartName != null)
           'counterpartName': payload.counterpartName,
         if (payload.counterpartAvatarUrl != null)
@@ -39,8 +108,14 @@ abstract final class VideoCallIncomingPushPresenter {
           'localParticipantName': payload.localParticipantName,
         if (payload.counterpartIsConsultant != null)
           'counterpartIsConsultant': payload.counterpartIsConsultant,
+        if (payload.messageId != null) 'message_id': payload.messageId,
       },
       callingNotification: const NotificationParams(showNotification: false),
+      missedCallNotification: const NotificationParams(
+        showNotification: true,
+        subtitle: iosMissedCallSubtitle,
+        callbackText: iosMissedCallCallbackText,
+      ),
       android: const AndroidParams(
         isCustomNotification: true,
         isShowLogo: false,
@@ -57,10 +132,65 @@ abstract final class VideoCallIncomingPushPresenter {
       ios: const IOSParams(
         handleType: 'generic',
         supportsVideo: true,
-        ringtonePath: 'system_ringtone_default',
+        configureAudioSession: false,
+        audioSessionActive: false,
+        audioSessionMode: 'videoChat',
       ),
     );
 
-    await FlutterCallkitIncoming.showCallkitIncoming(params);
+    await (showCallkitIncoming ?? FlutterCallkitIncoming.showCallkitIncoming)(
+      params,
+    );
+  }
+
+  static Future<void> _showAndroidIncoming(VideoCallPushPayload payload) async {
+    try {
+      await _androidPushChannel
+          .invokeMethod<void>('showIncomingCall', <String, String>{
+            'conversation_uuid': payload.conversationUuid,
+            if (payload.callId != null) 'call_id': payload.callId!,
+            if (payload.counterpartName != null)
+              'caller_name': payload.counterpartName!,
+            if (payload.counterpartAvatarUrl != null)
+              'caller_avatar': payload.counterpartAvatarUrl!,
+            if (payload.localParticipantName != null)
+              'local_participant_name': payload.localParticipantName!,
+            if (payload.counterpartIsConsultant != null)
+              'is_consultant': payload.counterpartIsConsultant!
+                  ? 'true'
+                  : 'false',
+            if (payload.messageId != null)
+              'message_id': payload.messageId.toString(),
+            if (payload.expiresAt != null)
+              'expires_at': payload.expiresAt!.toUtc().toIso8601String(),
+          });
+    } catch (_) {}
+  }
+
+  static Future<bool> _claimOrFalse(
+    VideoCallIncomingClaim claim,
+    String callId,
+  ) async {
+    try {
+      return await claim(callId);
+    } catch (_) {
+      return false;
+    }
+  }
+
+  static Future<bool> _isIncomingCallClaimed(String callId) async {
+    final claimed = await _voipChannel.invokeMethod<bool>(
+      'isIncomingCallClaimed',
+      <String, String>{'id': callId},
+    );
+    return claimed ?? false;
+  }
+
+  static Future<bool> _reserveIncomingCall(String callId) async {
+    final reserved = await _voipChannel.invokeMethod<bool>(
+      'reserveIncomingCall',
+      <String, String>{'id': callId},
+    );
+    return reserved ?? false;
   }
 }

lib/features/video_calls/services/video_call_kit_id.dart

@@ -1,14 +1,33 @@
-/// CallKit on iOS rejects a second incoming call that reuses a UUID.
+/// Resolves the CallKit / ConnectionService id for an incoming call.
 ///
-/// The conversation uuid stays in the call payload for navigation. The CallKit
-/// id is derived from that uuid plus the chat message id, so one ring is one
-/// call and the next ring in the same chat still appears. Android notifications
-/// keep the conversation uuid: the same id updates one incoming notification.
+/// Prefer the backend `call_id` (stable for the whole session). Legacy
+/// fallback: conversation uuid + message id on iOS, conversation uuid on
+/// Android.
 abstract final class VideoCallKitId {
   static final RegExp _uuidPrefix = RegExp(
     r'^([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-)[0-9a-fA-F]{12}$',
   );
 
+  static String resolve({
+    String? callId,
+    required String conversationUuid,
+    int? messageId,
+    required bool isIos,
+  }) {
+    final serverCallId = callId?.trim();
+    if (serverCallId != null && serverCallId.isNotEmpty) {
+      return serverCallId;
+    }
+    if (isIos) {
+      return iosUuid(
+            conversationUuid: conversationUuid,
+            messageId: messageId,
+          ) ??
+          conversationUuid;
+    }
+    return conversationUuid;
+  }
+
   static String? iosUuid({
     required String conversationUuid,
     required int? messageId,

lib/features/video_calls/services/video_call_peer_departure.dart

@@ -18,18 +18,69 @@ bool shouldForceEndCallAfterPeerLeft({
   return !videoCallRoomStillHasRemoteUser(remoteIdentities);
 }
 
-/// The participant who taps hang up must not report the end while the other
-/// person is still in the room. That report and the remaining client's report
-/// both see an empty room and each one rings the other user again.
+/// Hang up reports the end the same way the web client does after it leaves
+/// the room. The server then sends the ended chat message and push when no
+/// other person is left in the room, which drops the call on the other devices.
 bool shouldNotifyCallEnded({
   required bool alreadyNotified,
   required bool hasConversation,
-  required bool peerStillInRoom,
 }) {
-  if (!hasConversation || alreadyNotified || peerStillInRoom) return false;
+  if (!hasConversation || alreadyNotified) return false;
   return true;
 }
 
+/// An ended VoIP push has to be reported to CallKit, then closed. That close
+/// arrives as a decline. Reporting it to the backend sends another ended VoIP,
+/// which the other phone shows as a new incoming call.
+const Duration incomingDeclineNotifySuppression = Duration(seconds: 60);
+
+bool incomingDeclineShouldNotifyBackend({
+  required DateTime? leftAt,
+  required DateTime now,
+  Duration suppressFor = incomingDeclineNotifySuppression,
+}) {
+  if (leftAt == null) return true;
+  return now.difference(leftAt) >= suppressFor;
+}
+
+/// A token request after hang-up makes the server send a new incoming call.
+/// Automatic retries stay blocked until the user starts or accepts a call.
+bool mayRequestParticipantToken({
+  required bool sessionPermitted,
+  required DateTime? leftAt,
+  required DateTime now,
+  Duration suppressFor = incomingDeclineNotifySuppression,
+}) {
+  if (sessionPermitted) return true;
+  return incomingDeclineShouldNotifyBackend(
+    leftAt: leftAt,
+    now: now,
+    suppressFor: suppressFor,
+  );
+}
+
+bool callKitExtraMarksEndedPush(Map<String, dynamic>? extra) {
+  final value = extra?['endedPush'];
+  if (value is bool) return value;
+  if (value is num) return value != 0;
+  if (value is String) {
+    final normalized = value.trim().toLowerCase();
+    return normalized == 'true' || normalized == '1';
+  }
+  return false;
+}
+
+/// Either the cached incoming payload or the decline event itself can carry
+/// the marker. The decline often arrives with the push payload, while the
+/// cache still holds the original ringing call.
+bool callKitDeclineIsEndedPush({
+  Map<String, dynamic>? cachedExtra,
+  Map<String, dynamic>? eventExtra,
+}) {
+  return callKitExtraMarksEndedPush(cachedExtra) ||
+      callKitExtraMarksEndedPush(eventExtra);
+}
+
 bool shouldForceEndCallAfterRoomDisconnect({
   required bool callStageEntered,
   required bool sessionConnected,
@@ -39,3 +90,44 @@ bool shouldForceEndCallAfterRoomDisconnect({
   return reason == lk.DisconnectReason.participantRemoved ||
       reason == lk.DisconnectReason.roomDeleted;
 }
+
+/// Starting an incoming call must not run [endCall]. That dismisses the
+/// CallKit call which just activated the microphone, and an empty
+/// conversation id dismisses every active CallKit call.
+bool shouldPreserveCallKitWhenStartingCall({
+  required String previousConversationUuid,
+  required String nextConversationUuid,
+}) {
+  final previous = previousConversationUuid.trim();
+  final next = nextConversationUuid.trim();
+  if (previous.isEmpty) return true;
+  return previous == next;
+}
+
+/// `POST /decline` and `POST /ended` treat `call_id` as the session uuid.
+/// The conversation uuid is a different id; sending it makes the request 404
+/// and the other devices never hear about the hang-up.
+String? backendVideoCallId({
+  required String? callId,
+  required String conversationUuid,
+}) {
+  final id = callId?.trim() ?? '';
+  if (id.isEmpty) return null;
+  if (id == conversationUuid.trim()) return null;
+  return id;
+}
+
+/// [startCall] emits an empty idle snapshot while it replaces the room.
+/// A real failure (lost link or a connect error) still has to reach the
+/// visible call screen, otherwise the loading screen never leaves.
+bool isTransientIdleSnapshotWhileCallScreenVisible({
+  required bool callScreenVisible,
+  required String conversationUuid,
+  required bool needsManualReconnect,
+  required String? connectError,
+}) {
+  if (!callScreenVisible) return false;
+  if (needsManualReconnect) return false;
+  if (connectError != null && connectError.trim().isNotEmpty) return false;
+  return conversationUuid.trim().isEmpty;
+}

lib/features/video_calls/services/video_call_push_payload.dart

@@ -6,6 +6,8 @@ class VideoCallPushPayload {
     this.localParticipantName,
     this.counterpartIsConsultant,
     this.messageId,
+    this.callId,
+    this.expiresAt,
   });
 
   final String conversationUuid;
@@ -14,6 +16,8 @@ class VideoCallPushPayload {
   final String? localParticipantName;
   final bool? counterpartIsConsultant;
   final int? messageId;
+  final String? callId;
+  final DateTime? expiresAt;
 
   static VideoCallPushPayload? tryParse(Map<String, dynamic> data) {
     if (!isIncomingVideoCall(data)) return null;
@@ -52,6 +56,8 @@ class VideoCallPushPayload {
         'isConsultant',
       ]),
       messageId: _messageId(data),
+      callId: _string(data, const ['call_id', 'callId']),
+      expiresAt: _dateTime(data, const ['expires_at', 'expiresAt']),
     );
   }
 
@@ -119,6 +125,9 @@ class VideoCallPushPayload {
   static String? conversationUuidFromData(Map<String, dynamic> data) =>
       _conversationUuid(data);
 
+  static String? callIdFromData(Map<String, dynamic> data) =>
+      _string(data, const ['call_id', 'callId']);
+
   static String? _conversationUuid(Map<String, dynamic> data) {
     final fromData = _string(data, const [
       'conversationUuid',
@@ -181,6 +190,17 @@ class VideoCallPushPayload {
     return null;
   }
 
+  static DateTime? _dateTime(Map<String, dynamic> data, List<String> keys) {
+    for (final key in keys) {
+      final value = data[key];
+      if (value is DateTime) return value;
+      if (value is String && value.trim().isNotEmpty) {
+        return DateTime.tryParse(value.trim());
+      }
+    }
+    return null;
+  }
+
   static bool _isTruthy(Object? value) {
     if (value == null) return false;
     if (value is bool) return value;

lib/features/video_calls/services/video_call_remote_end_registry.dart

@@ -0,0 +1,37 @@
+/// CallKit ids that were closed because the call ended remotely.
+///
+/// On iOS every close of a ringing call comes back from the plugin as a
+/// decline, whether the user tapped Decline or the app ended the call after a
+/// `video_call_ended` signal. Only a decline by the user may be reported to
+/// the backend; the other kind would make the server send one more ended
+/// push and the other phone would show it as a new incoming call.
+abstract final class VideoCallRemoteEndRegistry {
+  /// Longer than the 45 s ring timeout: the plugin still emits a timeout
+  /// event for a call it reported and closed right away.
+  static const Duration ttl = Duration(minutes: 2);
+
+  static final Map<String, DateTime> _markedAt = <String, DateTime>{};
+
+  static void mark(String callKitId, {DateTime? now}) {
+    final id = _normalize(callKitId);
+    if (id.isEmpty) return;
+    final at = now ?? DateTime.now();
+    _prune(at);
+    _markedAt[id] = at;
+  }
+
+  static bool contains(String callKitId, {DateTime? now}) {
+    final id = _normalize(callKitId);
+    if (id.isEmpty) return false;
+    _prune(now ?? DateTime.now());
+    return _markedAt.containsKey(id);
+  }
+
+  static void clear() => _markedAt.clear();
+
+  static String _normalize(String callKitId) => callKitId.trim().toLowerCase();
+
+  static void _prune(DateTime now) {
+    _markedAt.removeWhere((_, markedAt) => now.difference(markedAt) >= ttl);
+  }
+}

lib/features/video_calls/services/video_call_service.dart

@@ -11,6 +11,7 @@ abstract class VideoCallService {
   @GET('/api/v2/chat/{conversation}/video-call/token')
   Future<VideoCallTokenResponse> getParticipantToken({
     @Path('conversation') required String conversationUuid,
+    @Query('call_id') String? callId,
   });
 
   @GET('/api/v2/chat/{conversation}/video-call/admin-token')
@@ -29,4 +30,10 @@ abstract class VideoCallService {
     @Path('conversation') required String conversationUuid,
     @Body() required Map<String, dynamic> body,
   });
+
+  @POST('/api/v2/chat/{conversation}/video-call/decline')
+  Future<VideoCallDeclineResponse> notifyCallDeclined({
+    @Path('conversation') required String conversationUuid,
+    @Body() required Map<String, dynamic> body,
+  });
 }

lib/features/video_calls/services/video_call_socket_signal.dart

@@ -0,0 +1,93 @@
+import 'dart:convert';
+
+import 'package:eatvio_app/features/video_calls/services/video_call_end_reason.dart';
+
+/// `video-call-declined` / `video-call-ended` on `private-new-chat-messages`.
+///
+/// The web client closes every other device from these events. A decline does
+/// not create a chat message, so the open app has to read the socket itself.
+class VideoCallSocketSignal {
+  const VideoCallSocketSignal({
+    required this.endsActiveCall,
+    this.conversationUuid,
+    this.callId,
+    this.reason,
+    this.acceptedDeviceId,
+    this.acceptedClient,
+  });
+
+  final bool endsActiveCall;
+  final String? conversationUuid;
+  final String? callId;
+  final VideoCallEndReason? reason;
+  final String? acceptedDeviceId;
+  final String? acceptedClient;
+
+  static VideoCallSocketSignal? tryParseDeclined(Object? raw) {
+    return _tryParse(raw, declined: true);
+  }
+
+  static VideoCallSocketSignal? tryParseEnded(Object? raw) {
+    return _tryParse(raw, declined: false);
+  }
+
+  static VideoCallSocketSignal? _tryParse(
+    Object? raw, {
+    required bool declined,
+  }) {
+    final data = _asMap(raw);
+    if (data == null) return null;
+
+    final conversationUuid = _string(data, const [
+      'conversation_uuid',
+      'conversationUuid',
+    ]);
+    final callId = _string(data, const ['call_id', 'callId']);
+    if ((conversationUuid == null || conversationUuid.isEmpty) &&
+        (callId == null || callId.isEmpty)) {
+      return null;
+    }
+
+    final reason = declined
+        ? VideoCallEndReason.declined
+        : VideoCallEndReason.tryParse(data['reason'] ?? data['status']);
+    final endsActiveCall = declined || reason != VideoCallEndReason.accepted;
+
+    return VideoCallSocketSignal(
+      endsActiveCall: endsActiveCall,
+      conversationUuid: conversationUuid,
+      callId: callId,
+      reason: reason,
+      acceptedDeviceId: _string(data, const [
+        'accepted_device_id',
+        'acceptedDeviceId',
+      ]),
+      acceptedClient: _string(data, const [
+        'accepted_client',
+        'acceptedClient',
+      ]),
+    );
+  }
+
+  static Map<String, dynamic>? _asMap(Object? raw) {
+    if (raw is Map) {
+      return raw.map((key, value) => MapEntry(key.toString(), value));
+    }
+    if (raw is! String || raw.trim().isEmpty) return null;
+    try {
+      final decoded = jsonDecode(raw);
+      if (decoded is Map) {
+        return decoded.map((key, value) => MapEntry(key.toString(), value));
+      }
+    } catch (_) {}
+    return null;
+  }
+
+  static String? _string(Map<String, dynamic> data, List<String> keys) {
+    for (final key in keys) {
+      final value = data[key];
+      if (value is String && value.trim().isNotEmpty) return value.trim();
+    }
+    return null;
+  }
+}

lib/features/video_calls/services/video_call_tombstone_registry.dart

@@ -0,0 +1,37 @@
+/// Remembers cancelled / declined call ids so a late `video_call_started`
+/// push does not show an already-finished ring.
+abstract final class VideoCallTombstoneRegistry {
+  static const Duration defaultTtl = Duration(minutes: 2);
+
+  static final Map<String, DateTime> _expiresAtByCallId = <String, DateTime>{};
+
+  static void mark(
+    String? callId, {
+    DateTime? now,
+    Duration ttl = defaultTtl,
+  }) {
+    final id = _normalize(callId);
+    if (id == null) return;
+    final at = now ?? DateTime.now();
+    _expiresAtByCallId[id] = at.add(ttl);
+  }
+
+  static bool contains(String? callId, {DateTime? now}) {
+    final id = _normalize(callId);
+    if (id == null) return false;
+    _prune(now ?? DateTime.now());
+    return _expiresAtByCallId.containsKey(id);
+  }
+
+  static void clear() => _expiresAtByCallId.clear();
+
+  static void _prune(DateTime now) {
+    _expiresAtByCallId.removeWhere((_, expiresAt) => !expiresAt.isAfter(now));
+  }
+
+  static String? _normalize(String? callId) {
+    final id = callId?.trim().toLowerCase();
+    if (id == null || id.isEmpty) return null;
+    return id;
+  }
+}

lib/generated/intl/messages_en.dart

@@ -658,6 +658,9 @@ class MessageLookup extends MessageLookupByLibrary {
       "В пароле должно быть минимум 6 символов",
     ),
     "pay": MessageLookupByLibrary.simpleMessage("Оплатить"),
+    "pay_by_qr_code": MessageLookupByLibrary.simpleMessage(
+      "Оплатить по QR-коду",
+    ),
     "payment_failed": MessageLookupByLibrary.simpleMessage("Оплата не прошла"),
     "pcs": MessageLookupByLibrary.simpleMessage("шт"),
     "pending_payment": MessageLookupByLibrary.simpleMessage("Ожидается оплата"),
@@ -777,6 +780,34 @@ class MessageLookup extends MessageLookupByLibrary {
     "sbp_payment_error": MessageLookupByLibrary.simpleMessage(
       "Не удалось начать оплату. Попробуйте позже",
     ),
+    "sbp_qr_amount_label": MessageLookupByLibrary.simpleMessage(
+      "Сумма к оплате",
+    ),
+    "sbp_qr_open_test_payment": MessageLookupByLibrary.simpleMessage(
+      "Открыть тестовую оплату",
+    ),
+    "sbp_qr_paid_description": MessageLookupByLibrary.simpleMessage(
+      "Консультация оплачена. Можно вернуться в чат.",
+    ),
+    "sbp_qr_paid_title": MessageLookupByLibrary.simpleMessage(
+      "Оплата прошла успешно!",
+    ),
+    "sbp_qr_step1": MessageLookupByLibrary.simpleMessage(
+      "Откройте приложение банка на телефоне",
+    ),
+    "sbp_qr_step2": MessageLookupByLibrary.simpleMessage(
+      "Выберите «Оплата по QR-коду»",
+    ),
+    "sbp_qr_step3": MessageLookupByLibrary.simpleMessage(
+      "Наведите камеру на код",
+    ),
+    "sbp_qr_test_hint": MessageLookupByLibrary.simpleMessage(
+      "Симуляция оплаты на тестовом стенде Альфа-Банка",
+    ),
+    "sbp_qr_title": MessageLookupByLibrary.simpleMessage("Оплата по QR-коду"),
+    "sbp_qr_waiting_payment": MessageLookupByLibrary.simpleMessage(
+      "Ожидание оплаты…",
+    ),
     "send": MessageLookupByLibrary.simpleMessage("Отправить"),
     "send_complain": MessageLookupByLibrary.simpleMessage("Отправить жалобу"),
     "services": MessageLookupByLibrary.simpleMessage("Оказание услуг"),

lib/generated/intl/messages_ru.dart

@@ -297,6 +297,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "password_short": MessageLookupByLibrary.simpleMessage(
       "В пароле должно быть минимум 6 символов",
     ),
+    "pay_by_qr_code": MessageLookupByLibrary.simpleMessage(
+      "Оплатить по QR-коду",
+    ),
     "pcs": MessageLookupByLibrary.simpleMessage("шт"),
     "personal": MessageLookupByLibrary.simpleMessage("Персональные"),
     "personal_diet_state": MessageLookupByLibrary.simpleMessage("Персональная"),
@@ -354,6 +357,34 @@ class MessageLookup extends MessageLookupByLibrary {
     "sbp_payment_error": MessageLookupByLibrary.simpleMessage(
       "Не удалось начать оплату. Попробуйте позже",
     ),
+    "sbp_qr_amount_label": MessageLookupByLibrary.simpleMessage(
+      "Сумма к оплате",
+    ),
+    "sbp_qr_open_test_payment": MessageLookupByLibrary.simpleMessage(
+      "Открыть тестовую оплату",
+    ),
+    "sbp_qr_paid_description": MessageLookupByLibrary.simpleMessage(
+      "Консультация оплачена. Можно вернуться в чат.",
+    ),
+    "sbp_qr_paid_title": MessageLookupByLibrary.simpleMessage(
+      "Оплата прошла успешно!",
+    ),
+    "sbp_qr_step1": MessageLookupByLibrary.simpleMessage(
+      "Откройте приложение банка на телефоне",
+    ),
+    "sbp_qr_step2": MessageLookupByLibrary.simpleMessage(
+      "Выберите «Оплата по QR-коду»",
+    ),
+    "sbp_qr_step3": MessageLookupByLibrary.simpleMessage(
+      "Наведите камеру на код",
+    ),
+    "sbp_qr_test_hint": MessageLookupByLibrary.simpleMessage(
+      "Симуляция оплаты на тестовом стенде Альфа-Банка",
+    ),
+    "sbp_qr_title": MessageLookupByLibrary.simpleMessage("Оплата по QR-коду"),
+    "sbp_qr_waiting_payment": MessageLookupByLibrary.simpleMessage(
+      "Ожидание оплаты…",
+    ),
     "services": MessageLookupByLibrary.simpleMessage("Оказание услуг"),
     "settings": MessageLookupByLibrary.simpleMessage("Настройки"),
     "share": MessageLookupByLibrary.simpleMessage("Поделиться"),

lib/generated/l10n.dart

@@ -2689,6 +2689,116 @@ class S {
     );
   }
 
+  /// `Оплатить по QR-коду`
+  String get pay_by_qr_code {
+    return Intl.message(
+      'Оплатить по QR-коду',
+      name: 'pay_by_qr_code',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Оплата по QR-коду`
+  String get sbp_qr_title {
+    return Intl.message(
+      'Оплата по QR-коду',
+      name: 'sbp_qr_title',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Сумма к оплате`
+  String get sbp_qr_amount_label {
+    return Intl.message(
+      'Сумма к оплате',
+      name: 'sbp_qr_amount_label',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Откройте приложение банка на телефоне`
+  String get sbp_qr_step1 {
+    return Intl.message(
+      'Откройте приложение банка на телефоне',
+      name: 'sbp_qr_step1',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Выберите «Оплата по QR-коду»`
+  String get sbp_qr_step2 {
+    return Intl.message(
+      'Выберите «Оплата по QR-коду»',
+      name: 'sbp_qr_step2',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Наведите камеру на код`
+  String get sbp_qr_step3 {
+    return Intl.message(
+      'Наведите камеру на код',
+      name: 'sbp_qr_step3',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Ожидание оплаты…`
+  String get sbp_qr_waiting_payment {
+    return Intl.message(
+      'Ожидание оплаты…',
+      name: 'sbp_qr_waiting_payment',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Оплата прошла успешно!`
+  String get sbp_qr_paid_title {
+    return Intl.message(
+      'Оплата прошла успешно!',
+      name: 'sbp_qr_paid_title',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Консультация оплачена. Можно вернуться в чат.`
+  String get sbp_qr_paid_description {
+    return Intl.message(
+      'Консультация оплачена. Можно вернуться в чат.',
+      name: 'sbp_qr_paid_description',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Открыть тестовую оплату`
+  String get sbp_qr_open_test_payment {
+    return Intl.message(
+      'Открыть тестовую оплату',
+      name: 'sbp_qr_open_test_payment',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Симуляция оплаты на тестовом стенде Альфа-Банка`
+  String get sbp_qr_test_hint {
+    return Intl.message(
+      'Симуляция оплаты на тестовом стенде Альфа-Банка',
+      name: 'sbp_qr_test_hint',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `Подробнее о заказе`
   String get more_about_order {
     return Intl.message(

lib/l10n/intl_en.arb

@@ -330,6 +330,17 @@
   "choose_bank_for_payment": "Выберите банк",
   "no_installed_banks": "Нет установленных банков",
   "sbp_payment_error": "Не удалось начать оплату. Попробуйте позже",
+  "pay_by_qr_code": "Оплатить по QR-коду",
+  "sbp_qr_title": "Оплата по QR-коду",
+  "sbp_qr_amount_label": "Сумма к оплате",
+  "sbp_qr_step1": "Откройте приложение банка на телефоне",
+  "sbp_qr_step2": "Выберите «Оплата по QR-коду»",
+  "sbp_qr_step3": "Наведите камеру на код",
+  "sbp_qr_waiting_payment": "Ожидание оплаты…",
+  "sbp_qr_paid_title": "Оплата прошла успешно!",
+  "sbp_qr_paid_description": "Консультация оплачена. Можно вернуться в чат.",
+  "sbp_qr_open_test_payment": "Открыть тестовую оплату",
+  "sbp_qr_test_hint": "Симуляция оплаты на тестовом стенде Альфа-Банка",
   "more_about_order": "Подробнее о заказе",
   "cancel_order": "Отменить заказ",
   "refuse_order":"Отказаться от заказа",

lib/l10n/intl_ru.arb

@@ -239,6 +239,17 @@
   "choose_bank_for_payment": "Выберите банк",
   "no_installed_banks": "Нет установленных банков",
   "sbp_payment_error": "Не удалось начать оплату. Попробуйте позже",
+  "pay_by_qr_code": "Оплатить по QR-коду",
+  "sbp_qr_title": "Оплата по QR-коду",
+  "sbp_qr_amount_label": "Сумма к оплате",
+  "sbp_qr_step1": "Откройте приложение банка на телефоне",
+  "sbp_qr_step2": "Выберите «Оплата по QR-коду»",
+  "sbp_qr_step3": "Наведите камеру на код",
+  "sbp_qr_waiting_payment": "Ожидание оплаты…",
+  "sbp_qr_paid_title": "Оплата прошла успешно!",
+  "sbp_qr_paid_description": "Консультация оплачена. Можно вернуться в чат.",
+  "sbp_qr_open_test_payment": "Открыть тестовую оплату",
+  "sbp_qr_test_hint": "Симуляция оплаты на тестовом стенде Альфа-Банка",
   "yes": "Да",
   "apply": "Применить",
   "have_promo_code": "У вас есть промокод?",

pubspec.yaml

@@ -1,6 +1,6 @@
 name: eatvio_app
 description: A new Flutter project.
-version: 1.3.53+142
+version: 1.3.69+158
 publish_to: 'none'
 
 environment:
@@ -92,6 +92,7 @@ dependencies:
   floating: ^6.0.0
   wakelock_plus: ^1.5.2
   sbp: 0.1.0
+  qr_flutter: ^4.1.0
 
 # html 0.15.7 removed top-level query_selector.matches used by flutter_html 3.0.0.
 dependency_overrides:
@@ -175,14 +176,14 @@ flutter_intl:
 flutter_native_splash:
   android: true
   ios: true
-  color: '#FFFFFF'
-  image_android: 'assets/splash/splash.png'
-  image_dark_android: 'assets/splash/splash.png'
-  image_ios: 'assets/splash/splash.png'
-  image_dark_ios: 'assets/splash/splash.png'
-  branding_android: 'assets/splash/branding.png'
-  branding_dark_android: 'assets/splash/branding.png'
+  color: "#FFFFFF"
+  image_android: "assets/splash/splash.png"
+  image_dark_android: "assets/splash/splash.png"
+  image_ios: "assets/splash/splash.png"
+  image_dark_ios: "assets/splash/splash.png"
+  branding_android: "assets/splash/branding.png"
+  branding_dark_android: "assets/splash/branding.png"
   android_12:
-    image: 'assets/splash/splash.png'
-    image_dark: 'assets/splash/splash.png'
-    branding: 'assets/splash/branding.png'
+    image: "assets/splash/splash.png"
+    image_dark: "assets/splash/splash.png"
+    branding: "assets/splash/branding.png"

test/core/app_config_test.dart

@@ -111,6 +111,7 @@ void main() {
         prefs.getString(PrefsKeys.customBaseUrl),
         'https://custom.example',
       );
+      expect(prefs.getString(PrefsKeys.apiBaseUrl), 'https://custom.example');
     });
 
     test('setBaseUrl removes cached override when url is blank', () async {
@@ -145,9 +146,14 @@ void main() {
         );
 
         applyCachedBaseUrl();
+        await Future<void>.delayed(Duration.zero);
 
         expect(sl<AppConfig>().baseUrl, 'https://cached.example');
         expect(sl<Dio>().options.baseUrl, 'https://cached.example');
+        expect(
+          sl<Prefs>().getString(PrefsKeys.apiBaseUrl),
+          'https://cached.example',
+        );
       },
     );
 
@@ -162,9 +168,11 @@ void main() {
       );
 
       applyCachedBaseUrl();
+      await Future<void>.delayed(Duration.zero);
 
       expect(sl<AppConfig>().baseUrl, EnvConfig.baseUrl);
       expect(sl<Dio>().options.baseUrl, EnvConfig.baseUrl);
+      expect(sl<Prefs>().getString(PrefsKeys.apiBaseUrl), EnvConfig.baseUrl);
     });
 
     test('setBaseUrl can be called multiple times', () {

test/core/device/device_hw_id_provider_test.dart

@@ -0,0 +1,23 @@
+import 'package:eatvio_app/core/device/device_hw_id_provider.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  test('android install id stays the same for this install', () async {
+    SharedPreferences.setMockInitialValues(<String, Object>{});
+    final preferences = await SharedPreferences.getInstance();
+
+    final first = await DeviceHwIdProvider.androidInstallId(
+      preferences: preferences,
+    );
+    final second = await DeviceHwIdProvider.androidInstallId(
+      preferences: preferences,
+    );
+
+    expect(first.length, greaterThanOrEqualTo(8));
+    expect(second, first);
+    expect(first.contains('-'), isTrue);
+  });
+}

test/core/enums/prefs_keys_test.dart

@@ -4,7 +4,7 @@ import 'package:flutter_test/flutter_test.dart';
 void main() {
   group('PrefsKeys', () {
     test('has all expected values', () {
-      expect(PrefsKeys.values.length, 6);
+      expect(PrefsKeys.values.length, 7);
       expect(PrefsKeys.values, contains(PrefsKeys.hasAnonymousTokenBeenSent));
       expect(PrefsKeys.values, contains(PrefsKeys.welcomeScreenWasShowed));
       expect(PrefsKeys.values, contains(PrefsKeys.registrationDate));
@@ -14,6 +14,7 @@ void main() {
       );
       expect(PrefsKeys.values, contains(PrefsKeys.isEmailVerificationSkipped));
       expect(PrefsKeys.values, contains(PrefsKeys.customBaseUrl));
+      expect(PrefsKeys.values, contains(PrefsKeys.apiBaseUrl));
     });
 
     test('can be compared', () {
@@ -44,6 +45,7 @@ void main() {
         'isEmailVerificationSkipped',
       );
       expect(PrefsKeys.customBaseUrl.name, 'customBaseUrl');
+      expect(PrefsKeys.apiBaseUrl.name, 'apiBaseUrl');
     });
   });
 }

test/core/interceptors/phone_verify_error_interceptor_test.dart

@@ -61,6 +61,23 @@ void main() {
       expect(() => interceptor.onError(error, handler), throwsA(isA<Error>()));
     });
 
+    test('onError - 405 с missing: [email] без navigator-контекста отклоняет запрос без падения', () async {
+      final requestOptions = RequestOptions(path: '/test');
+      final response = Response(requestOptions: requestOptions, statusCode: 405, data: {'type': 'unverificated_phone', 'reason': 'verification_required', 'missing': ['email']});
+      final error = DioException(requestOptions: requestOptions, response: response, type: DioExceptionType.badResponse);
+
+      final handler = MockErrorInterceptorHandler();
+      when(() => handler.reject(any())).thenReturn(null);
+
+      // В тестах AppRouter.navigatorKey.currentContext == null: email-ветка должна это пережить.
+      interceptor.onError(error, handler);
+
+      // onError объявлен как void, дожидаемся завершения асинхронной обработки.
+      await Future.delayed(const Duration(milliseconds: 100));
+
+      verify(() => handler.reject(any())).called(1);
+    });
+
     test('onError - пропускает другие ошибки', () async {
       final requestOptions = RequestOptions(path: '/', method: 'GET', baseUrl: 'http://localhost');
       final response = Response(requestOptions: requestOptions, statusCode: 404, data: {});