fixup! Handle ongoing engagement in EntryWidget

Remove logic for changing active engagement outside interactor and add onEngagementChanged interface to interactor that updates active engagement MOB-3806
salemove · Dec 11, 2024 · 876c0e9 · 876c0e9
1 parent 05d3f99
commit 876c0e9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/GliaWidgets/Sources/CallVisualizer/CallVisualizer.swift b/GliaWidgets/Sources/CallVisualizer/CallVisualizer.swift
@@ -121,7 +121,6 @@ extension CallVisualizer {
     func startObservingInteractorEvents() {
         environment.interactorProviding()?.addObserver(self) { [weak self] event in
             if case .stateChanged(.ended(.byOperator)) = event {
-                self?.environment.interactorProviding()?.currentEngagement = nil
                 self?.endSession()
                 self?.environment.log.prefixed(Self.self).info("Call visualizer engagement ended")
             }

diff --git a/GliaWidgets/Sources/CoreSDKClient/CoreSDKClient.Interface.swift b/GliaWidgets/Sources/CoreSDKClient/CoreSDKClient.Interface.swift
@@ -331,6 +331,7 @@ extension CoreSdkClient {
     typealias LoggingError = GliaCoreSDK.LoggingError
     typealias LogLevel = GliaCoreSDK.LogLevel
     typealias Request = GliaCoreSDK.Request
+    typealias EngagementChangedBlock = GliaCoreSDK.EngagementChangedBlock
 }
 
 extension CoreSdkClient {

diff --git a/GliaWidgets/Sources/Interactor/Interactor.swift b/GliaWidgets/Sources/Interactor/Interactor.swift
@@ -234,6 +234,12 @@ extension Interactor {
 }
 
 extension Interactor: CoreSdkClient.Interactable {
+    var onEngagementChanged: CoreSdkClient.EngagementChangedBlock {
+        return { [weak self] engagement in
+            self?.currentEngagement = engagement
+        }
+    }
+
     var onScreenSharingOffer: CoreSdkClient.ScreenshareOfferBlock {
         return { [weak self] answer in
             self?.notify(.screenShareOffer(answer: answer))

diff --git a/GliaWidgets/Sources/ViewModel/EngagementViewModel.swift b/GliaWidgets/Sources/ViewModel/EngagementViewModel.swift
@@ -122,7 +122,6 @@ class EngagementViewModel: CommonEngagementModel {
                 )
             )
             engagementDelegate?(.finished)
-            interactor.currentEngagement = nil
         case .ended(let reason) where reason == .byOperator:
             interactor.currentEngagement?.getSurvey(completion: { [weak self] result in
                 guard let self = self else { return }
@@ -132,7 +131,6 @@ class EngagementViewModel: CommonEngagementModel {
                 }
                 self.engagementAction?(.showAlert(.operatorEndedEngagement(action: { [weak self] in
                     self?.endSession()
-                    self?.interactor.currentEngagement = nil
                     self?.engagementDelegate?(
                           .engaged(
                               operatorImageUrl: nil