diff --git a/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/HasOngoingSecureConversationUseCaseTest.kt b/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/HasOngoingSecureConversationUseCaseTest.kt
index ad8d15d4f..54011661b 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/HasOngoingSecureConversationUseCaseTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/core/secureconversations/domain/HasOngoingSecureConversationUseCaseTest.kt
@@ -1,5 +1,6 @@
 package com.glia.widgets.core.secureconversations.domain
 
+import com.glia.widgets.chat.domain.IsAuthenticatedUseCase
 import com.glia.widgets.core.secureconversations.SecureConversationsRepository
 import com.glia.widgets.engagement.State
 import com.glia.widgets.engagement.domain.EngagementStateUseCase
@@ -20,6 +21,7 @@ class HasOngoingSecureConversationUseCaseTest {
     private lateinit var repository: SecureConversationsRepository
     private lateinit var useCase: HasOngoingSecureConversationUseCase
     private lateinit var engagementStateUseCase: EngagementStateUseCase
+    private lateinit var isAuthenticatedUseCase: IsAuthenticatedUseCase
 
     @Before
     fun setUp() {
@@ -27,7 +29,8 @@ class HasOngoingSecureConversationUseCaseTest {
         RxAndroidPlugins.setInitMainThreadSchedulerHandler { Schedulers.trampoline() }
         repository = mockk()
         engagementStateUseCase = mockk()
-        useCase = HasOngoingSecureConversationUseCase(repository, engagementStateUseCase)
+        isAuthenticatedUseCase = mockk()
+        useCase = HasOngoingSecureConversationUseCase(repository, isAuthenticatedUseCase, engagementStateUseCase)
     }
 
     @After
@@ -40,6 +43,7 @@ class HasOngoingSecureConversationUseCaseTest {
         every { repository.pendingSecureConversationsStatusObservable } returns Flowable.just(pendingSC)
         every { repository.unreadMessagesCountObservable } returns Flowable.just(unreadMessagesCount)
         every { engagementStateUseCase() } returns Flowable.just(if (transferredSC) State.TransferredToSecureConversation else State.NoEngagement)
+        every { isAuthenticatedUseCase() } returns true
     }
 
     @Test
@@ -93,6 +97,7 @@ class HasOngoingSecureConversationUseCaseTest {
         every { repository.pendingSecureConversationsStatusObservable } returns pendingSC
         every { repository.unreadMessagesCountObservable } returns Flowable.just(0)
         every { engagementStateUseCase() } returns Flowable.just(State.NoEngagement)
+        every { isAuthenticatedUseCase() } returns true
 
         useCase().test().assertValue(false)
         val callback = mockk<(Boolean) -> Unit>()
diff --git a/widgetssdk/src/test/java/com/glia/widgets/engagement/domain/EngagementDomainTest.kt b/widgetssdk/src/test/java/com/glia/widgets/engagement/domain/EngagementDomainTest.kt
index 5be0bc723..a0788a432 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/engagement/domain/EngagementDomainTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/engagement/domain/EngagementDomainTest.kt
@@ -214,9 +214,10 @@ class EngagementDomainTest {
     }
 
     @Test
-    fun `EngagementTypeUseCase isCallVisualizerScreenSharing returns true when current engagement is call visualizer and has no media`() {
+    fun `EngagementTypeUseCase isCallVisualizerScreenSharing returns true when current engagement is call visualizer`() {
         val isQueueingOrLiveEngagementUseCase: IsQueueingOrLiveEngagementUseCase = mockk(relaxUnitFun = true)
         val isCurrentEngagementCallVisualizerUseCase: IsCurrentEngagementCallVisualizerUseCase = mockk(relaxUnitFun = true)
+        val screenSharingUseCase: ScreenSharingUseCase = mockk(relaxUnitFun = true)
         val operatorMediaUseCase: OperatorMediaUseCase = mockk(relaxUnitFun = true)
         val visitorMediaUseCase: VisitorMediaUseCase = mockk(relaxUnitFun = true)
         val isOperatorPresentUseCase: IsOperatorPresentUseCase = mockk(relaxUnitFun = true)
@@ -224,10 +225,12 @@ class EngagementDomainTest {
         every { isCurrentEngagementCallVisualizerUseCase() } returns true
         every { visitorMediaUseCase.hasMedia } returns false
         every { operatorMediaUseCase.hasMedia } returns false
+        every { screenSharingUseCase.isSharing } returns true
 
         val useCase: EngagementTypeUseCase = EngagementTypeUseCaseImpl(
             isQueueingOrLiveEngagementUseCase = isQueueingOrLiveEngagementUseCase,
             isCurrentEngagementCallVisualizerUseCase = isCurrentEngagementCallVisualizerUseCase,
+            screenSharingUseCase = screenSharingUseCase,
             operatorMediaUseCase = operatorMediaUseCase,
             visitorMediaUseCase = visitorMediaUseCase,
             isOperatorPresentUseCase = isOperatorPresentUseCase
@@ -237,32 +240,36 @@ class EngagementDomainTest {
     }
 
     @Test
-    fun `EngagementTypeUseCase isCallVisualizerScreenSharing returns false when engagement has media`() {
+    fun `EngagementTypeUseCase isCallVisualizerScreenSharing returns true even when engagement has media`() {
         val isQueueingOrLiveEngagementUseCase: IsQueueingOrLiveEngagementUseCase = mockk(relaxUnitFun = true)
         val isCurrentEngagementCallVisualizerUseCase: IsCurrentEngagementCallVisualizerUseCase = mockk(relaxUnitFun = true)
+        val screenSharingUseCase: ScreenSharingUseCase = mockk(relaxUnitFun = true)
         val operatorMediaUseCase: OperatorMediaUseCase = mockk(relaxUnitFun = true)
         val visitorMediaUseCase: VisitorMediaUseCase = mockk(relaxUnitFun = true)
         val isOperatorPresentUseCase: IsOperatorPresentUseCase = mockk(relaxUnitFun = true)
 
         every { isCurrentEngagementCallVisualizerUseCase() } returns true
         every { visitorMediaUseCase.hasMedia } returns true
-        every { operatorMediaUseCase.hasMedia } returns false
+        every { operatorMediaUseCase.hasMedia } returns true
+        every { screenSharingUseCase.isSharing } returns true
 
         val useCase: EngagementTypeUseCase = EngagementTypeUseCaseImpl(
             isQueueingOrLiveEngagementUseCase = isQueueingOrLiveEngagementUseCase,
             isCurrentEngagementCallVisualizerUseCase = isCurrentEngagementCallVisualizerUseCase,
+            screenSharingUseCase = screenSharingUseCase,
             operatorMediaUseCase = operatorMediaUseCase,
             visitorMediaUseCase = visitorMediaUseCase,
             isOperatorPresentUseCase = isOperatorPresentUseCase
         )
 
-        assertFalse(useCase.isCallVisualizerScreenSharing)
+        assertTrue(useCase.isCallVisualizerScreenSharing)
     }
 
     @Test
     fun `EngagementTypeUseCase isChatEngagement returns true when engagement has no media, is not a cv and operator is present`() {
         val isQueueingOrLiveEngagementUseCase: IsQueueingOrLiveEngagementUseCase = mockk(relaxUnitFun = true)
         val isCurrentEngagementCallVisualizerUseCase: IsCurrentEngagementCallVisualizerUseCase = mockk(relaxUnitFun = true)
+        val screenSharingUseCase: ScreenSharingUseCase = mockk(relaxUnitFun = true)
         val operatorMediaUseCase: OperatorMediaUseCase = mockk(relaxUnitFun = true)
         val visitorMediaUseCase: VisitorMediaUseCase = mockk(relaxUnitFun = true)
         val isOperatorPresentUseCase: IsOperatorPresentUseCase = mockk(relaxUnitFun = true)
@@ -276,6 +283,7 @@ class EngagementDomainTest {
         val useCase: EngagementTypeUseCase = EngagementTypeUseCaseImpl(
             isQueueingOrLiveEngagementUseCase = isQueueingOrLiveEngagementUseCase,
             isCurrentEngagementCallVisualizerUseCase = isCurrentEngagementCallVisualizerUseCase,
+            screenSharingUseCase = screenSharingUseCase,
             operatorMediaUseCase = operatorMediaUseCase,
             visitorMediaUseCase = visitorMediaUseCase,
             isOperatorPresentUseCase = isOperatorPresentUseCase
@@ -288,6 +296,7 @@ class EngagementDomainTest {
     fun `EngagementTypeUseCase isMediaEngagement returns true when engagement has  media and operator is present`() {
         val isQueueingOrLiveEngagementUseCase: IsQueueingOrLiveEngagementUseCase = mockk(relaxUnitFun = true)
         val isCurrentEngagementCallVisualizerUseCase: IsCurrentEngagementCallVisualizerUseCase = mockk(relaxUnitFun = true)
+        val screenSharingUseCase: ScreenSharingUseCase = mockk(relaxUnitFun = true)
         val operatorMediaUseCase: OperatorMediaUseCase = mockk(relaxUnitFun = true)
         val visitorMediaUseCase: VisitorMediaUseCase = mockk(relaxUnitFun = true)
         val isOperatorPresentUseCase: IsOperatorPresentUseCase = mockk(relaxUnitFun = true)
@@ -300,6 +309,7 @@ class EngagementDomainTest {
         val useCase: EngagementTypeUseCase = EngagementTypeUseCaseImpl(
             isQueueingOrLiveEngagementUseCase = isQueueingOrLiveEngagementUseCase,
             isCurrentEngagementCallVisualizerUseCase = isCurrentEngagementCallVisualizerUseCase,
+            screenSharingUseCase = screenSharingUseCase,
             operatorMediaUseCase = operatorMediaUseCase,
             visitorMediaUseCase = visitorMediaUseCase,
             isOperatorPresentUseCase = isOperatorPresentUseCase
@@ -385,7 +395,7 @@ class EngagementDomainTest {
     }
 
     @Test
-    fun `OperatorMediaUseCase invoke will emit data only when data is present`() {
+    fun `OperatorMediaUseCase invoke will emit empty media state even when data is absent`() {
         val video = mockk<Video>(relaxUnitFun = true)
 
         val mediaState = mockk<MediaState>(relaxUnitFun = true) {
@@ -406,13 +416,12 @@ class EngagementDomainTest {
 
         verify { engagementRepository.operatorMediaState }
 
-        mediaStateFlow.test().assertNoValues()
+        assertFalse(operatorMediaUseCase.hasMedia)
 
         mediaStateSubject.onNext(Data.Empty)
         mediaStateSubject.onNext(Data.Empty)
         mediaStateSubject.onNext(Data.Empty)
 
-        mediaStateFlow.test().assertNoValues()
         assertFalse(operatorMediaUseCase.hasMedia)
 
         mediaStateSubject.onNext(Data.Value(mediaState))
@@ -426,7 +435,7 @@ class EngagementDomainTest {
     }
 
     @Test
-    fun `VisitorMediaUseCase invoke will emit data only when data is present`() {
+    fun `VisitorMediaUseCase invoke will emit empty media state even when data is absent`() {
         val video = mockk<Video>(relaxUnitFun = true)
 
         val mediaState = mockk<MediaState>(relaxUnitFun = true) {
@@ -448,13 +457,12 @@ class EngagementDomainTest {
 
         verify { engagementRepository.visitorMediaState }
 
-        mediaStateFlow.test().assertNoValues()
+        assertFalse(visitorMediaUseCase.hasMedia)
 
         mediaStateSubject.onNext(Data.Empty)
         mediaStateSubject.onNext(Data.Empty)
         mediaStateSubject.onNext(Data.Empty)
 
-        mediaStateFlow.test().assertNoValues()
         assertFalse(visitorMediaUseCase.hasMedia)
 
         mediaStateSubject.onNext(Data.Value(mediaState))
diff --git a/widgetssdk/src/test/java/com/glia/widgets/entrywidget/EntryWidgetControllerTest.kt b/widgetssdk/src/test/java/com/glia/widgets/entrywidget/EntryWidgetControllerTest.kt
index 63caa8f3a..6e60558d6 100644
--- a/widgetssdk/src/test/java/com/glia/widgets/entrywidget/EntryWidgetControllerTest.kt
+++ b/widgetssdk/src/test/java/com/glia/widgets/entrywidget/EntryWidgetControllerTest.kt
@@ -3,6 +3,8 @@ package com.glia.widgets.entrywidget
 import android.COMMON_EXTENSIONS_CLASS_PATH
 import android.app.Activity
 import com.glia.androidsdk.Engagement
+import com.glia.androidsdk.Engagement.MediaType
+import com.glia.androidsdk.engagement.EngagementState
 import com.glia.androidsdk.queuing.Queue
 import com.glia.widgets.chat.domain.IsAuthenticatedUseCase
 import com.glia.widgets.core.queue.QueueRepository
@@ -10,8 +12,13 @@ import com.glia.widgets.core.queue.QueuesState
 import com.glia.widgets.core.secureconversations.SecureConversationsRepository
 import com.glia.widgets.core.secureconversations.domain.HasOngoingSecureConversationUseCase
 import com.glia.widgets.di.GliaCore
+import com.glia.widgets.engagement.EngagementUpdateState
+import com.glia.widgets.engagement.State
+import com.glia.widgets.engagement.domain.EngagementStateUseCase
+import com.glia.widgets.engagement.domain.EngagementTypeUseCase
 import com.glia.widgets.helper.Logger
 import com.glia.widgets.helper.mediaTypes
+import com.glia.widgets.launcher.ActivityLauncher
 import com.glia.widgets.launcher.EngagementLauncher
 import io.mockk.every
 import io.mockk.mockk
@@ -26,6 +33,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
+import org.mockito.kotlin.mock
 
 class EntryWidgetControllerTest {
 
@@ -56,11 +64,14 @@ class EntryWidgetControllerTest {
     private lateinit var isAuthenticatedUseCase: IsAuthenticatedUseCase
     private lateinit var secureConversationsRepository: SecureConversationsRepository
     private lateinit var hasOngoingSecureConversationUseCase: HasOngoingSecureConversationUseCase
+    private lateinit var engagementStateUseCase: EngagementStateUseCase
+    private lateinit var engagementTypeUseCase: EngagementTypeUseCase
     private lateinit var core: GliaCore
     private lateinit var controller: EntryWidgetController
     private lateinit var view: EntryWidgetContract.View
     private lateinit var activity: Activity
     private lateinit var engagementLauncher: EngagementLauncher
+    private lateinit var activityLauncher: ActivityLauncher
     private lateinit var disposable: CompositeDisposable
 
     @Before
@@ -76,18 +87,24 @@ class EntryWidgetControllerTest {
         isAuthenticatedUseCase = mockk()
         secureConversationsRepository = mockk()
         hasOngoingSecureConversationUseCase = mockk()
+        engagementStateUseCase = mockk()
+        engagementTypeUseCase = mockk()
         core = mockk()
         activity = mockk()
         view = mockk(relaxUnitFun = true)
         engagementLauncher = mockk(relaxUnitFun = true)
+        activityLauncher = mockk(relaxUnitFun = true)
 
         controller = EntryWidgetController(
             queueRepository,
             isAuthenticatedUseCase,
             secureConversationsRepository,
             hasOngoingSecureConversationUseCase,
+            engagementStateUseCase,
+            engagementTypeUseCase,
             core,
             engagementLauncher,
+            activityLauncher,
             disposable
         )
     }
@@ -106,7 +123,9 @@ class EntryWidgetControllerTest {
         unreadMessagesCount: Int? = null,
         hasOngoingSc: Boolean? = null,
         isAuthenticated: Boolean = false,
-        whiteLabel: Boolean = false
+        whiteLabel: Boolean = false,
+        engagementState: State = State.NoEngagement,
+        engagementType: MediaType = MediaType.UNKNOWN
     ) {
         every { core.isInitialized } returns coreInitialized
         every { queueRepository.queuesState } returns (queuesState?.let { Flowable.just(it) } ?: Flowable.never())
@@ -114,6 +133,8 @@ class EntryWidgetControllerTest {
             ?: Flowable.never())
         every { hasOngoingSecureConversationUseCase() } returns (hasOngoingSc?.let { Flowable.just(it) } ?: Flowable.never())
         every { isAuthenticatedUseCase() } returns isAuthenticated
+        every { engagementStateUseCase() } returns Flowable.just(engagementState)
+        every { engagementTypeUseCase() } returns Flowable.just(engagementType)
         every { view.whiteLabel } returns whiteLabel
     }
 
@@ -203,7 +224,7 @@ class EntryWidgetControllerTest {
 
     @Test
     fun `showItems is called with empty item when media types are unwanted and view type is Messaging Live Support`() {
-        every { any<List<Queue>>().mediaTypes } returns listOf(Engagement.MediaType.MESSAGING)
+        every { any<List<Queue>>().mediaTypes } returns listOf(MediaType.MESSAGING)
 
         mockInputData(
             coreInitialized = true,
@@ -224,10 +245,10 @@ class EntryWidgetControllerTest {
     @Test
     fun `showItems is called with properly ordered items when view type is Messaging Live Support`() {
         every { any<List<Queue>>().mediaTypes } returns listOf(
-            Engagement.MediaType.TEXT,
-            Engagement.MediaType.MESSAGING,
-            Engagement.MediaType.AUDIO,
-            Engagement.MediaType.VIDEO
+            MediaType.TEXT,
+            MediaType.MESSAGING,
+            MediaType.AUDIO,
+            MediaType.VIDEO
         )
 
         mockInputData(
@@ -285,19 +306,25 @@ class EntryWidgetControllerTest {
     @Test
     fun `showItems is called with Messaging item when state is Empty but has ongoing SC and view type is not Messaging Live Support`() {
         val unreadMessagesCount = 2
+        val engagementState = mock<EngagementState>()
+        val engagementUpdateState = EngagementUpdateState.Ongoing(mockk())
 
         mockInputData(
             coreInitialized = true,
             queuesState = QueuesState.Empty,
             unreadMessagesCount = unreadMessagesCount,
             hasOngoingSc = true,
-            isAuthenticated = true
+            isAuthenticated = true,
+            engagementState = State.Update(engagementState, engagementUpdateState),
+            engagementType = MediaType.MESSAGING,
         )
 
+        every { engagementTypeUseCase.isCallVisualizer } returns false
+
         controller.setView(view, EntryWidgetContract.ViewType.EMBEDDED_VIEW)
 
         val messaging = listOf(
-            EntryWidgetContract.ItemType.Messaging(unreadMessagesCount),
+            EntryWidgetContract.ItemType.MessagingOngoing(unreadMessagesCount),
             EntryWidgetContract.ItemType.PoweredBy
         )
 
@@ -345,7 +372,7 @@ class EntryWidgetControllerTest {
     }
 
     @Test
-    fun `showItems is called with Messaging item when state is Loading but has ongoing SC and view type is not Messaging Live Support`() {
+    fun `showItems is called with MessagingOngoing item when state is Loading but has ongoing SC and view type is not Messaging Live Support`() {
         val unreadMessagesCount = 2
 
         mockInputData(
@@ -353,13 +380,14 @@ class EntryWidgetControllerTest {
             queuesState = QueuesState.Loading,
             unreadMessagesCount = unreadMessagesCount,
             hasOngoingSc = true,
-            isAuthenticated = true
+            isAuthenticated = true,
+            engagementType = MediaType.MESSAGING
         )
 
         controller.setView(view, EntryWidgetContract.ViewType.EMBEDDED_VIEW)
 
         val messaging = listOf(
-            EntryWidgetContract.ItemType.Messaging(unreadMessagesCount),
+            EntryWidgetContract.ItemType.MessagingOngoing(unreadMessagesCount),
             EntryWidgetContract.ItemType.PoweredBy
         )
 
@@ -407,7 +435,7 @@ class EntryWidgetControllerTest {
     }
 
     @Test
-    fun `showItems is called with Messaging item when state is Error but has ongoing SC and view type is not Messaging Live Support`() {
+    fun `showItems is called with MessagingOngoing item when state is Error but has ongoing SC and view type is not Messaging Live Support`() {
         val unreadMessagesCount = 2
 
         mockInputData(
@@ -415,13 +443,14 @@ class EntryWidgetControllerTest {
             queuesState = QueuesState.Error(mockk()),
             unreadMessagesCount = unreadMessagesCount,
             hasOngoingSc = true,
-            isAuthenticated = true
+            isAuthenticated = true,
+            engagementType = MediaType.MESSAGING
         )
 
         controller.setView(view, EntryWidgetContract.ViewType.EMBEDDED_VIEW)
 
         val messaging = listOf(
-            EntryWidgetContract.ItemType.Messaging(unreadMessagesCount),
+            EntryWidgetContract.ItemType.MessagingOngoing(unreadMessagesCount),
             EntryWidgetContract.ItemType.PoweredBy
         )
 
@@ -475,10 +504,10 @@ class EntryWidgetControllerTest {
     @Test
     fun `showItems is called without messaging when not authenticated and view type is not Messaging Live Support`() {
         every { any<List<Queue>>().mediaTypes } returns listOf(
-            Engagement.MediaType.TEXT,
-            Engagement.MediaType.MESSAGING,
-            Engagement.MediaType.AUDIO,
-            Engagement.MediaType.VIDEO
+            MediaType.TEXT,
+            MediaType.MESSAGING,
+            MediaType.AUDIO,
+            MediaType.VIDEO
         )
 
         mockInputData(
@@ -506,9 +535,9 @@ class EntryWidgetControllerTest {
     @Test
     fun `showItems is called with messaging when authenticated, hasOngoingSC and view type is not Messaging Live Support`() {
         every { any<List<Queue>>().mediaTypes } returns listOf(
-            Engagement.MediaType.TEXT,
-            Engagement.MediaType.AUDIO,
-            Engagement.MediaType.VIDEO
+            MediaType.TEXT,
+            MediaType.AUDIO,
+            MediaType.VIDEO
         )
 
         val unreadMessagesCount = 2
@@ -538,10 +567,10 @@ class EntryWidgetControllerTest {
     @Test
     fun `showItems is called with proper order when view type is not Messaging Live Support`() {
         every { any<List<Queue>>().mediaTypes } returns listOf(
-            Engagement.MediaType.TEXT,
-            Engagement.MediaType.AUDIO,
-            Engagement.MediaType.MESSAGING,
-            Engagement.MediaType.VIDEO
+            MediaType.TEXT,
+            MediaType.AUDIO,
+            MediaType.MESSAGING,
+            MediaType.VIDEO
         )
 
         val unreadMessagesCount = 2