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 · 88ccb46 · 88ccb46
1 parent 876c0e9
commit 88ccb46
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/GliaWidgets/Public/Glia/Glia+EntryWidget.swift b/GliaWidgets/Public/Glia/Glia+EntryWidget.swift
@@ -28,7 +28,10 @@ extension Glia {
                     guard let self else { return false }
                     return pendingInteraction.hasPendingInteraction
                 },
-                currentInteractor: { self.interactor }
+                currentInteractor: { [weak self] in
+                    guard let self else { return nil }
+                    return interactor
+                }
             )
         )
     }

diff --git a/GliaWidgets/Sources/EntryWidget/EntryWidget.swift b/GliaWidgets/Sources/EntryWidget/EntryWidget.swift
@@ -47,8 +47,8 @@ public final class EntryWidget: NSObject {
 
         engagementCancellable = environment.currentInteractor()?.$currentEngagement
             .sink { [weak self] engagement in
-                guard let self = self else { return }
-                self.ongoingEngagement = engagement
+                guard let self else { return }
+                ongoingEngagement = engagement
                 handleQueuesMonitorUpdates(state: environment.queuesMonitor.state, unreadSecureMessagesCount: unreadSecureMessageCount)
             }
     }