From 0a74ef29d8c6f94b64aad5d55c55e409ed193622 Mon Sep 17 00:00:00 2001
From: Rasmus Tauts <rasmus.tauts@glia.com>
Date: Wed, 1 Nov 2023 11:47:04 +0200
Subject: [PATCH] Rebase fix

---
 .../Public/Glia/Glia+StartEngagement.swift    | 19 ++++++-------------
 .../CallVisualizer/CallVisualizer.swift       |  3 ++-
 ...llVisualizer.Coordinator.Environment.swift |  1 +
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/GliaWidgets/Public/Glia/Glia+StartEngagement.swift b/GliaWidgets/Public/Glia/Glia+StartEngagement.swift
index 9646af163..5a556a86c 100644
--- a/GliaWidgets/Public/Glia/Glia+StartEngagement.swift
+++ b/GliaWidgets/Public/Glia/Glia+StartEngagement.swift
@@ -42,15 +42,8 @@ extension Glia {
             queueIds: queueIds
         )
 
-        theme.chat.connect.queue.firstText = companyName(
-            using: configuration,
-            themeCompanyName: theme.chat.connect.queue.firstText
-        )
-
-        theme.call.connect.queue.firstText = companyName(
-            using: configuration,
-            themeCompanyName: theme.call.connect.queue.firstText
-        )
+        // Apply company name to theme and get the modified theme
+        let modifiedTheme = applyCompanyName(using: configuration, theme: theme)
 
         let viewFactory = ViewFactory(
             with: modifiedTheme,
@@ -105,20 +98,20 @@ extension Glia {
         }
     }
 
-    private func applyCompanyName(using interactor: Interactor, theme: Theme) -> Theme {
+    private func applyCompanyName(using configuration: Configuration, theme: Theme) -> Theme {
         theme.chat.connect.queue.firstText = companyName(
-            using: interactor,
+            using: configuration,
             themeCompanyName: theme.chat.connect.queue.firstText
         )
 
         theme.call.connect.queue.firstText = companyName(
-            using: interactor,
+            using: configuration,
             themeCompanyName: theme.call.connect.queue.firstText
         )
 
         // Live Observation Confirmation Alert Message
         let companyName = companyName(
-            using: interactor,
+            using: configuration,
             themeCompanyName: theme.alertConfiguration.liveObservationConfirmation.message
         )
         var liveObservationConfirmationMessage = Localization.LiveObservation.Confirm.message.withCompanyName(companyName)
diff --git a/GliaWidgets/Sources/CallVisualizer/CallVisualizer.swift b/GliaWidgets/Sources/CallVisualizer/CallVisualizer.swift
index bd9893135..bedc53712 100644
--- a/GliaWidgets/Sources/CallVisualizer/CallVisualizer.swift
+++ b/GliaWidgets/Sources/CallVisualizer/CallVisualizer.swift
@@ -60,7 +60,8 @@ public final class CallVisualizer {
                     }
                 },
                 orientationManager: environment.orientationManager,
-                proximityManager: environment.proximityManager
+                proximityManager: environment.proximityManager,
+                interactorProviding: environment.interactorProviding()
             )
         )
     }()
diff --git a/GliaWidgets/Sources/CallVisualizer/Coordinator/CallVisualizer.Coordinator.Environment.swift b/GliaWidgets/Sources/CallVisualizer/Coordinator/CallVisualizer.Coordinator.Environment.swift
index fd7ec601c..59ef5151d 100644
--- a/GliaWidgets/Sources/CallVisualizer/Coordinator/CallVisualizer.Coordinator.Environment.swift
+++ b/GliaWidgets/Sources/CallVisualizer/Coordinator/CallVisualizer.Coordinator.Environment.swift
@@ -22,5 +22,6 @@ extension CallVisualizer.Coordinator {
         var eventHandler: (DelegateEvent) -> Void
         var orientationManager: OrientationManager
         var proximityManager: ProximityManager
+        var interactorProviding: Interactor?
     }
 }