From 5c9b7627a77153b4b8e501cb5d59484038c8a8ad Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Mon, 9 Oct 2023 14:20:19 +0300
Subject: [PATCH 01/22] Add modalPresentationStyle property to NINCoordinator

---
 .../View/Coordinator/Coordinator.swift               | 11 +++++++++--
 NinchatSDKSwift/NINChatSession.swift                 | 12 +++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/NinchatSDKSwift/Implementations/View/Coordinator/Coordinator.swift b/NinchatSDKSwift/Implementations/View/Coordinator/Coordinator.swift
index 186d220f..9ededca0 100644
--- a/NinchatSDKSwift/Implementations/View/Coordinator/Coordinator.swift
+++ b/NinchatSDKSwift/Implementations/View/Coordinator/Coordinator.swift
@@ -11,7 +11,7 @@ import WebRTC
 import NinchatLowLevelClient
 
 protocol Coordinator: AnyObject {
-    init(with sessionManager: NINChatSessionManager, delegate: NINChatSessionInternalDelegate?, onPresentationCompletion: @escaping () -> Void)
+    init(with sessionManager: NINChatSessionManager, delegate: NINChatSessionInternalDelegate?, modalPresentationStyle: UIModalPresentationStyle, onPresentationCompletion: @escaping () -> Void)
     func start(with queue: String?, resume: ResumeMode?, within navigation: UINavigationController?) -> UIViewController?
     func prepareNINQuestionnaireViewModel(onCompletion: @escaping () -> Void)
     func deallocate()
@@ -39,6 +39,8 @@ final class NINCoordinator: NSObject, Coordinator, UIAdaptivePresentationControl
         UIStoryboard(name: "Chat", bundle: .SDKBundle)
     }()
     
+    private let modalPresentationStyle: UIModalPresentationStyle
+    
     // MARK: - Questionnaire helpers
 
     private var hasPreAudienceQuestionnaire: Bool {
@@ -142,9 +144,10 @@ final class NINCoordinator: NSObject, Coordinator, UIAdaptivePresentationControl
 
     // MARK: - Coordinator
 
-    init(with sessionManager: NINChatSessionManager, delegate: NINChatSessionInternalDelegate?, onPresentationCompletion: @escaping () -> Void) {
+    init(with sessionManager: NINChatSessionManager, delegate: NINChatSessionInternalDelegate?, modalPresentationStyle: UIModalPresentationStyle, onPresentationCompletion: @escaping () -> Void) {
         self.delegate = delegate
         self.sessionManager = sessionManager
+        self.modalPresentationStyle = modalPresentationStyle
         self.onPresentationCompletion = onPresentationCompletion
     }
 
@@ -403,4 +406,8 @@ extension NINCoordinator {
     func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
         self.onPresentationCompletion?()
     }
+    
+    func adaptivePresentationStyle(for controller: UIPresentationController) -> UIModalPresentationStyle {
+        return modalPresentationStyle
+    }
 }
diff --git a/NinchatSDKSwift/NINChatSession.swift b/NinchatSDKSwift/NINChatSession.swift
index 38692b6c..1b8b9b93 100644
--- a/NinchatSDKSwift/NINChatSession.swift
+++ b/NinchatSDKSwift/NINChatSession.swift
@@ -25,15 +25,15 @@ public protocol NINChatSessionProtocol {
     var session: NINResult<NINLowLevelClientSession?> { get }
     var delegate: NINChatSessionDelegate? { get set }
 
-    init(configKey: String, queueID: String?, environments: [String]?, metadata: NINLowLevelClientProps?, configuration: NINSiteConfiguration?)
+    init(configKey: String, queueID: String?, environments: [String]?, metadata: NINLowLevelClientProps?, configuration: NINSiteConfiguration?, modalPresentationStyle: UIModalPresentationStyle)
     func start(completion: @escaping NinchatSessionCompletion) throws
     func start(credentials: NINSessionCredentials, completion: @escaping NinchatSessionCompletion) throws
     func chatSession(within navigationController: UINavigationController?) throws -> UIViewController?
     func deallocate()
 }
 extension NINChatSessionProtocol {
-    init(configKey: String, queueID: String?, environments: [String]?, metadata: NINLowLevelClientProps?) {
-        self.init(configKey: configKey, queueID: queueID, environments: environments, metadata: metadata, configuration: nil)
+    init(configKey: String, queueID: String?, environments: [String]?, metadata: NINLowLevelClientProps?, modalPresentationStyle: UIModalPresentationStyle) {
+        self.init(configKey: configKey, queueID: queueID, environments: environments, metadata: metadata, configuration: nil, modalPresentationStyle: modalPresentationStyle)
     }
 }
 
@@ -42,7 +42,7 @@ public final class NINChatSession: NINChatSessionProtocol, NINChatDevHelper {
         NINChatSessionManagerImpl(session: self, serverAddress: self.defaultServerAddress, audienceMetadata: self.audienceMetadata, configuration: self.configuration)
     }()
     private lazy var coordinator: Coordinator? = {
-        NINCoordinator(with: self.sessionManager, delegate: self) { [weak self] in
+        NINCoordinator(with: self.sessionManager, delegate: self, modalPresentationStyle: self.modalPresentationStyle) { [weak self] in
             self?.deallocate()
         }
     }()
@@ -61,6 +61,7 @@ public final class NINChatSession: NINChatSessionProtocol, NINChatDevHelper {
             return Constants.kProductionServerAddress.rawValue
         #endif
     }
+    private var modalPresentationStyle: UIModalPresentationStyle
 
     // MARK: - NINChatDevHelper
 
@@ -85,12 +86,13 @@ public final class NINChatSession: NINChatSessionProtocol, NINChatDevHelper {
         get { sessionManager.appDetails }
     }
 
-    public init(configKey: String, queueID: String? = nil, environments: [String]? = nil, metadata: NINLowLevelClientProps? = nil, configuration: NINSiteConfiguration? = nil) {
+    public init(configKey: String, queueID: String? = nil, environments: [String]? = nil, metadata: NINLowLevelClientProps? = nil, configuration: NINSiteConfiguration? = nil, modalPresentationStyle: UIModalPresentationStyle) {
         self.configKey = configKey
         self.queueID = queueID
         self.environments = environments
         self.audienceMetadata = metadata
         self.configuration = configuration
+        self.modalPresentationStyle = modalPresentationStyle
         self.serverAddress = Constants.kProductionServerAddress.rawValue
     }
 

From b53cf9233163b5ed338e96b490bd2b079f8f915a Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Mon, 9 Oct 2023 16:06:32 +0300
Subject: [PATCH 02/22] Add setting color for selected text in chat input

---
 NinchatSDKSwift/Implementations/Constants.swift                | 1 +
 .../View/UIKit/Input Controls/ChatInputControls.swift          | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/NinchatSDKSwift/Implementations/Constants.swift b/NinchatSDKSwift/Implementations/Constants.swift
index 50c613f5..0c38c6e6 100644
--- a/NinchatSDKSwift/Implementations/Constants.swift
+++ b/NinchatSDKSwift/Implementations/Constants.swift
@@ -54,6 +54,7 @@ public enum ColorConstants {
     case ninchatColorChatBubbleRightTint
     case ninchatColorChatBubbleComposeTint
     case ninchatColorTextareaText
+    case ninchatColorTextareaSelectedText
     case ninchatColorTextareaPlaceholder
     case ninchatColorTextareaSubmitText
     case ninchatColorChatBubbleLeftLink
diff --git a/NinchatSDKSwift/Implementations/View/UIKit/Input Controls/ChatInputControls.swift b/NinchatSDKSwift/Implementations/View/UIKit/Input Controls/ChatInputControls.swift
index 0ce34dbd..b74bba6d 100644
--- a/NinchatSDKSwift/Implementations/View/UIKit/Input Controls/ChatInputControls.swift	
+++ b/NinchatSDKSwift/Implementations/View/UIKit/Input Controls/ChatInputControls.swift	
@@ -105,6 +105,9 @@ final class ChatInputControls: UIView, ChatInputControlsProtocol {
             self.textInput.textColor = inputTextColor
             textColor = inputTextColor
         }
+        if let inputSelectedTextColor = self.delegate?.override(colorAsset: .ninchatColorTextareaSelectedText) {
+            self.textInput.tintColor = inputSelectedTextColor
+        }
         if let inputTextLayer = self.delegate?.override(layerAsset: .ninchatColorTextareaTextInput) {
             self.textInput.layer.apply(inputTextLayer)
         }

From 8beba6d7885cf949aeeebf2e40e9bad5081468b1 Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Tue, 10 Oct 2023 08:05:56 +0300
Subject: [PATCH 03/22] Make modalPresentationStyle parameter optional

---
 NinchatSDKSwift/NINChatSession.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NinchatSDKSwift/NINChatSession.swift b/NinchatSDKSwift/NINChatSession.swift
index 1b8b9b93..a97f73f2 100644
--- a/NinchatSDKSwift/NINChatSession.swift
+++ b/NinchatSDKSwift/NINChatSession.swift
@@ -86,7 +86,7 @@ public final class NINChatSession: NINChatSessionProtocol, NINChatDevHelper {
         get { sessionManager.appDetails }
     }
 
-    public init(configKey: String, queueID: String? = nil, environments: [String]? = nil, metadata: NINLowLevelClientProps? = nil, configuration: NINSiteConfiguration? = nil, modalPresentationStyle: UIModalPresentationStyle) {
+    public init(configKey: String, queueID: String? = nil, environments: [String]? = nil, metadata: NINLowLevelClientProps? = nil, configuration: NINSiteConfiguration? = nil, modalPresentationStyle: UIModalPresentationStyle = .fullScreen) {
         self.configKey = configKey
         self.queueID = queueID
         self.environments = environments

From b78221c98226dd578a7d27364c63d2adf0ab888f Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Wed, 11 Oct 2023 09:18:17 +0300
Subject: [PATCH 04/22] Add logging for setting action

---
 .../Extensions/NINLowLevelClientProps+Extension.swift            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NinchatSDKSwift/Implementations/Extensions/NINLowLevelClientProps+Extension.swift b/NinchatSDKSwift/Implementations/Extensions/NINLowLevelClientProps+Extension.swift
index 498b2f82..23defabd 100644
--- a/NinchatSDKSwift/Implementations/Extensions/NINLowLevelClientProps+Extension.swift
+++ b/NinchatSDKSwift/Implementations/Extensions/NINLowLevelClientProps+Extension.swift
@@ -118,6 +118,7 @@ extension NINLowLevelClientProps: NINLowLevelSessionProps {
     }
 
     func setAction(_ action: NINLowLevelClientActions) {
+        debugger("set action: \(action)")
         self.set(value: action.rawValue, forKey: "action")
     }
 }

From efe21de77a90725a04aa03e171b57e109c873dda Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Wed, 11 Oct 2023 09:20:43 +0300
Subject: [PATCH 05/22] Fix typo in NINGroupChatViewController

---
 .../Implementations/View/Chat.storyboard      | 57 +++++++++----------
 .../NINGroupChatViewController.swift          |  2 +-
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/NinchatSDKSwift/Implementations/View/Chat.storyboard b/NinchatSDKSwift/Implementations/View/Chat.storyboard
index 7b4b919a..603949fc 100644
--- a/NinchatSDKSwift/Implementations/View/Chat.storyboard
+++ b/NinchatSDKSwift/Implementations/View/Chat.storyboard
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="YpM-11-QhB">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="YpM-11-QhB">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -37,7 +36,7 @@
                                 <rect key="frame" x="0.0" y="108" width="414" height="250.5"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="7p5-JL-Lp6">
-                                        <rect key="frame" x="45" y="68" width="324" height="114.5"/>
+                                        <rect key="frame" x="45" y="69" width="324" height="112.5"/>
                                         <subviews>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_progress_whirl" translatesAutoresizingMaskIntoConstraints="NO" id="9Zh-Yi-kTD">
                                                 <rect key="frame" x="137" y="0.0" width="50" height="50"/>
@@ -48,7 +47,7 @@
                                                 </constraints>
                                             </imageView>
                                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="LqB-7o-Qb9">
-                                                <rect key="frame" x="46.5" y="58" width="231" height="56.5"/>
+                                                <rect key="frame" x="38.5" y="58" width="247" height="54.5"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <string key="text">Joined audience queue {{name}},
 you are next. </string>
@@ -73,7 +72,7 @@ you are next. </string>
                                 <rect key="frame" x="0.0" y="358.5" width="414" height="537.5"/>
                                 <subviews>
                                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed " textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="RGm-bx-l81">
-                                        <rect key="frame" x="20" y="50" width="374" height="56.5"/>
+                                        <rect key="frame" x="20" y="50" width="374" height="54.5"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <color key="textColor" systemColor="labelColor"/>
                                         <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="16"/>
@@ -81,7 +80,7 @@ you are next. </string>
                                         <dataDetectorType key="dataDetectorTypes" phoneNumber="YES" link="YES"/>
                                     </textView>
                                     <view contentMode="scaleToFill" placeholderIntrinsicWidth="135" placeholderIntrinsicHeight="45" translatesAutoresizingMaskIntoConstraints="NO" id="8zZ-5c-Lgm" customClass="CloseButton" customModule="NinchatSDKSwift">
-                                        <rect key="frame" x="139.5" y="146.5" width="135" height="45"/>
+                                        <rect key="frame" x="139.5" y="144.5" width="135" height="45"/>
                                         <color key="backgroundColor" red="1" green="0.0" blue="0.2431916516" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </view>
                                 </subviews>
@@ -345,13 +344,13 @@ you are next. </string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L5U-F0-l9Y" userLabel="Top part container view">
-                                <rect key="frame" x="0.0" y="88.5" width="414" height="467.5"/>
+                                <rect key="frame" x="0.0" y="88.5" width="414" height="484.5"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="qj1-1U-Y4U">
-                                        <rect key="frame" x="8" y="0.0" width="398" height="467.5"/>
+                                        <rect key="frame" x="8" y="0.0" width="398" height="484.5"/>
                                         <subviews>
                                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="How was our customer service? Please leave a rating by pressing the buttons below, or hit Skip to bypass this step." textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Ikj-NF-Jwm">
-                                                <rect key="frame" x="0.0" y="0.0" width="398" height="56.5"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="398" height="73.5"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="37" id="VQd-TN-xwp"/>
@@ -361,16 +360,16 @@ you are next. </string>
                                                 <dataDetectorType key="dataDetectorTypes" phoneNumber="YES" link="YES"/>
                                             </textView>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="B6F-ML-XSh" customClass="FacesView" customModule="NinchatSDKSwift">
-                                                <rect key="frame" x="0.0" y="64.5" width="398" height="403"/>
+                                                <rect key="frame" x="0.0" y="81.5" width="398" height="403"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             </view>
                                         </subviews>
                                     </stackView>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zhu-12-0xh">
-                                        <rect key="frame" x="8" y="0.0" width="398" height="467.5"/>
+                                        <rect key="frame" x="8" y="0.0" width="398" height="484.5"/>
                                         <subviews>
                                             <view tag="1" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Vt6-hF-T0g" userLabel="Left avatar container">
-                                                <rect key="frame" x="15" y="0.0" width="35" height="467.5"/>
+                                                <rect key="frame" x="15" y="0.0" width="35" height="484.5"/>
                                                 <subviews>
                                                     <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" fixedFrame="YES" image="icon_avatar_other" translatesAutoresizingMaskIntoConstraints="NO" id="Yfi-1D-cO5">
                                                         <rect key="frame" x="0.0" y="12" width="35" height="35"/>
@@ -387,7 +386,7 @@ you are next. </string>
                                                 <rect key="frame" x="58" y="9.5" width="71.5" height="40"/>
                                                 <subviews>
                                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="999" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Dr Koistinen" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vdr-sU-emu">
-                                                        <rect key="frame" x="0.0" y="11" width="71.5" height="18"/>
+                                                        <rect key="frame" x="0.0" y="11" width="76.5" height="18"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="14"/>
                                                         <nil key="highlightedColor"/>
@@ -479,7 +478,7 @@ you are next. </string>
                                 </connections>
                             </button>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed " textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="yEN-f5-12p">
-                                <rect key="frame" x="8" y="580" width="398" height="56.5"/>
+                                <rect key="frame" x="8" y="597" width="398" height="54.5"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <color key="textColor" systemColor="labelColor"/>
                                 <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="16"/>
@@ -543,13 +542,13 @@ you are next. </string>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wa1-0U-Lj7" userLabel="Top container view">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="316.5"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="314.5"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wXY-o9-goJ" userLabel="Welcome text container view">
-                                        <rect key="frame" x="0.0" y="0.0" width="414" height="136.5"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="414" height="134.5"/>
                                         <subviews>
                                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed " textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="sio-TM-FLm">
-                                                <rect key="frame" x="20" y="50" width="374" height="56.5"/>
+                                                <rect key="frame" x="20" y="50" width="374" height="54.5"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <color key="textColor" systemColor="labelColor"/>
                                                 <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="16"/>
@@ -566,7 +565,7 @@ you are next. </string>
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MP0-uv-PXT" userLabel="Button container view">
-                                        <rect key="frame" x="0.0" y="136.5" width="414" height="180"/>
+                                        <rect key="frame" x="0.0" y="134.5" width="414" height="180"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="kgP-Ty-5vY">
                                                 <rect key="frame" x="87" y="5" width="240" height="60"/>
@@ -643,10 +642,10 @@ you are next. </string>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3xg-1C-FCR" userLabel="Bottom container view">
-                                <rect key="frame" x="0.0" y="316.5" width="414" height="579.5"/>
+                                <rect key="frame" x="0.0" y="314.5" width="414" height="581.5"/>
                                 <subviews>
                                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="D4q-k8-gpN">
-                                        <rect key="frame" x="20" y="40" width="374" height="117"/>
+                                        <rect key="frame" x="20" y="40" width="374" height="131"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. </string>
                                         <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="16"/>
@@ -753,13 +752,13 @@ you are next. </string>
                                         <rect key="frame" x="0.0" y="0.0" width="414" height="199"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="center" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="xv2-Vb-E7a">
-                                                <rect key="frame" x="0.0" y="16" width="414" height="134"/>
+                                                <rect key="frame" x="0.0" y="16" width="414" height="132"/>
                                                 <subviews>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="equalSpacing" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="oMz-g1-Vcu">
-                                                        <rect key="frame" x="154" y="0.0" width="106.5" height="57"/>
+                                                        <rect key="frame" x="149.5" y="0.0" width="115.5" height="55"/>
                                                         <subviews>
                                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_camera_on" translatesAutoresizingMaskIntoConstraints="NO" id="BDs-BD-POF">
-                                                                <rect key="frame" x="20.5" y="0.0" width="65" height="26"/>
+                                                                <rect key="frame" x="25" y="0.0" width="65" height="26"/>
                                                                 <color key="tintColor" red="0.49411764705882355" green="0.58431372549019611" blue="0.68627450980392157" alpha="1" colorSpace="calibratedRGB"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="26" id="17B-Jk-EB8"/>
@@ -767,7 +766,7 @@ you are next. </string>
                                                                 </constraints>
                                                             </imageView>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Video Meeting" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gM3-CS-0gI">
-                                                                <rect key="frame" x="0.0" y="34" width="106.5" height="23"/>
+                                                                <rect key="frame" x="0.0" y="34" width="115.5" height="21"/>
                                                                 <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="18"/>
                                                                 <color key="textColor" red="0.14117647058823529" green="0.14117647058823529" blue="0.14117647058823529" alpha="1" colorSpace="calibratedRGB"/>
                                                                 <nil key="highlightedColor"/>
@@ -775,7 +774,7 @@ you are next. </string>
                                                         </subviews>
                                                     </stackView>
                                                     <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rMZ-Jf-WSH" customClass="JoinVideoButton" customModule="NinchatSDKSwift">
-                                                        <rect key="frame" x="117" y="73" width="180" height="45"/>
+                                                        <rect key="frame" x="117" y="71" width="180" height="45"/>
                                                         <color key="backgroundColor" red="0.0" green="0.54117647059999996" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="45" id="Wdj-LA-s0H"/>
@@ -787,11 +786,11 @@ you are next. </string>
                                                             <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         </state>
                                                         <connections>
-                                                            <action selector="onJoinVidoCallDidTap:" destination="rkl-lh-0pE" eventType="touchUpInside" id="IOY-mQ-bIk"/>
+                                                            <action selector="onJoinVideoCallDidTap:" destination="rkl-lh-0pE" eventType="touchUpInside" id="IOY-mQ-bIk"/>
                                                         </connections>
                                                     </button>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qEb-zT-pbh">
-                                                        <rect key="frame" x="207" y="134" width="0.0" height="0.0"/>
+                                                        <rect key="frame" x="207" y="132" width="0.0" height="0.0"/>
                                                         <fontDescription key="fontDescription" name="SourceSansPro-Regular" family="Source Sans Pro" pointSize="15"/>
                                                         <color key="textColor" red="0.14117647058823529" green="0.14117647058823529" blue="0.14117647058823529" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
@@ -1004,7 +1003,7 @@ you are next. </string>
         <image name="icon_chat_toggle" width="19" height="19"/>
         <image name="icon_progress_whirl" width="800" height="800"/>
         <systemColor name="labelColor">
-            <color red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
diff --git a/NinchatSDKSwift/Implementations/View/ViewController/NINGroupChatViewController.swift b/NinchatSDKSwift/Implementations/View/ViewController/NINGroupChatViewController.swift
index ed806824..7c693625 100644
--- a/NinchatSDKSwift/Implementations/View/ViewController/NINGroupChatViewController.swift
+++ b/NinchatSDKSwift/Implementations/View/ViewController/NINGroupChatViewController.swift
@@ -326,7 +326,7 @@ final class NINGroupChatViewController: UIViewController, DeallocatableViewContr
 
     // MARK: - Video Call
 
-    @IBAction func onJoinVidoCallDidTap(_ sender: Any) {
+    @IBAction func onJoinVideoCallDidTap(_ sender: Any) {
         view.endEditing(true)
         viewModel.joinVideoCall(inside: videoViewContainer) { [weak self] error in
             if error != nil {

From 0cc5090cc0ea7e270f1320e5898b28ee6af58c18 Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Wed, 11 Oct 2023 18:44:52 +0300
Subject: [PATCH 06/22] Add JitsiVideoWebView

---
 .../View Model/NINGroupChatViewModel.swift    | 117 ++++++-----
 .../UIKit/Video View/JitsiVideoWebView.swift  | 198 ++++++++++++++++++
 2 files changed, 259 insertions(+), 56 deletions(-)
 create mode 100644 NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift

diff --git a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift
index 9f6fa069..8b92bc85 100644
--- a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
+++ b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
@@ -22,16 +22,18 @@ protocol NINGroupChatViewModel: AnyObject, NINChatStateProtocol, NINChatMessageP
     func leaveVideoCall()
 }
 
-final class NINGroupChatViewModelImpl: NSObject, NINGroupChatViewModel, JitsiMeetViewDelegate {
+final class NINGroupChatViewModelImpl: NSObject, NINGroupChatViewModel {
     private weak var sessionManager: NINChatSessionManager?
     private var pipViewCoordinator: PiPViewCoordinator?
     private var jitsiView: JitsiMeetView?
+    private var jitsiVideoWebView: JitsiVideoWebView?
     private var typingStatus = false
     private var typingStatusQueue: DispatchWorkItem?
     private var isSelectingMedia = false
 
     var hasJoinedVideo: Bool {
-        jitsiView?.delegate != nil
+        jitsiVideoWebView != nil
+       // jitsiView?.delegate != nil
     }
 
     var backlogMessages: String? {
@@ -114,6 +116,7 @@ final class NINGroupChatViewModelImpl: NSObject, NINGroupChatViewModel, JitsiMee
                 case let .failure(error):
                     completion(error)
                 case let .success(credentials):
+                    // Configure url request
                     let avatarConfig = AvatarConfig(forUser: sessionManager)
                     let user = sessionManager.myUser
                     let iconURL = avatarConfig.imageOverrideURL ?? user?.iconURL
@@ -128,63 +131,46 @@ final class NINGroupChatViewModelImpl: NSObject, NINGroupChatViewModel, JitsiMee
                         serverAddress.removeSubrange(serverAddress.startIndex ..< endIdx)
                     }
                     let jitsiServerAddress = "https://jitsi-www." + serverAddress
-                    let options = JitsiMeetConferenceOptions.fromBuilder {
-                        $0.serverURL = URL(string: jitsiServerAddress)
-                        $0.userInfo = .init(
-                            displayName: userName,
-                            andEmail: nil,
-                            andAvatar: iconURL.flatMap { URL(string: $0) }
-                        )
-                        $0.room = credentials.room
-                        $0.token = credentials.token
-
-                        $0.setFeatureFlag("add-people.enabled", withBoolean: false)
-                        $0.setFeatureFlag("audio-mute.enabled", withBoolean: true)
-                        $0.setFeatureFlag("calendar.enabled", withBoolean: false)
-                        $0.setFeatureFlag("call-integration.enabled", withBoolean: true) // android: false
-                        $0.setFeatureFlag("car-mode.enabled", withBoolean: false)
-                        $0.setFeatureFlag("close-captions.enabled", withBoolean: false)
-                        $0.setFeatureFlag("conference-timer.enabled", withBoolean: true)
-                        $0.setFeatureFlag("chat.enabled", withBoolean: false)
-                        $0.setFeatureFlag("filmstrip.enabled", withBoolean: true)
-                        $0.setFeatureFlag("fullscreen.enabled", withBoolean: true)
-                        $0.setFeatureFlag("invite.enabled", withBoolean: false)
-                        $0.setFeatureFlag("ios.screensharing.enabled", withBoolean: false)
-                        $0.setFeatureFlag("speakerstats.enabled", withBoolean: false)
-                        $0.setFeatureFlag("kick-out.enabled", withBoolean: false)
-                        $0.setFeatureFlag("live-streaming.enabled", withBoolean: false)
-                        $0.setFeatureFlag("meeting-name.enabled", withBoolean: false)
-                        $0.setFeatureFlag("meeting-password.enabled", withBoolean: false)
-                        $0.setFeatureFlag("notifications.enabled", withBoolean: false)
-                        $0.setFeatureFlag("overflow-menu.enabled", withBoolean: true)
-                        $0.setFeatureFlag("pip.enabled", withBoolean: false)
-                        $0.setFeatureFlag("pip-while-screen-sharing.enabled", withBoolean: false)
-                        $0.setFeatureFlag("prejoinpage.enabled", withBoolean: true)
-                        $0.setFeatureFlag("prejoinpage.hide-display-name.enabled", withBoolean: true)
-                        $0.setFeatureFlag("raise-hand.enabled", withBoolean: false)
-                        $0.setFeatureFlag("recording.enabled", withBoolean: false)
-                        $0.setFeatureFlag("server-url-change.enabled", withBoolean: false)
-                        $0.setFeatureFlag("settings.enabled", withBoolean: true)
-                        $0.setFeatureFlag("tile-view.enabled", withBoolean: true)
-                        $0.setFeatureFlag("toolbox.alwaysVisible", withBoolean: false)
-                        $0.setFeatureFlag("toolbox.enabled", withBoolean: true)
-                        $0.setFeatureFlag("video-mute.enabled", withBoolean: true)
-                        $0.setFeatureFlag("video-share.enabled", withBoolean: false)
-                        $0.setFeatureFlag("welcomepage.enabled", withBoolean: false)
-                        $0.setFeatureFlag("help.enabled", withBoolean: false)
-                        $0.setFeatureFlag("lobby-mode.enabled", withBoolean: false)
-                        $0.setFeatureFlag("reactions.enabled", withBoolean: false)
-                        $0.setFeatureFlag("security-options.enabled", withBoolean: true)
-                        $0.setFeatureFlag("settings.profile-section.enabled", withBoolean: false)
-                        $0.setFeatureFlag("settings.conference-section-only-self-view.enabled", withBoolean: true)
-                        $0.setFeatureFlag("settings.links-section.enabled", withBoolean: false)
-                        $0.setFeatureFlag("settings.build-info-section.enabled", withBoolean: false)
-                        $0.setFeatureFlag("settings.advanced-section.enabled", withBoolean: false)
-                        $0.setFeatureFlag("participants.enabled", withValue: false)
+                    let domain = jitsiServerAddress.replacingOccurrences(of: "https://", with: "")
+                    let room = credentials.room
+                    let jwt = credentials.token
+                    let displayName = userName
+                    let avatarUrl = iconURL.flatMap { URL(string: $0) }
+                    let language = "fi" // TODO: Put proper language
+                    
+                    let urlString = "https://ninchat.com/new/jitsi-meet.html?jwt=\(jwt)&roomName=\(room)&domain=\(domain)&lang=\(language)"
+                    
+                    print(urlString)
+                    
+                    guard let url = URL(string: urlString) else {
+                        completion(NinchatError(type: "unknown", props: nil))
+                        return
                     }
+                    
+                    let urlRequest = URLRequest(url: url)
+                    
+                    // Add JitsiVideoWebView
+                    let jitsiVideoWebView = JitsiVideoWebView(frame: .zero)
+                    self.jitsiVideoWebView = jitsiVideoWebView
+                    jitsiVideoWebView.delegate = self
+                    jitsiVideoWebView.translatesAutoresizingMaskIntoConstraints = false
+                    parentView.addSubview(jitsiVideoWebView)
+                    NSLayoutConstraint.activate([
+                        jitsiVideoWebView.topAnchor.constraint(equalTo: parentView.topAnchor),
+                        jitsiVideoWebView.bottomAnchor.constraint(equalTo: parentView.bottomAnchor),
+                        jitsiVideoWebView.leadingAnchor.constraint(equalTo: parentView.leadingAnchor),
+                        jitsiVideoWebView.trailingAnchor.constraint(equalTo: parentView.trailingAnchor)
+                    ])
+                    
+                    // Load url request
+                    jitsiVideoWebView.loadJitsiMeeting(for: urlRequest)
+                    
+                    
+                    /*
                     let jitsiMeetView = self.jitsiView ?? JitsiMeetView()
                     jitsiMeetView.delegate = self
                     jitsiMeetView.join(options)
+                    
 
                     if self.pipViewCoordinator == nil {
                         self.pipViewCoordinator = PiPViewCoordinator(withView: jitsiMeetView)
@@ -195,6 +181,8 @@ final class NINGroupChatViewModelImpl: NSObject, NINGroupChatViewModel, JitsiMee
 
                     self.jitsiView = jitsiMeetView
                     self.pipViewCoordinator?.show()
+                     
+                    */
 
                     completion(nil)
                 }
@@ -212,11 +200,20 @@ final class NINGroupChatViewModelImpl: NSObject, NINGroupChatViewModel, JitsiMee
         guard hasJoinedVideo else {
             return
         }
+        
+        if force {
+            jitsiVideoWebView?.hangUp()
+        }
+        jitsiVideoWebView?.delegate = nil
+        jitsiVideoWebView = nil
+        
+        /*
         pipViewCoordinator?.hide()
         if force {
             jitsiView?.hangUp()
         }
         jitsiView?.delegate = nil
+        */
     }
 }
 
@@ -381,9 +378,17 @@ extension NINGroupChatViewModelImpl {
 
 // MARK: - Jitsi Delegate
 
-extension NINGroupChatViewModelImpl {
+extension NINGroupChatViewModelImpl: JitsiMeetViewDelegate {
     func ready(toClose data: [AnyHashable : Any]!) {
         leaveVideoCall(force: false)
         onGroupVideoReadyToClose?()
     }
 }
+
+
+extension NINGroupChatViewModelImpl: JitsiVideoWebViewDelegate {
+    func readyToClose() {
+        leaveVideoCall(force: false)
+        onGroupVideoReadyToClose?()
+    }
+}
diff --git a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift
new file mode 100644
index 00000000..fe82c4d0
--- /dev/null
+++ b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
@@ -0,0 +1,198 @@
+//
+//  JitsiVideoWebView.swift
+//  AnyCodable-FlightSchool
+//
+//  Created by Andrei Sadovnicov on 11.10.2023.
+//
+
+import UIKit
+import WebKit
+
+protocol JitsiVideoWebViewDelegate: class {
+    func readyToClose()
+}
+
+class JitsiVideoWebView: UIView {
+
+    // MARK: - PROPERTIES
+    
+    // MARK: - Web view
+    private var webView: WKWebView!
+    
+    // MARK: - Delegate
+    var delegate: JitsiVideoWebViewDelegate?
+    
+    // MARK: - Debug mode
+    private var isDebugMode = false
+    
+    // MARK: - INITIALIZERS
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.backgroundColor = .clear
+    }
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+        self.backgroundColor = .clear
+    }
+    
+    deinit {
+        print("JitsiVideoWebView deinited!")
+    }
+}
+
+// MARK: - WKWebView setup
+extension JitsiVideoWebView {
+    private func addWebView() {
+        // Initialize WKWebView with configuration
+        let webConfig = WKWebViewConfiguration()
+        webConfig.allowsInlineMediaPlayback = true
+        webConfig.mediaTypesRequiringUserActionForPlayback = []
+        webConfig.preferences.setValue(true, forKey: "developerExtrasEnabled") // uncomment this if you want to debug using the web inspector
+        
+        // Enable JavaScript messaging
+        let contentController = WKUserContentController()
+        contentController.add(self, name: "videoConferenceJoined")
+        contentController.add(self, name: "videoConferenceLeft")
+        webConfig.userContentController = contentController
+        
+        self.webView = WKWebView(frame: .zero, configuration: webConfig)
+        
+        // Set a custom non-iPhone user agent, otherwise Jitsi might not load
+        webView.customUserAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36"
+        
+        // Set navigation delegate
+        webView.navigationDelegate = self
+        
+        // Add web view
+        webView.translatesAutoresizingMaskIntoConstraints = false
+        self.addSubview(webView)
+        NSLayoutConstraint.activate([
+            webView.topAnchor.constraint(equalTo: self.topAnchor),
+            webView.bottomAnchor.constraint(equalTo: self.bottomAnchor),
+            webView.leadingAnchor.constraint(equalTo: self.leadingAnchor),
+            webView.trailingAnchor.constraint(equalTo: self.trailingAnchor)
+        ])
+    }
+}
+
+// MARK: - Loading Jitsi
+extension JitsiVideoWebView {
+    func loadJitsiMeeting(for urlRequest: URLRequest) {
+        if webView == nil {
+            addWebView()
+        }
+        
+        if isDebugMode {
+            let htmlContent = getJitsiVideoWebViewHtml(for: urlRequest)
+            webView.loadHTMLString(htmlContent, baseURL: nil)
+        } else {
+            webView.load(urlRequest)
+        }
+    }
+}
+
+// MARK: - Finishing a Jitsi meeting
+extension JitsiVideoWebView {
+    func hangUp() {
+        webView.evaluateJavaScript("hangUpConference();", completionHandler: { [weak self](result, error) in
+            self?.webView?.stopLoading()
+            self?.webView?.navigationDelegate = nil
+            self?.webView?.removeFromSuperview()
+            self?.webView = nil
+        })
+    }
+}
+
+// MARK: - WKNavigationDelegate
+extension JitsiVideoWebView: WKNavigationDelegate {
+    func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
+        print("WebView error: \(error.localizedDescription)")
+    }
+}
+
+// MARK: - WKScriptMessageHandler
+extension JitsiVideoWebView: WKScriptMessageHandler {
+    func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
+        switch message.name {
+        case "videoConferenceJoined":
+            print("Video conference joined!")
+        case "videoConferenceLeft":
+            print("Video conference left!")
+            delegate?.readyToClose()
+        default:
+            break
+        }
+    }
+}
+
+// MARK: - Debugging
+extension JitsiVideoWebView {
+    func getJitsiVideoWebViewHtml(for urlRequest: URLRequest) -> String {
+        let url = urlRequest.url!
+        let components = URLComponents(url: url, resolvingAgainstBaseURL: false)!
+        let domain = components.queryItems?.first(where: { $0.name == "domain" })?.value ?? ""
+        let roomName = components.queryItems?.first(where: { $0.name == "roomName" })?.value ?? ""
+        let jwt = components.queryItems?.first(where: { $0.name == "jwt" })?.value ?? ""
+        let lang = components.queryItems?.first(where: { $0.name == "lang" })?.value ?? "en"
+        
+        let htmlContent = """
+        <!DOCTYPE html>
+        <html>
+            <head>
+                <meta name="viewport" content="width=device-width, initial-scale=1.0">
+                <script src="https://jitsi-www.ninchat.com/libs/external_api.min.js"></script>
+            </head>
+            <body style="margin: 0;">
+                <div id="jitsi-meet" style="height: 100vh; overflow-y: hidden;"></div>
+                <script>
+                    const domain = '\(domain)';
+                    const roomName = '\(roomName)';
+                    const jwt = '\(jwt)';
+                    const lang = '\(lang)';
+
+                    const options = {
+                        roomName: roomName,
+                        jwt: jwt,
+                        lang: lang,
+                        width: '100%',
+                        height: '100%',
+                        parentNode: document.querySelector("#jitsi-meet"),
+                        configOverwrite: {
+                            "prejoinConfig.enabled": true,
+                            "disableInviteFunctions": true,
+                            "disableThirdPartyRequests": true,
+                            "startWithVideoMuted": false,
+                            "disableAudioLevels": true,
+                            "disableRemoteMute": false,
+                            "startWithAudioMuted": false,
+                            "startSilent": false
+                        },
+                        interfaceConfigOverwrite: {
+                            // Add any interface config options here
+                        }
+                    };
+
+                    var api = new JitsiMeetExternalAPI(domain, options);
+
+                    // Add event listeners
+                    api.addEventListener('videoConferenceJoined', function(event) {
+                        window.webkit.messageHandlers.videoConferenceJoined.postMessage(event);
+                    });
+
+                    api.addEventListener('videoConferenceLeft', function(event) {
+                        window.webkit.messageHandlers.videoConferenceLeft.postMessage(event);
+                    });
+
+                    // Function to hang up the conference
+                    function hangUpConference() {
+                        api.executeCommand('hangup');
+                    }
+                </script>
+            </body>
+        </html>
+        """
+        
+        return htmlContent
+    }
+}

From 09c923070a7d495d052a469ff1840d15f24d223c Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Thu, 12 Oct 2023 09:34:18 +0300
Subject: [PATCH 07/22] Change jitsi web view initialization

---
 .../View Model/NINGroupChatViewModel.swift        | 15 +++------------
 .../View/UIKit/Video View/JitsiVideoWebView.swift | 11 +++--------
 .../NINGroupChatViewController.swift              | 13 +++++++++++++
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift
index 8b92bc85..180b5869 100644
--- a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
+++ b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
@@ -150,21 +150,12 @@ final class NINGroupChatViewModelImpl: NSObject, NINGroupChatViewModel {
                     let urlRequest = URLRequest(url: url)
                     
                     // Add JitsiVideoWebView
-                    let jitsiVideoWebView = JitsiVideoWebView(frame: .zero)
+                    let jitsiVideoWebView = parentView.subviews.filter { $0 is JitsiVideoWebView }.first as? JitsiVideoWebView
                     self.jitsiVideoWebView = jitsiVideoWebView
-                    jitsiVideoWebView.delegate = self
-                    jitsiVideoWebView.translatesAutoresizingMaskIntoConstraints = false
-                    parentView.addSubview(jitsiVideoWebView)
-                    NSLayoutConstraint.activate([
-                        jitsiVideoWebView.topAnchor.constraint(equalTo: parentView.topAnchor),
-                        jitsiVideoWebView.bottomAnchor.constraint(equalTo: parentView.bottomAnchor),
-                        jitsiVideoWebView.leadingAnchor.constraint(equalTo: parentView.leadingAnchor),
-                        jitsiVideoWebView.trailingAnchor.constraint(equalTo: parentView.trailingAnchor)
-                    ])
+                    jitsiVideoWebView?.delegate = self
                     
                     // Load url request
-                    jitsiVideoWebView.loadJitsiMeeting(for: urlRequest)
-                    
+                    jitsiVideoWebView?.loadJitsiMeeting(for: urlRequest)
                     
                     /*
                     let jitsiMeetView = self.jitsiView ?? JitsiMeetView()
diff --git a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift
index fe82c4d0..ce4c7547 100644
--- a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
+++ b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
@@ -29,11 +29,13 @@ class JitsiVideoWebView: UIView {
     override init(frame: CGRect) {
         super.init(frame: frame)
         self.backgroundColor = .clear
+        self.addWebView()
     }
     
     required init?(coder: NSCoder) {
         super.init(coder: coder)
         self.backgroundColor = .clear
+        self.addWebView()
     }
     
     deinit {
@@ -79,10 +81,6 @@ extension JitsiVideoWebView {
 // MARK: - Loading Jitsi
 extension JitsiVideoWebView {
     func loadJitsiMeeting(for urlRequest: URLRequest) {
-        if webView == nil {
-            addWebView()
-        }
-        
         if isDebugMode {
             let htmlContent = getJitsiVideoWebViewHtml(for: urlRequest)
             webView.loadHTMLString(htmlContent, baseURL: nil)
@@ -96,10 +94,7 @@ extension JitsiVideoWebView {
 extension JitsiVideoWebView {
     func hangUp() {
         webView.evaluateJavaScript("hangUpConference();", completionHandler: { [weak self](result, error) in
-            self?.webView?.stopLoading()
-            self?.webView?.navigationDelegate = nil
-            self?.webView?.removeFromSuperview()
-            self?.webView = nil
+            print("Hang up result: \(result), error: \(error)")
         })
     }
 }
diff --git a/NinchatSDKSwift/Implementations/View/ViewController/NINGroupChatViewController.swift b/NinchatSDKSwift/Implementations/View/ViewController/NINGroupChatViewController.swift
index 7c693625..f2306218 100644
--- a/NinchatSDKSwift/Implementations/View/ViewController/NINGroupChatViewController.swift
+++ b/NinchatSDKSwift/Implementations/View/ViewController/NINGroupChatViewController.swift
@@ -233,6 +233,7 @@ final class NINGroupChatViewController: UIViewController, DeallocatableViewContr
     // MARK: - Setup View
 
     private func setupView() {
+        self.addJitsiVideoWebView()
         self.setupGestures()
         self.reloadView()
         self.updateInputContainerHeight(94.0)
@@ -494,6 +495,18 @@ extension NINGroupChatViewController {
         }
     }
 
+    private func addJitsiVideoWebView() {
+        let jitsiVideoWebView = JitsiVideoWebView(frame: .zero)
+        jitsiVideoWebView.translatesAutoresizingMaskIntoConstraints = false
+        videoViewContainer.addSubview(jitsiVideoWebView)
+        NSLayoutConstraint.activate([
+            jitsiVideoWebView.topAnchor.constraint(equalTo: videoViewContainer.topAnchor),
+            jitsiVideoWebView.bottomAnchor.constraint(equalTo: videoViewContainer.bottomAnchor),
+            jitsiVideoWebView.leadingAnchor.constraint(equalTo: videoViewContainer.leadingAnchor),
+            jitsiVideoWebView.trailingAnchor.constraint(equalTo: videoViewContainer.trailingAnchor)
+        ])
+    }
+    
     private func markVideoCallAsFinished() {
         moveVideoContainerToBack()
         markChatButton(hasUnreadMessages: false)

From 9613c20663dc97c570afd49e5a4afac354da7edd Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Thu, 12 Oct 2023 10:05:07 +0300
Subject: [PATCH 08/22] Update the hangUp method in JitsiVideoWebView

---
 .../Implementations/View Model/NINGroupChatViewModel.swift   | 4 ++--
 .../View/UIKit/Video View/JitsiVideoWebView.swift            | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift
index 180b5869..0bc38c85 100644
--- a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
+++ b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
@@ -195,8 +195,8 @@ final class NINGroupChatViewModelImpl: NSObject, NINGroupChatViewModel {
         if force {
             jitsiVideoWebView?.hangUp()
         }
-        jitsiVideoWebView?.delegate = nil
-        jitsiVideoWebView = nil
+        self.jitsiVideoWebView?.delegate = nil
+        self.jitsiVideoWebView = nil
         
         /*
         pipViewCoordinator?.hide()
diff --git a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift
index ce4c7547..e3cde254 100644
--- a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
+++ b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
@@ -93,9 +93,7 @@ extension JitsiVideoWebView {
 // MARK: - Finishing a Jitsi meeting
 extension JitsiVideoWebView {
     func hangUp() {
-        webView.evaluateJavaScript("hangUpConference();", completionHandler: { [weak self](result, error) in
-            print("Hang up result: \(result), error: \(error)")
-        })
+        webView.evaluateJavaScript("hangUpConference();")
     }
 }
 
@@ -113,7 +111,6 @@ extension JitsiVideoWebView: WKScriptMessageHandler {
         case "videoConferenceJoined":
             print("Video conference joined!")
         case "videoConferenceLeft":
-            print("Video conference left!")
             delegate?.readyToClose()
         default:
             break

From 92e775ff180d18c4f3132745b6a83a8dd863fa2a Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Thu, 12 Oct 2023 10:32:39 +0300
Subject: [PATCH 09/22] Remove JitsiMeetSDK from NINGroupChatViewModel

---
 .../View Model/NINGroupChatViewModel.swift    | 32 +------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift
index 0bc38c85..e77eb35f 100644
--- a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
+++ b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
@@ -5,7 +5,6 @@
 //
 
 import Foundation
-import JitsiMeetSDK
 
 protocol NINGroupChatViewModel: AnyObject, NINChatStateProtocol, NINChatMessageProtocol, NINChatPermissionsProtocol, NINChatAttachmentProtocol {
     var hasJoinedVideo: Bool { get }
@@ -24,8 +23,6 @@ protocol NINGroupChatViewModel: AnyObject, NINChatStateProtocol, NINChatMessageP
 
 final class NINGroupChatViewModelImpl: NSObject, NINGroupChatViewModel {
     private weak var sessionManager: NINChatSessionManager?
-    private var pipViewCoordinator: PiPViewCoordinator?
-    private var jitsiView: JitsiMeetView?
     private var jitsiVideoWebView: JitsiVideoWebView?
     private var typingStatus = false
     private var typingStatusQueue: DispatchWorkItem?
@@ -156,25 +153,6 @@ final class NINGroupChatViewModelImpl: NSObject, NINGroupChatViewModel {
                     
                     // Load url request
                     jitsiVideoWebView?.loadJitsiMeeting(for: urlRequest)
-                    
-                    /*
-                    let jitsiMeetView = self.jitsiView ?? JitsiMeetView()
-                    jitsiMeetView.delegate = self
-                    jitsiMeetView.join(options)
-                    
-
-                    if self.pipViewCoordinator == nil {
-                        self.pipViewCoordinator = PiPViewCoordinator(withView: jitsiMeetView)
-                    }
-                    self.pipViewCoordinator?.configureAsStickyView(withParentView: parentView)
-
-                    jitsiMeetView.alpha = 0
-
-                    self.jitsiView = jitsiMeetView
-                    self.pipViewCoordinator?.show()
-                     
-                    */
-
                     completion(nil)
                 }
             }
@@ -367,15 +345,7 @@ extension NINGroupChatViewModelImpl {
     }
 }
 
-// MARK: - Jitsi Delegate
-
-extension NINGroupChatViewModelImpl: JitsiMeetViewDelegate {
-    func ready(toClose data: [AnyHashable : Any]!) {
-        leaveVideoCall(force: false)
-        onGroupVideoReadyToClose?()
-    }
-}
-
+// MARK: - JitsiVideoWebViewDelegate
 
 extension NINGroupChatViewModelImpl: JitsiVideoWebViewDelegate {
     func readyToClose() {

From 72a937621ca556d3b2535935566ac36c33f0be9a Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Thu, 12 Oct 2023 11:46:06 +0300
Subject: [PATCH 10/22] Add JitsiVideoWebView to the NinchatSDKSwift project

---
 NinchatSDKSwift.xcodeproj/project.pbxproj                   | 6 +++++-
 .../Implementations/View Model/NINGroupChatViewModel.swift  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/NinchatSDKSwift.xcodeproj/project.pbxproj b/NinchatSDKSwift.xcodeproj/project.pbxproj
index 4c53b25b..1589e3aa 100644
--- a/NinchatSDKSwift.xcodeproj/project.pbxproj
+++ b/NinchatSDKSwift.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -17,6 +17,7 @@
 		5C7A2AF227D20AF90067F2F1 /* QuestionnaireCellForm.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5C7A2AF127D20AF90067F2F1 /* QuestionnaireCellForm.xib */; };
 		5CD4F1C82540CAAF009856AC /* Notification+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CD4F1C62540CAAF009856AC /* Notification+Extension.swift */; };
 		5CD4F1C92540CAAF009856AC /* KeyboardHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CD4F1C72540CAAF009856AC /* KeyboardHandler.swift */; };
+		75990FEF2AD7E95500EBC306 /* JitsiVideoWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75990FEE2AD7E95500EBC306 /* JitsiVideoWebView.swift */; };
 		7C44F1A84C25C4445CF3B955 /* Pods_NinchatSDKSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 495ADA60487CD354EDC07332 /* Pods_NinchatSDKSwift.framework */; };
 		851E359923B1214E000FA966 /* AutolayouTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 851E359823B1214E000FA966 /* AutolayouTests.swift */; };
 		851ECF6423969297006D332F /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 851ECF6323969297006D332F /* README.md */; };
@@ -265,6 +266,7 @@
 		5CD4F1C62540CAAF009856AC /* Notification+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Notification+Extension.swift"; sourceTree = "<group>"; };
 		5CD4F1C72540CAAF009856AC /* KeyboardHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardHandler.swift; sourceTree = "<group>"; };
 		62C8D99D572F0DB4B5E6D255 /* Pods-NinchatSDKSwiftUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NinchatSDKSwiftUITests.release.xcconfig"; path = "Target Support Files/Pods-NinchatSDKSwiftUITests/Pods-NinchatSDKSwiftUITests.release.xcconfig"; sourceTree = "<group>"; };
+		75990FEE2AD7E95500EBC306 /* JitsiVideoWebView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JitsiVideoWebView.swift; sourceTree = "<group>"; };
 		7B50C1E321841F3749D5D05A /* Pods-NinchatSDKSwiftServerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NinchatSDKSwiftServerTests.release.xcconfig"; path = "Target Support Files/Pods-NinchatSDKSwiftServerTests/Pods-NinchatSDKSwiftServerTests.release.xcconfig"; sourceTree = "<group>"; };
 		832BEC3E467C0EEE45282F1B /* Pods-NinchatSDKSwiftTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NinchatSDKSwiftTests.debug.xcconfig"; path = "Target Support Files/Pods-NinchatSDKSwiftTests/Pods-NinchatSDKSwiftTests.debug.xcconfig"; sourceTree = "<group>"; };
 		851E359823B1214E000FA966 /* AutolayouTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutolayouTests.swift; sourceTree = "<group>"; };
@@ -611,6 +613,7 @@
 		8530EC8223AD405200BAA52A /* Video View */ = {
 			isa = PBXGroup;
 			children = (
+				75990FEE2AD7E95500EBC306 /* JitsiVideoWebView.swift */,
 				8530EC8423AD405200BAA52A /* VideoView.swift */,
 				8530EC8323AD405200BAA52A /* VideoView.xib */,
 			);
@@ -1548,6 +1551,7 @@
 				91A16D46F4A792C00EC23086 /* ComposeMessage.swift in Sources */,
 				91A165F76F51AC329049D95E /* Dictionary+Extension.swift in Sources */,
 				91A1637BC9B1BCF029EE608F /* Queue.swift in Sources */,
+				75990FEF2AD7E95500EBC306 /* JitsiVideoWebView.swift in Sources */,
 				91A166157BBD01A10A8A6520 /* WebRTCServerInfo.swift in Sources */,
 				91A161BA5B39C92B92F6B56B /* RTCSessionDescription+Extension.swift in Sources */,
 				91A164EF2633C3EEEC657848 /* RTCIceCandidate+Extension.swift in Sources */,
diff --git a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift
index e77eb35f..fd6fbe11 100644
--- a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
+++ b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file.
 //
 
-import Foundation
+import UIKit
 
 protocol NINGroupChatViewModel: AnyObject, NINChatStateProtocol, NINChatMessageProtocol, NINChatPermissionsProtocol, NINChatAttachmentProtocol {
     var hasJoinedVideo: Bool { get }

From ba0246581535f74f85d881433870535cc2e1f8f7 Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Thu, 12 Oct 2023 11:49:42 +0300
Subject: [PATCH 11/22] Update JitsiVideoWebViewDelegate

---
 .../View/UIKit/Video View/JitsiVideoWebView.swift               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift
index e3cde254..ffed277e 100644
--- a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
+++ b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
@@ -8,7 +8,7 @@
 import UIKit
 import WebKit
 
-protocol JitsiVideoWebViewDelegate: class {
+protocol JitsiVideoWebViewDelegate: AnyObject {
     func readyToClose()
 }
 

From 8f15b03211d1e59cd6980cc1f71db45c766ee915 Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Thu, 12 Oct 2023 11:53:35 +0300
Subject: [PATCH 12/22] Remove JitsiMeetSDK dependency

---
 JitsiMeetSDK.podspec                      | 17 -----------------
 NinchatSDKSwift.podspec                   |  4 ++--
 NinchatSDKSwift.xcodeproj/project.pbxproj |  2 --
 Podfile                                   |  2 +-
 4 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 JitsiMeetSDK.podspec

diff --git a/JitsiMeetSDK.podspec b/JitsiMeetSDK.podspec
deleted file mode 100644
index 1eb63767..00000000
--- a/JitsiMeetSDK.podspec
+++ /dev/null
@@ -1,17 +0,0 @@
-# coding: utf-8
-
-Pod::Spec.new do |s|
-  s.name         = 'JitsiMeetSDK'
-  s.version      = '0.7.0'
-  s.summary      = 'Jitsi Meet iOS SDK (forked from 7.0.1)'
-  s.description  = 'Jitsi Meet is a WebRTC compatible, free and Open Source video conferencing system that provides browsers and mobile applications with Real Time Communications capabilities.'
-  s.homepage     = 'https://github.com/jitsi/jitsi-meet-ios-sdk-releases'
-  s.license      = 'Apache 2'
-  s.authors      = 'The Jitsi Meet project authors'
-  s.source       = { :git => "https://github.com/somia/ninchat-sdk-ios-swift.git", :tag => "#{s.version}" }
-  s.ios.deployment_target = "13.0"
-  s.vendored_frameworks = "Frameworks/JitsiMeetSDK.xcframework"
-
-  s.dependency 'Giphy', '2.1.20'
-  s.dependency 'JitsiWebRTC', '~> 106.0'
-end
diff --git a/NinchatSDKSwift.podspec b/NinchatSDKSwift.podspec
index 7ae1ec22..7dd29389 100644
--- a/NinchatSDKSwift.podspec
+++ b/NinchatSDKSwift.podspec
@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "NinchatSDKSwift"
-  s.version      = "0.7.0"
+  s.version      = "0.7.1"
   s.summary      = "iOS SDK for Ninchat, Swift version"
   s.description  = "For building iOS applications using Ninchat messaging."
   s.homepage     = "https://ninchat.com/"
@@ -40,7 +40,7 @@ Pod::Spec.new do |s|
   }
 
   # Cocoapods dependencies
-  s.dependency "JitsiMeetSDK", "~> 0.7.0"
+  s.dependency "JitsiWebRTC", "106.0.0"
   s.dependency 'AnyCodable-FlightSchool', '~> 0.2.3'
   s.dependency "AutoLayoutSwift", "4.0.0"
   s.dependency "NinchatLowLevelClient", "~> 0.6.0"
diff --git a/NinchatSDKSwift.xcodeproj/project.pbxproj b/NinchatSDKSwift.xcodeproj/project.pbxproj
index 1589e3aa..32b80c3a 100644
--- a/NinchatSDKSwift.xcodeproj/project.pbxproj
+++ b/NinchatSDKSwift.xcodeproj/project.pbxproj
@@ -483,7 +483,6 @@
 		FA026FE8299BAC6100C4D3E4 /* JoinVideoButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JoinVideoButton.swift; sourceTree = "<group>"; };
 		FA026FEA299BAC7A00C4D3E4 /* NINGroupChatViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NINGroupChatViewController.swift; sourceTree = "<group>"; };
 		FA026FEC299BAC8C00C4D3E4 /* NINGroupChatViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NINGroupChatViewModel.swift; sourceTree = "<group>"; };
-		FA7958B329FBB821006527A7 /* JitsiMeetSDK.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = JitsiMeetSDK.podspec; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -678,7 +677,6 @@
 			children = (
 				855B9F9D238ED9DC0081A9C6 /* Podfile */,
 				852751D8238EE67000B6A44A /* NinchatSDKSwift.podspec */,
-				FA7958B329FBB821006527A7 /* JitsiMeetSDK.podspec */,
 				852751DA238EE67800B6A44A /* BUILDING.md */,
 				851ECF6323969297006D332F /* README.md */,
 				855B9F13238ECDB30081A9C6 /* NinchatSDKSwift */,
diff --git a/Podfile b/Podfile
index 5152f0dc..de09760a 100644
--- a/Podfile
+++ b/Podfile
@@ -9,7 +9,7 @@ def libraries
   pod 'AnyCodable-FlightSchool', '~> 0.2.3'
   pod 'AutoLayoutSwift', '4.0.0'
   pod 'NinchatLowLevelClient', '~> 0.6.0'
-  pod 'JitsiMeetSDK', '~> 0.7.0'
+  pod 'JitsiWebRTC', '106.0.0'
 end
 
 target 'NinchatSDKSwift' do

From e53742970772cc5f4e0a86f7285999f4f5cd0232 Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Thu, 12 Oct 2023 15:16:54 +0300
Subject: [PATCH 13/22] Set the language property in the Jitsi url string

---
 .../View Model/NINGroupChatViewModel.swift            | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift
index fd6fbe11..8fbe420b 100644
--- a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
+++ b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
@@ -133,7 +133,16 @@ final class NINGroupChatViewModelImpl: NSObject, NINGroupChatViewModel {
                     let jwt = credentials.token
                     let displayName = userName
                     let avatarUrl = iconURL.flatMap { URL(string: $0) }
-                    let language = "fi" // TODO: Put proper language
+                    
+                    var language = "en"
+                    switch Locale.current.languageCode {
+                    case "fi":
+                        language = "fi"
+                    case "sv":
+                        language = "sv"
+                    default:
+                        language = "en"
+                    }
                     
                     let urlString = "https://ninchat.com/new/jitsi-meet.html?jwt=\(jwt)&roomName=\(room)&domain=\(domain)&lang=\(language)"
                     

From 11750f5b3c04481d58d57cfe8eaa82c178e3d90a Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Thu, 12 Oct 2023 15:46:47 +0300
Subject: [PATCH 14/22] Use black background for the jitsi web view

---
 .../View/UIKit/Video View/JitsiVideoWebView.swift              | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift
index ffed277e..2d3aeadd 100644
--- a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
+++ b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
@@ -59,6 +59,9 @@ extension JitsiVideoWebView {
         webConfig.userContentController = contentController
         
         self.webView = WKWebView(frame: .zero, configuration: webConfig)
+        webView.backgroundColor = .black
+        webView.isOpaque = false
+        webView.scrollView.backgroundColor = .black
         
         // Set a custom non-iPhone user agent, otherwise Jitsi might not load
         webView.customUserAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36"

From ac79a0da30d0957e5dcc2da1733d26f3bf44279b Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Thu, 12 Oct 2023 15:51:30 +0300
Subject: [PATCH 15/22] Remove print calls from jitsi web view

---
 .../Managers/RTC Client/NINChatWebRTCClientImpl.swift  |  2 +-
 .../View Model/NINGroupChatViewModel.swift             |  2 --
 .../View/UIKit/Video View/JitsiVideoWebView.swift      | 10 +++-------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/NinchatSDKSwift/Implementations/Managers/RTC Client/NINChatWebRTCClientImpl.swift b/NinchatSDKSwift/Implementations/Managers/RTC Client/NINChatWebRTCClientImpl.swift
index 1be453fa..caa173c0 100644
--- a/NinchatSDKSwift/Implementations/Managers/RTC Client/NINChatWebRTCClientImpl.swift	
+++ b/NinchatSDKSwift/Implementations/Managers/RTC Client/NINChatWebRTCClientImpl.swift	
@@ -386,7 +386,7 @@ extension NINChatWebRTCClientImpl {
     @objc
     private func didSessionRouteChange(_ notification: Notification) {
         if let userInfo = notification.userInfo, let reasonKey = userInfo[AVAudioSessionRouteChangeReasonKey] as? UInt, let reason = AVAudioSession.RouteChangeReason(rawValue: reasonKey) {
-            print("Route Changed: \(userInfo)")
+            debugger("Route Changed: \(userInfo)")
             
             /// Force Speaker in case the app tries to use earning as the output
             if RTCAudioSession.sharedInstance().currentRoute.outputs.first?.portType.rawValue ?? "" == "Receiver" || AVAudioSession.sharedInstance().currentRoute.outputs.first?.portType.rawValue ?? "" == "Receiver" {
diff --git a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift
index 8fbe420b..941d8456 100644
--- a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
+++ b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
@@ -146,8 +146,6 @@ final class NINGroupChatViewModelImpl: NSObject, NINGroupChatViewModel {
                     
                     let urlString = "https://ninchat.com/new/jitsi-meet.html?jwt=\(jwt)&roomName=\(room)&domain=\(domain)&lang=\(language)"
                     
-                    print(urlString)
-                    
                     guard let url = URL(string: urlString) else {
                         completion(NinchatError(type: "unknown", props: nil))
                         return
diff --git a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift
index 2d3aeadd..e9df16fb 100644
--- a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
+++ b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
@@ -37,10 +37,6 @@ class JitsiVideoWebView: UIView {
         self.backgroundColor = .clear
         self.addWebView()
     }
-    
-    deinit {
-        print("JitsiVideoWebView deinited!")
-    }
 }
 
 // MARK: - WKWebView setup
@@ -59,6 +55,8 @@ extension JitsiVideoWebView {
         webConfig.userContentController = contentController
         
         self.webView = WKWebView(frame: .zero, configuration: webConfig)
+        
+        // Use black background for the web view while it loads Jitsy video
         webView.backgroundColor = .black
         webView.isOpaque = false
         webView.scrollView.backgroundColor = .black
@@ -103,7 +101,7 @@ extension JitsiVideoWebView {
 // MARK: - WKNavigationDelegate
 extension JitsiVideoWebView: WKNavigationDelegate {
     func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
-        print("WebView error: \(error.localizedDescription)")
+        // debugger("WebView error: \(error.localizedDescription)")
     }
 }
 
@@ -111,8 +109,6 @@ extension JitsiVideoWebView: WKNavigationDelegate {
 extension JitsiVideoWebView: WKScriptMessageHandler {
     func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
         switch message.name {
-        case "videoConferenceJoined":
-            print("Video conference joined!")
         case "videoConferenceLeft":
             delegate?.readyToClose()
         default:

From 10c2a9f127133edb6938d6003d14813194cab4b3 Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Fri, 13 Oct 2023 10:56:38 +0300
Subject: [PATCH 16/22] Hide chat view when tapping on video

---
 .../View Model/NINGroupChatViewModel.swift    | 14 ++--------
 .../UIKit/Video View/JitsiVideoWebView.swift  | 28 +++++++++++++++++--
 .../NINGroupChatViewController.swift          | 13 +++++++++
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift
index 941d8456..65eafb04 100644
--- a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
+++ b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
@@ -156,7 +156,7 @@ final class NINGroupChatViewModelImpl: NSObject, NINGroupChatViewModel {
                     // Add JitsiVideoWebView
                     let jitsiVideoWebView = parentView.subviews.filter { $0 is JitsiVideoWebView }.first as? JitsiVideoWebView
                     self.jitsiVideoWebView = jitsiVideoWebView
-                    jitsiVideoWebView?.delegate = self
+                    jitsiVideoWebView?.eventsDelegate = self
                     
                     // Load url request
                     jitsiVideoWebView?.loadJitsiMeeting(for: urlRequest)
@@ -180,16 +180,8 @@ final class NINGroupChatViewModelImpl: NSObject, NINGroupChatViewModel {
         if force {
             jitsiVideoWebView?.hangUp()
         }
-        self.jitsiVideoWebView?.delegate = nil
+        self.jitsiVideoWebView?.eventsDelegate = nil
         self.jitsiVideoWebView = nil
-        
-        /*
-        pipViewCoordinator?.hide()
-        if force {
-            jitsiView?.hangUp()
-        }
-        jitsiView?.delegate = nil
-        */
     }
 }
 
@@ -354,7 +346,7 @@ extension NINGroupChatViewModelImpl {
 
 // MARK: - JitsiVideoWebViewDelegate
 
-extension NINGroupChatViewModelImpl: JitsiVideoWebViewDelegate {
+extension NINGroupChatViewModelImpl: JitsiVideoWebViewEventsDelegate {
     func readyToClose() {
         leaveVideoCall(force: false)
         onGroupVideoReadyToClose?()
diff --git a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift
index e9df16fb..03b40444 100644
--- a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
+++ b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
@@ -8,10 +8,14 @@
 import UIKit
 import WebKit
 
-protocol JitsiVideoWebViewDelegate: AnyObject {
+protocol JitsiVideoWebViewEventsDelegate: AnyObject {
     func readyToClose()
 }
 
+protocol JitsiVideoWebViewTapDelegate: AnyObject {
+    func didTapOnVideoContainer()
+}
+
 class JitsiVideoWebView: UIView {
 
     // MARK: - PROPERTIES
@@ -20,7 +24,8 @@ class JitsiVideoWebView: UIView {
     private var webView: WKWebView!
     
     // MARK: - Delegate
-    var delegate: JitsiVideoWebViewDelegate?
+    var eventsDelegate: JitsiVideoWebViewEventsDelegate?
+    var tapDelegate: JitsiVideoWebViewTapDelegate?
     
     // MARK: - Debug mode
     private var isDebugMode = false
@@ -76,6 +81,23 @@ extension JitsiVideoWebView {
             webView.leadingAnchor.constraint(equalTo: self.leadingAnchor),
             webView.trailingAnchor.constraint(equalTo: self.trailingAnchor)
         ])
+        
+        // Set a tap gesture recognizer on the webView
+        let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector(handleTapGesture))
+        tapRecognizer.cancelsTouchesInView = false
+        tapRecognizer.delegate = self
+        webView.addGestureRecognizer(tapRecognizer)
+    }
+}
+
+// MARK: - UIGestureRecognizerDelegate
+extension JitsiVideoWebView: UIGestureRecognizerDelegate {
+    @objc private func handleTapGesture(recognizer: UITapGestureRecognizer) {
+        tapDelegate?.didTapOnVideoContainer()
+    }
+    
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+      return true
     }
 }
 
@@ -110,7 +132,7 @@ extension JitsiVideoWebView: WKScriptMessageHandler {
     func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
         switch message.name {
         case "videoConferenceLeft":
-            delegate?.readyToClose()
+            eventsDelegate?.readyToClose()
         default:
             break
         }
diff --git a/NinchatSDKSwift/Implementations/View/ViewController/NINGroupChatViewController.swift b/NinchatSDKSwift/Implementations/View/ViewController/NINGroupChatViewController.swift
index f2306218..f8623df8 100644
--- a/NinchatSDKSwift/Implementations/View/ViewController/NINGroupChatViewController.swift
+++ b/NinchatSDKSwift/Implementations/View/ViewController/NINGroupChatViewController.swift
@@ -52,6 +52,7 @@ final class NINGroupChatViewController: UIViewController, DeallocatableViewContr
     @IBOutlet private(set) weak var backgroundView: UIImageView! /// <--- to hold page background image, it is more flexible to have a dedicated view
 
     @IBOutlet private(set) weak var videoViewContainer: UIView!
+    private var jitsiVideoWebView: JitsiVideoWebView?
 
     @IBOutlet private(set) weak var joinVideoContainerHeight: NSLayoutConstraint!
     @IBOutlet private(set) weak var joinVideoContainer: UIView!
@@ -497,6 +498,8 @@ extension NINGroupChatViewController {
 
     private func addJitsiVideoWebView() {
         let jitsiVideoWebView = JitsiVideoWebView(frame: .zero)
+        self.jitsiVideoWebView = jitsiVideoWebView
+        self.jitsiVideoWebView?.tapDelegate = self
         jitsiVideoWebView.translatesAutoresizingMaskIntoConstraints = false
         videoViewContainer.addSubview(jitsiVideoWebView)
         NSLayoutConstraint.activate([
@@ -660,3 +663,13 @@ extension NINGroupChatViewController {
         self.viewModel.onChannelMessage = nil
     }
 }
+
+extension NINGroupChatViewController: JitsiVideoWebViewTapDelegate {
+    func didTapOnVideoContainer() {
+        // First we check if the video container is on front.
+        // If it isn't, it means that it is covered by the chat view and we hide it when user taps on the video container.
+        if let superview = videoViewContainer.superview, superview.subviews.last != videoViewContainer {
+            onToggleChatDidTap("")
+        }
+    }
+}

From 6ff23a8af6c94e921b5c52d70d3d693e8b8ca992 Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Mon, 23 Oct 2023 15:19:20 +0300
Subject: [PATCH 17/22] Add more parameters to jitsi web link

---
 .../View Model/NINGroupChatViewModel.swift    | 63 +++++++++++++------
 1 file changed, 43 insertions(+), 20 deletions(-)

diff --git a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift
index 65eafb04..f47b6455 100644
--- a/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
+++ b/NinchatSDKSwift/Implementations/View Model/NINGroupChatViewModel.swift	
@@ -113,45 +113,68 @@ final class NINGroupChatViewModelImpl: NSObject, NINGroupChatViewModel {
                 case let .failure(error):
                     completion(error)
                 case let .success(credentials):
-                    // Configure url request
-                    let avatarConfig = AvatarConfig(forUser: sessionManager)
+                    // User
                     let user = sessionManager.myUser
-                    let iconURL = avatarConfig.imageOverrideURL ?? user?.iconURL
+
+                    // Use imageOverrideURL or iconURL (if available) or default to nil if both are absent.
+                    let avatarConfig = AvatarConfig(forUser: sessionManager)
+                    let iconURLString = avatarConfig.imageOverrideURL ?? user?.iconURL
+
+                    // Choose nameOverride if available, otherwise use user's displayName or a default "Guest" label.
                     let userName = !avatarConfig.nameOverride.isEmpty
                         ? avatarConfig.nameOverride
                         : (user?.displayName ?? "Guest".localized)
 
+                    // Get server address
                     var serverAddress: String = sessionManager.serverAddress
                     let apiPrefix = "api."
                     if serverAddress.hasPrefix(apiPrefix) {
                         let endIdx = serverAddress.index(serverAddress.startIndex, offsetBy: apiPrefix.count)
                         serverAddress.removeSubrange(serverAddress.startIndex ..< endIdx)
                     }
+
+                    // Construct Jitsi server address and extract domain.
                     let jitsiServerAddress = "https://jitsi-www." + serverAddress
                     let domain = jitsiServerAddress.replacingOccurrences(of: "https://", with: "")
+
+                    // Prepare other necessary variables.
                     let room = credentials.room
                     let jwt = credentials.token
-                    let displayName = userName
-                    let avatarUrl = iconURL.flatMap { URL(string: $0) }
-                    
-                    var language = "en"
-                    switch Locale.current.languageCode {
-                    case "fi":
-                        language = "fi"
-                    case "sv":
-                        language = "sv"
-                    default:
-                        language = "en"
+                    let displayName = userName.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)
+
+                    // Determine the appropriate language.
+                    let supportedLanguages = ["fi", "sv", "en"]
+                    let currentLanguage = Locale.current.languageCode ?? "en"
+                    let language = supportedLanguages.contains(currentLanguage) ? currentLanguage : "en"
+
+                    // Construct the URL query items, adding displayName and avatarURL if available.
+                    var queryItems: [URLQueryItem] = [
+                        URLQueryItem(name: "jwt", value: jwt),
+                        URLQueryItem(name: "roomName", value: room),
+                        URLQueryItem(name: "domain", value: domain),
+                        URLQueryItem(name: "lang", value: language)
+                    ]
+
+                    if let encodedDisplayName = displayName {
+                        queryItems.append(URLQueryItem(name: "displayName", value: encodedDisplayName))
                     }
-                    
-                    let urlString = "https://ninchat.com/new/jitsi-meet.html?jwt=\(jwt)&roomName=\(room)&domain=\(domain)&lang=\(language)"
-                    
-                    guard let url = URL(string: urlString) else {
+
+                    if let iconURLString = iconURLString, let avatarUrl = URL(string: iconURLString) {
+                        queryItems.append(URLQueryItem(name: "avatarURL", value: avatarUrl.absoluteString))
+                    }
+
+                    // Build the final URL.
+                    var urlComponents = URLComponents(string: "https://ninchat.com/new/jitsi-meet.html")
+                    urlComponents?.queryItems = queryItems
+
+                    // Validate and use the final URL.
+                    guard let finalUrl = urlComponents?.url else {
                         completion(NinchatError(type: "unknown", props: nil))
                         return
                     }
-                    
-                    let urlRequest = URLRequest(url: url)
+
+                    // If we're here, it means the URL is valid, and we can create the URLRequest.
+                    let urlRequest = URLRequest(url: finalUrl)
                     
                     // Add JitsiVideoWebView
                     let jitsiVideoWebView = parentView.subviews.filter { $0 is JitsiVideoWebView }.first as? JitsiVideoWebView

From 35aaa8c2e6816bb4f6a10a3e9fd8ee026358802a Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Tue, 24 Oct 2023 08:36:13 +0300
Subject: [PATCH 18/22] Set preferredContentMode for Jitsi web view

---
 .../View/UIKit/Video View/JitsiVideoWebView.swift            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift
index 03b40444..67d6551d 100644
--- a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
+++ b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
@@ -51,7 +51,10 @@ extension JitsiVideoWebView {
         let webConfig = WKWebViewConfiguration()
         webConfig.allowsInlineMediaPlayback = true
         webConfig.mediaTypesRequiringUserActionForPlayback = []
-        webConfig.preferences.setValue(true, forKey: "developerExtrasEnabled") // uncomment this if you want to debug using the web inspector
+        if #available(iOS 13.0, *) {
+            webConfig.defaultWebpagePreferences.preferredContentMode = .mobile // this setting is necessary for iPad
+        }
+        // webConfig.preferences.setValue(true, forKey: "developerExtrasEnabled") // uncomment this if you want to debug using the web inspector
         
         // Enable JavaScript messaging
         let contentController = WKUserContentController()

From 59bae97e6becde0401b9aae03a2ff018f9a7e537 Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Tue, 24 Oct 2023 14:50:16 +0300
Subject: [PATCH 19/22] Fix the dismissing of chat when tapping on video

---
 .../UIKit/Video View/JitsiVideoWebView.swift  | 22 -------------
 .../NINGroupChatViewController.swift          | 31 +++++++++++++++++--
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift
index 67d6551d..c4e78add 100644
--- a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
+++ b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
@@ -12,10 +12,6 @@ protocol JitsiVideoWebViewEventsDelegate: AnyObject {
     func readyToClose()
 }
 
-protocol JitsiVideoWebViewTapDelegate: AnyObject {
-    func didTapOnVideoContainer()
-}
-
 class JitsiVideoWebView: UIView {
 
     // MARK: - PROPERTIES
@@ -25,7 +21,6 @@ class JitsiVideoWebView: UIView {
     
     // MARK: - Delegate
     var eventsDelegate: JitsiVideoWebViewEventsDelegate?
-    var tapDelegate: JitsiVideoWebViewTapDelegate?
     
     // MARK: - Debug mode
     private var isDebugMode = false
@@ -84,23 +79,6 @@ extension JitsiVideoWebView {
             webView.leadingAnchor.constraint(equalTo: self.leadingAnchor),
             webView.trailingAnchor.constraint(equalTo: self.trailingAnchor)
         ])
-        
-        // Set a tap gesture recognizer on the webView
-        let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector(handleTapGesture))
-        tapRecognizer.cancelsTouchesInView = false
-        tapRecognizer.delegate = self
-        webView.addGestureRecognizer(tapRecognizer)
-    }
-}
-
-// MARK: - UIGestureRecognizerDelegate
-extension JitsiVideoWebView: UIGestureRecognizerDelegate {
-    @objc private func handleTapGesture(recognizer: UITapGestureRecognizer) {
-        tapDelegate?.didTapOnVideoContainer()
-    }
-    
-    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
-      return true
     }
 }
 
diff --git a/NinchatSDKSwift/Implementations/View/ViewController/NINGroupChatViewController.swift b/NinchatSDKSwift/Implementations/View/ViewController/NINGroupChatViewController.swift
index f8623df8..9438e8c5 100644
--- a/NinchatSDKSwift/Implementations/View/ViewController/NINGroupChatViewController.swift
+++ b/NinchatSDKSwift/Implementations/View/ViewController/NINGroupChatViewController.swift
@@ -53,6 +53,7 @@ final class NINGroupChatViewController: UIViewController, DeallocatableViewContr
 
     @IBOutlet private(set) weak var videoViewContainer: UIView!
     private var jitsiVideoWebView: JitsiVideoWebView?
+    private var tapOverlayView: UIView? // This transparent overlay is added on top of video when chat is shown. It is used for intercepting taps and hiding the chat when user taps on video
 
     @IBOutlet private(set) weak var joinVideoContainerHeight: NSLayoutConstraint!
     @IBOutlet private(set) weak var joinVideoContainer: UIView!
@@ -499,7 +500,6 @@ extension NINGroupChatViewController {
     private func addJitsiVideoWebView() {
         let jitsiVideoWebView = JitsiVideoWebView(frame: .zero)
         self.jitsiVideoWebView = jitsiVideoWebView
-        self.jitsiVideoWebView?.tapDelegate = self
         jitsiVideoWebView.translatesAutoresizingMaskIntoConstraints = false
         videoViewContainer.addSubview(jitsiVideoWebView)
         NSLayoutConstraint.activate([
@@ -614,6 +614,7 @@ extension NINGroupChatViewController {
 
 extension NINGroupChatViewController {
     private func moveVideoContainerToFront() {
+        removeTapOverlayView()
         view.bringSubviewToFront(videoViewContainer)
     }
 
@@ -622,11 +623,37 @@ extension NINGroupChatViewController {
     }
 
     private func moveChatToFront() {
+        addTapOverlayView()
         view.bringSubviewToFront(chatContainer)
         titlebarContainer.map(view.bringSubviewToFront)
         titlebar.map(view.bringSubviewToFront)
         view.bringSubviewToFront(chatControlsContainer)
     }
+    
+    private func addTapOverlayView() {
+        let tapOverlayView = UIView()
+        tapOverlayView.backgroundColor = UIColor.clear
+        videoViewContainer.addSubview(tapOverlayView)
+        tapOverlayView.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            tapOverlayView.leadingAnchor.constraint(equalTo: videoViewContainer.leadingAnchor),
+            tapOverlayView.trailingAnchor.constraint(equalTo: videoViewContainer.trailingAnchor),
+            tapOverlayView.topAnchor.constraint(equalTo: videoViewContainer.topAnchor),
+            tapOverlayView.bottomAnchor.constraint(equalTo: videoViewContainer.bottomAnchor)
+        ])
+        self.tapOverlayView = tapOverlayView
+        let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector(handleTapGesture))
+        tapOverlayView.addGestureRecognizer(tapRecognizer)
+    }
+
+    private func removeTapOverlayView() {
+        self.tapOverlayView?.removeFromSuperview()
+        self.tapOverlayView = nil
+    }
+    
+    @objc private func handleTapGesture() {
+        didTapOnVideoContainer()
+    }
 
     private func markChatButton(hasUnreadMessages: Bool) {
         // overrideAssets overrides layer of the button, and usually it can have zero size,
@@ -664,7 +691,7 @@ extension NINGroupChatViewController {
     }
 }
 
-extension NINGroupChatViewController: JitsiVideoWebViewTapDelegate {
+extension NINGroupChatViewController {
     func didTapOnVideoContainer() {
         // First we check if the video container is on front.
         // If it isn't, it means that it is covered by the chat view and we hide it when user taps on the video container.

From cde39e61fa8e2bb9c31b858722fcf3c63875941a Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Wed, 25 Oct 2023 11:22:19 +0300
Subject: [PATCH 20/22] Disable scrolling in Jitsi web view

---
 .../View/UIKit/Video View/JitsiVideoWebView.swift                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift
index c4e78add..0ca851b9 100644
--- a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
+++ b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
@@ -63,6 +63,7 @@ extension JitsiVideoWebView {
         webView.backgroundColor = .black
         webView.isOpaque = false
         webView.scrollView.backgroundColor = .black
+        webView.scrollView.isScrollEnabled = false
         
         // Set a custom non-iPhone user agent, otherwise Jitsi might not load
         webView.customUserAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36"

From 8e8e01fccf5478ec7ea1d7dd08b37efe7c744a83 Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Wed, 25 Oct 2023 11:28:04 +0300
Subject: [PATCH 21/22] Pin Jitsi web view to the bottom safe area layout guide

---
 .../View/UIKit/Video View/JitsiVideoWebView.swift               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift
index 0ca851b9..34287092 100644
--- a/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
+++ b/NinchatSDKSwift/Implementations/View/UIKit/Video View/JitsiVideoWebView.swift	
@@ -76,7 +76,7 @@ extension JitsiVideoWebView {
         self.addSubview(webView)
         NSLayoutConstraint.activate([
             webView.topAnchor.constraint(equalTo: self.topAnchor),
-            webView.bottomAnchor.constraint(equalTo: self.bottomAnchor),
+            webView.bottomAnchor.constraint(equalTo: self.safeAreaLayoutGuide.bottomAnchor),
             webView.leadingAnchor.constraint(equalTo: self.leadingAnchor),
             webView.trailingAnchor.constraint(equalTo: self.trailingAnchor)
         ])

From f2ef97e74e36a41837ca5d4643e82225ced63327 Mon Sep 17 00:00:00 2001
From: Andrei Sadovnicov <andrei.sadovnicov@qvik.fi>
Date: Wed, 25 Oct 2023 13:54:59 +0300
Subject: [PATCH 22/22] Update version in NinchatSDKSwift podspec

---
 NinchatSDKSwift.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NinchatSDKSwift.podspec b/NinchatSDKSwift.podspec
index 7dd29389..8687d661 100644
--- a/NinchatSDKSwift.podspec
+++ b/NinchatSDKSwift.podspec
@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "NinchatSDKSwift"
-  s.version      = "0.7.1"
+  s.version      = "0.8.0"
   s.summary      = "iOS SDK for Ninchat, Swift version"
   s.description  = "For building iOS applications using Ninchat messaging."
   s.homepage     = "https://ninchat.com/"