From d52b9e1b768397e2d13a32f689e8da74914d9b56 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 20 Aug 2024 11:00:51 +0200
Subject: [PATCH 01/21] =?UTF-8?q?Ajout=20de=20l'application=20scheme=20=20?=
 =?UTF-8?q?pour=20retour=20dans=20l'app=20apr=C3=A8s=20SSO=20sur=20AgentCo?=
 =?UTF-8?q?nnect?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Btchap/SupportingFiles/Btchap-App-Common.xcconfig     | 1 +
 DevTchap/SupportingFiles/DevTchap-App-Common.xcconfig | 1 +
 Tchap/SupportingFiles/App-Common.xcconfig             | 1 +
 3 files changed, 3 insertions(+)

diff --git a/Btchap/SupportingFiles/Btchap-App-Common.xcconfig b/Btchap/SupportingFiles/Btchap-App-Common.xcconfig
index 36a5963707..0c9357856d 100644
--- a/Btchap/SupportingFiles/Btchap-App-Common.xcconfig
+++ b/Btchap/SupportingFiles/Btchap-App-Common.xcconfig
@@ -24,6 +24,7 @@ BUNDLE_DISPLAY_NAME = Btchap
 BASE_BUNDLE_IDENTIFIER = fr.gouv.btchap
 APPLICATION_GROUP_IDENTIFIER = group.$(BASE_BUNDLE_IDENTIFIER)
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER)
+APPLICATION_SCHEME = tchap
 
 INFOPLIST_FILE = Btchap/SupportingFiles/Info.plist
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
diff --git a/DevTchap/SupportingFiles/DevTchap-App-Common.xcconfig b/DevTchap/SupportingFiles/DevTchap-App-Common.xcconfig
index 5fe20ec985..ae7b765ca3 100644
--- a/DevTchap/SupportingFiles/DevTchap-App-Common.xcconfig
+++ b/DevTchap/SupportingFiles/DevTchap-App-Common.xcconfig
@@ -24,6 +24,7 @@ BUNDLE_DISPLAY_NAME = DevTchap
 BASE_BUNDLE_IDENTIFIER = fr.gouv.tchap.dev
 APPLICATION_GROUP_IDENTIFIER = group.$(BASE_BUNDLE_IDENTIFIER)
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER)
+APPLICATION_SCHEME = tchap
 
 INFOPLIST_FILE = DevTchap/SupportingFiles/Info.plist
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
diff --git a/Tchap/SupportingFiles/App-Common.xcconfig b/Tchap/SupportingFiles/App-Common.xcconfig
index 61a5d51db5..a31699bd97 100644
--- a/Tchap/SupportingFiles/App-Common.xcconfig
+++ b/Tchap/SupportingFiles/App-Common.xcconfig
@@ -24,6 +24,7 @@ BUNDLE_DISPLAY_NAME = Tchap
 BASE_BUNDLE_IDENTIFIER = fr.gouv.tchap
 APPLICATION_GROUP_IDENTIFIER = group.$(BASE_BUNDLE_IDENTIFIER)
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER)
+APPLICATION_SCHEME = tchap
 
 INFOPLIST_FILE = Tchap/SupportingFiles/Info.plist
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon

From 43573288233f494ba5b082ec61b6ac86c014eee4 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 20 Aug 2024 11:01:45 +0200
Subject: [PATCH 02/21] =?UTF-8?q?R=C3=A9activation=20de=20l'Onboarding=20o?=
 =?UTF-8?q?riginal=20Element=20(qui=20supporte=20le=20SSO)=20plut=C3=B4t?=
 =?UTF-8?q?=20que=20l'onboarding=20custom=20Tchap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AllChats/AllChatsViewController.swift     | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/Riot/Modules/Home/AllChats/AllChatsViewController.swift b/Riot/Modules/Home/AllChats/AllChatsViewController.swift
index 0efb816e23..688047ed4d 100644
--- a/Riot/Modules/Home/AllChats/AllChatsViewController.swift
+++ b/Riot/Modules/Home/AllChats/AllChatsViewController.swift
@@ -1117,36 +1117,36 @@ extension AllChatsViewController: SplitViewMasterViewControllerProtocol {
         MXLog.debug("[AllChatsViewController] presentOnboardingFlow")
 
         // Tchap: Use WelcomeCoordinatorBridgePresenter instead of OnboardingCoordinatorBridgePresenter
-        let welcomeCoordinatorBridgePresenter = WelcomeCoordinatorBridgePresenter()
-        welcomeCoordinatorBridgePresenter.completion = { [weak self] in
-            guard let self = self else { return }
-            
-            self.welcomeCoordinatorBridgePresenter?.dismiss(animated: true, completion: {
-                self.welcomeCoordinatorBridgePresenter = nil
-            })
-
-            self.isOnboardingInProgress = false   // Must be set before calling didCompleteAuthentication
-            self.allChatsDelegate?.allChatsViewControllerDidCompleteAuthentication(self)
-        }
-
-        welcomeCoordinatorBridgePresenter.present(from: self, animated: true)
-        self.welcomeCoordinatorBridgePresenter = welcomeCoordinatorBridgePresenter
-
-        
-//        let onboardingCoordinatorBridgePresenter = OnboardingCoordinatorBridgePresenter()
-//        onboardingCoordinatorBridgePresenter.completion = { [weak self] in
+//        let welcomeCoordinatorBridgePresenter = WelcomeCoordinatorBridgePresenter()
+//        welcomeCoordinatorBridgePresenter.completion = { [weak self] in
 //            guard let self = self else { return }
-//
-//            self.onboardingCoordinatorBridgePresenter?.dismiss(animated: true, completion: {
-//                self.onboardingCoordinatorBridgePresenter = nil
+//            
+//            self.welcomeCoordinatorBridgePresenter?.dismiss(animated: true, completion: {
+//                self.welcomeCoordinatorBridgePresenter = nil
 //            })
 //
 //            self.isOnboardingInProgress = false   // Must be set before calling didCompleteAuthentication
 //            self.allChatsDelegate?.allChatsViewControllerDidCompleteAuthentication(self)
 //        }
 //
-//        onboardingCoordinatorBridgePresenter.present(from: self, animated: true)
-//        self.onboardingCoordinatorBridgePresenter = onboardingCoordinatorBridgePresenter
+//        welcomeCoordinatorBridgePresenter.present(from: self, animated: true)
+//        self.welcomeCoordinatorBridgePresenter = welcomeCoordinatorBridgePresenter
+
+        
+        let onboardingCoordinatorBridgePresenter = OnboardingCoordinatorBridgePresenter()
+        onboardingCoordinatorBridgePresenter.completion = { [weak self] in
+            guard let self = self else { return }
+
+            self.onboardingCoordinatorBridgePresenter?.dismiss(animated: true, completion: {
+                self.onboardingCoordinatorBridgePresenter = nil
+            })
+
+            self.isOnboardingInProgress = false   // Must be set before calling didCompleteAuthentication
+            self.allChatsDelegate?.allChatsViewControllerDidCompleteAuthentication(self)
+        }
+
+        onboardingCoordinatorBridgePresenter.present(from: self, animated: true)
+        self.onboardingCoordinatorBridgePresenter = onboardingCoordinatorBridgePresenter
         self.isOnboardingCoordinatorPreparing = false
     }
 

From f572f1f6a7576317dce95acebd4afc6b306b5215 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 20 Aug 2024 11:02:39 +0200
Subject: [PATCH 03/21] Ajout de l'URL scheme dans les fichiers plist

---
 Btchap/SupportingFiles/Info.plist   | 13 +++++++++++++
 DevTchap/SupportingFiles/Info.plist | 13 +++++++++++++
 Tchap/SupportingFiles/Info.plist    | 13 +++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/Btchap/SupportingFiles/Info.plist b/Btchap/SupportingFiles/Info.plist
index 5e06e305b9..262b052c3d 100644
--- a/Btchap/SupportingFiles/Info.plist
+++ b/Btchap/SupportingFiles/Info.plist
@@ -35,6 +35,19 @@
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>$(BASE_BUNDLE_IDENTIFIER)</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>$(APPLICATION_SCHEME)</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
diff --git a/DevTchap/SupportingFiles/Info.plist b/DevTchap/SupportingFiles/Info.plist
index 4303301c18..533722fc3c 100644
--- a/DevTchap/SupportingFiles/Info.plist
+++ b/DevTchap/SupportingFiles/Info.plist
@@ -35,6 +35,19 @@
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>$(BASE_BUNDLE_IDENTIFIER)</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>$(APPLICATION_SCHEME)</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
diff --git a/Tchap/SupportingFiles/Info.plist b/Tchap/SupportingFiles/Info.plist
index 666cd98359..1ef2ea6ab4 100644
--- a/Tchap/SupportingFiles/Info.plist
+++ b/Tchap/SupportingFiles/Info.plist
@@ -35,6 +35,19 @@
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>$(BASE_BUNDLE_IDENTIFIER)</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>$(APPLICATION_SCHEME)</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>

From 6467bd45eeec9b0e1e6bcb429e3d2e5e5dbc2e8f Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 20 Aug 2024 11:06:14 +0200
Subject: [PATCH 04/21] Skip Onboarding useCase selection

---
 Riot/Modules/Onboarding/OnboardingCoordinator.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Riot/Modules/Onboarding/OnboardingCoordinator.swift b/Riot/Modules/Onboarding/OnboardingCoordinator.swift
index bce47443bb..3fb1d711a6 100644
--- a/Riot/Modules/Onboarding/OnboardingCoordinator.swift
+++ b/Riot/Modules/Onboarding/OnboardingCoordinator.swift
@@ -165,7 +165,7 @@ final class OnboardingCoordinator: NSObject, OnboardingCoordinatorProtocol {
         case .register:
             // Tchap: Bypass usecase selection screen
 //            showUseCaseSelectionScreen()
-            MXLog.failure("[OnboardingCoordinator] splashScreenCoordinator register case should not happen !")
+            beginAuthentication(with: .registration, onStart: coordinator.stop)
             
         case .login:
             if BuildSettings.onboardingEnableNewAuthenticationFlow {

From d512392646c65cc66d363b298d1f8a07842670c3 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Wed, 21 Aug 2024 15:46:22 +0200
Subject: [PATCH 05/21] Reinclude Element Legacy code (for LegacyAuthentication
 for example)

---
 Tchap/target.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Tchap/target.yml b/Tchap/target.yml
index 63080dfe35..6d44c6dd0b 100644
--- a/Tchap/target.yml
+++ b/Tchap/target.yml
@@ -177,8 +177,6 @@ targetTemplates:
     - path: ../Riot/Modules/Analytics
     - path: ../Riot/Modules/Application
     - path: ../Riot/Modules/Authentication
-      excludes:
-        - "Legacy"
     - path: ../Riot/Modules/BadgeLabel
     - path: ../Riot/Modules/BugReport/BugReportViewController.h
     - path: ../Riot/Modules/BugReport/BugReportViewController.m

From 16547cc7614e66da14989dd0d6409fc3c2064c2d Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Wed, 21 Aug 2024 15:47:20 +0200
Subject: [PATCH 06/21] Reimport "AuthenticationViewController.h" for
 LegacyAuthenticationCoordinator to know AuthenticationViewController class

---
 Riot/Modules/TabBar/MasterTabBarController.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Riot/Modules/TabBar/MasterTabBarController.h b/Riot/Modules/TabBar/MasterTabBarController.h
index 51284144df..7b9a51a590 100644
--- a/Riot/Modules/TabBar/MasterTabBarController.h
+++ b/Riot/Modules/TabBar/MasterTabBarController.h
@@ -15,7 +15,7 @@
  limitations under the License.
  */
 
-//#import "AuthenticationViewController.h"
+#import "AuthenticationViewController.h"
 
 #import "RoomPreviewData.h"
 #import "FavouritesViewController.h"

From 7276e74e66d4ec307d93eee05cef7dcfe840fa2f Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Wed, 21 Aug 2024 15:48:19 +0200
Subject: [PATCH 07/21] Disable default home and identity server temporarily
 because they are not defined in Tchap

---
 .../Authentication/Legacy/AuthenticationViewController.m      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Riot/Modules/Authentication/Legacy/AuthenticationViewController.m b/Riot/Modules/Authentication/Legacy/AuthenticationViewController.m
index c0605d8131..687a534e27 100644
--- a/Riot/Modules/Authentication/Legacy/AuthenticationViewController.m
+++ b/Riot/Modules/Authentication/Legacy/AuthenticationViewController.m
@@ -138,10 +138,10 @@ - (void)viewDidLoad
     }
     else
     {
-        self.defaultHomeServerUrl = RiotSettings.shared.homeserverUrlString;
+//        self.defaultHomeServerUrl = RiotSettings.shared.homeserverUrlString;
     }
     
-    self.defaultIdentityServerUrl = RiotSettings.shared.identityServerUrlString;
+//    self.defaultIdentityServerUrl = RiotSettings.shared.identityServerUrlString;
     
     self.welcomeImageView.image = AssetSharedImages.horizontalLogo.image;
     

From ad5724f8f70f79e4e47626d86af76072a43723f6 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Wed, 21 Aug 2024 15:48:56 +0200
Subject: [PATCH 08/21] Temporarily disable custom servers for SSO tests

---
 .../Legacy/LegacyAuthenticationCoordinator.swift  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift b/Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
index 4aea0b8b92..f77fd61095 100644
--- a/Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
+++ b/Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
@@ -72,13 +72,14 @@ final class LegacyAuthenticationCoordinator: NSObject, AuthenticationCoordinator
         // Set (or clear) any soft-logout credentials.
         authenticationViewController.softLogoutCredentials = authenticationService.softLogoutCredentials
         
-        // Configure custom servers if already customised by a deep link.
-        let homeserver = authenticationService.state.homeserver.address
-        let identityServer = authenticationService.state.identityServer
-        if homeserver != BuildSettings.serverConfigDefaultHomeserverUrlString
-            || (identityServer != nil && identityServer != BuildSettings.serverConfigDefaultIdentityServerUrlString) {
-            authenticationViewController.showCustomHomeserver(homeserver, andIdentityServer: identityServer)
-        }
+        // Tchap: Don't show custom servers during SSO tests.
+//        // Configure custom servers if already customised by a deep link.
+//        let homeserver = authenticationService.state.homeserver.address
+//        let identityServer = authenticationService.state.identityServer
+//        if homeserver != BuildSettings.serverConfigDefaultHomeserverUrlString
+//            || (identityServer != nil && identityServer != BuildSettings.serverConfigDefaultIdentityServerUrlString) {
+//            authenticationViewController.showCustomHomeserver(homeserver, andIdentityServer: identityServer)
+//        }
         
         // Listen for further changes from deep links.
         AuthenticationService.shared.delegate = self

From 2c6f0b04e6a1fa4c37e06f02af79e5aa02c27f3a Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Wed, 21 Aug 2024 15:50:20 +0200
Subject: [PATCH 09/21] Restore deep link Connect to Element way (not Tchap
 way)

---
 Riot/Modules/Application/AppCoordinator.swift |  4 ++-
 Riot/Modules/Application/LegacyAppDelegate.h  |  2 +-
 Riot/Modules/Application/LegacyAppDelegate.m  | 29 +++++++++----------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Riot/Modules/Application/AppCoordinator.swift b/Riot/Modules/Application/AppCoordinator.swift
index e55874016c..577d62cced 100755
--- a/Riot/Modules/Application/AppCoordinator.swift
+++ b/Riot/Modules/Application/AppCoordinator.swift
@@ -281,7 +281,9 @@ final class AppCoordinator: NSObject, AppCoordinatorType {
         
         switch deepLinkOption {
         case .connect(let loginToken, let transactionID):
-            canOpenLink = self.legacyAppDelegate.continueSSOLogin(withToken: loginToken, txnId: transactionID)
+            // Tchap: return to Element way of handling deep link SSO connect
+//            canOpenLink = self.legacyAppDelegate.continueSSOLogin(withToken: loginToken, txnId: transactionID)
+            canOpenLink = AuthenticationService.shared.continueSSOLogin(with: loginToken, and: transactionID)
         }
         
         return canOpenLink
diff --git a/Riot/Modules/Application/LegacyAppDelegate.h b/Riot/Modules/Application/LegacyAppDelegate.h
index 2421e029b4..b1aa19ff32 100644
--- a/Riot/Modules/Application/LegacyAppDelegate.h
+++ b/Riot/Modules/Application/LegacyAppDelegate.h
@@ -294,7 +294,7 @@ UINavigationControllerDelegate
 /// @param loginToken The login token provided when SSO succeeded.
 /// @param txnId transaction id generated during SSO page presentation.
 /// returns YES if the SSO login can be continued.
-- (BOOL)continueSSOLoginWithToken:(NSString*)loginToken txnId:(NSString*)txnId;
+//- (BOOL)continueSSOLoginWithToken:(NSString*)loginToken txnId:(NSString*)txnId;
 
 @end
 
diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
index ae34bcb445..7838c9ca6b 100644
--- a/Riot/Modules/Application/LegacyAppDelegate.m
+++ b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -4543,21 +4543,20 @@ - (void)callPresenter:(CallPresenter *)presenter exitPipForCallViewController:(U
     [self presentViewController:viewController animated:YES completion:completion];
 }
 
-#pragma mark - Authentication
-
-- (BOOL)continueSSOLoginWithToken:(NSString*)loginToken txnId:(NSString*)txnId
-{
-    OnboardingCoordinatorBridgePresenter *bridgePresenter = self.masterTabBarController.onboardingCoordinatorBridgePresenter;
-    
-    if (!bridgePresenter)
-    {
-        MXLogDebug(@"[AppDelegate] Fail to continue SSO login");
-        return NO;
-    }
-    
-    // Tchap:
-    return NO;//[bridgePresenter continueSSOLoginWithToken:loginToken transactionID:txnId];
-}
+//#pragma mark - Authentication
+//
+//- (BOOL)continueSSOLoginWithToken:(NSString*)loginToken txnId:(NSString*)txnId
+//{
+//    OnboardingCoordinatorBridgePresenter *bridgePresenter = self.masterTabBarController.onboardingCoordinatorBridgePresenter;
+//    
+//    if (!bridgePresenter)
+//    {
+//        MXLogDebug(@"[AppDelegate] Fail to continue SSO login");
+//        return NO;
+//    }
+//    
+//    [bridgePresenter continueSSOLoginWithToken:loginToken transactionID:txnId];
+//}
 
 #pragma mark - Private
 

From 53b993dfde538164337ab5918a0120a34be38dc9 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Wed, 21 Aug 2024 16:47:10 +0200
Subject: [PATCH 10/21] Revert "Restore deep link Connect to Element way (not
 Tchap way)"

This reverts commit 2c6f0b04e6a1fa4c37e06f02af79e5aa02c27f3a.
---
 Riot/Modules/Application/AppCoordinator.swift |  4 +--
 Riot/Modules/Application/LegacyAppDelegate.h  |  2 +-
 Riot/Modules/Application/LegacyAppDelegate.m  | 29 ++++++++++---------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/Riot/Modules/Application/AppCoordinator.swift b/Riot/Modules/Application/AppCoordinator.swift
index 577d62cced..e55874016c 100755
--- a/Riot/Modules/Application/AppCoordinator.swift
+++ b/Riot/Modules/Application/AppCoordinator.swift
@@ -281,9 +281,7 @@ final class AppCoordinator: NSObject, AppCoordinatorType {
         
         switch deepLinkOption {
         case .connect(let loginToken, let transactionID):
-            // Tchap: return to Element way of handling deep link SSO connect
-//            canOpenLink = self.legacyAppDelegate.continueSSOLogin(withToken: loginToken, txnId: transactionID)
-            canOpenLink = AuthenticationService.shared.continueSSOLogin(with: loginToken, and: transactionID)
+            canOpenLink = self.legacyAppDelegate.continueSSOLogin(withToken: loginToken, txnId: transactionID)
         }
         
         return canOpenLink
diff --git a/Riot/Modules/Application/LegacyAppDelegate.h b/Riot/Modules/Application/LegacyAppDelegate.h
index b1aa19ff32..2421e029b4 100644
--- a/Riot/Modules/Application/LegacyAppDelegate.h
+++ b/Riot/Modules/Application/LegacyAppDelegate.h
@@ -294,7 +294,7 @@ UINavigationControllerDelegate
 /// @param loginToken The login token provided when SSO succeeded.
 /// @param txnId transaction id generated during SSO page presentation.
 /// returns YES if the SSO login can be continued.
-//- (BOOL)continueSSOLoginWithToken:(NSString*)loginToken txnId:(NSString*)txnId;
+- (BOOL)continueSSOLoginWithToken:(NSString*)loginToken txnId:(NSString*)txnId;
 
 @end
 
diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
index 7838c9ca6b..ae34bcb445 100644
--- a/Riot/Modules/Application/LegacyAppDelegate.m
+++ b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -4543,20 +4543,21 @@ - (void)callPresenter:(CallPresenter *)presenter exitPipForCallViewController:(U
     [self presentViewController:viewController animated:YES completion:completion];
 }
 
-//#pragma mark - Authentication
-//
-//- (BOOL)continueSSOLoginWithToken:(NSString*)loginToken txnId:(NSString*)txnId
-//{
-//    OnboardingCoordinatorBridgePresenter *bridgePresenter = self.masterTabBarController.onboardingCoordinatorBridgePresenter;
-//    
-//    if (!bridgePresenter)
-//    {
-//        MXLogDebug(@"[AppDelegate] Fail to continue SSO login");
-//        return NO;
-//    }
-//    
-//    [bridgePresenter continueSSOLoginWithToken:loginToken transactionID:txnId];
-//}
+#pragma mark - Authentication
+
+- (BOOL)continueSSOLoginWithToken:(NSString*)loginToken txnId:(NSString*)txnId
+{
+    OnboardingCoordinatorBridgePresenter *bridgePresenter = self.masterTabBarController.onboardingCoordinatorBridgePresenter;
+    
+    if (!bridgePresenter)
+    {
+        MXLogDebug(@"[AppDelegate] Fail to continue SSO login");
+        return NO;
+    }
+    
+    // Tchap:
+    return NO;//[bridgePresenter continueSSOLoginWithToken:loginToken transactionID:txnId];
+}
 
 #pragma mark - Private
 

From 03e1be124572604d405deda4e6a173d0e571fc51 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Wed, 21 Aug 2024 16:47:24 +0200
Subject: [PATCH 11/21] Revert "Reimport "AuthenticationViewController.h" for
 LegacyAuthenticationCoordinator to know AuthenticationViewController class"

This reverts commit 16547cc7614e66da14989dd0d6409fc3c2064c2d.
---
 Riot/Modules/TabBar/MasterTabBarController.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Riot/Modules/TabBar/MasterTabBarController.h b/Riot/Modules/TabBar/MasterTabBarController.h
index 7b9a51a590..51284144df 100644
--- a/Riot/Modules/TabBar/MasterTabBarController.h
+++ b/Riot/Modules/TabBar/MasterTabBarController.h
@@ -15,7 +15,7 @@
  limitations under the License.
  */
 
-#import "AuthenticationViewController.h"
+//#import "AuthenticationViewController.h"
 
 #import "RoomPreviewData.h"
 #import "FavouritesViewController.h"

From 75cb7be6fd4819fb9524504e3c54fa149a10485f Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Wed, 21 Aug 2024 16:47:30 +0200
Subject: [PATCH 12/21] Revert "Reinclude Element Legacy code (for
 LegacyAuthentication for example)"

This reverts commit d512392646c65cc66d363b298d1f8a07842670c3.
---
 Tchap/target.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Tchap/target.yml b/Tchap/target.yml
index 6d44c6dd0b..63080dfe35 100644
--- a/Tchap/target.yml
+++ b/Tchap/target.yml
@@ -177,6 +177,8 @@ targetTemplates:
     - path: ../Riot/Modules/Analytics
     - path: ../Riot/Modules/Application
     - path: ../Riot/Modules/Authentication
+      excludes:
+        - "Legacy"
     - path: ../Riot/Modules/BadgeLabel
     - path: ../Riot/Modules/BugReport/BugReportViewController.h
     - path: ../Riot/Modules/BugReport/BugReportViewController.m

From f3c9e4f01115649a0e2db63de9061dfc73010a3d Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Wed, 21 Aug 2024 16:54:21 +0200
Subject: [PATCH 13/21] Revert "Temporarily disable custom servers for SSO
 tests"

This reverts commit ad5724f8f70f79e4e47626d86af76072a43723f6.
---
 .../Legacy/LegacyAuthenticationCoordinator.swift  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift b/Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
index f77fd61095..4aea0b8b92 100644
--- a/Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
+++ b/Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
@@ -72,14 +72,13 @@ final class LegacyAuthenticationCoordinator: NSObject, AuthenticationCoordinator
         // Set (or clear) any soft-logout credentials.
         authenticationViewController.softLogoutCredentials = authenticationService.softLogoutCredentials
         
-        // Tchap: Don't show custom servers during SSO tests.
-//        // Configure custom servers if already customised by a deep link.
-//        let homeserver = authenticationService.state.homeserver.address
-//        let identityServer = authenticationService.state.identityServer
-//        if homeserver != BuildSettings.serverConfigDefaultHomeserverUrlString
-//            || (identityServer != nil && identityServer != BuildSettings.serverConfigDefaultIdentityServerUrlString) {
-//            authenticationViewController.showCustomHomeserver(homeserver, andIdentityServer: identityServer)
-//        }
+        // Configure custom servers if already customised by a deep link.
+        let homeserver = authenticationService.state.homeserver.address
+        let identityServer = authenticationService.state.identityServer
+        if homeserver != BuildSettings.serverConfigDefaultHomeserverUrlString
+            || (identityServer != nil && identityServer != BuildSettings.serverConfigDefaultIdentityServerUrlString) {
+            authenticationViewController.showCustomHomeserver(homeserver, andIdentityServer: identityServer)
+        }
         
         // Listen for further changes from deep links.
         AuthenticationService.shared.delegate = self

From a3bbf202a283c81b2bae1d2cfc3c4335238ae806 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 3 Sep 2024 13:39:20 +0200
Subject: [PATCH 14/21] Call Element onboarding flow rather than Tchap which
 doesn't support SSO

---
 .../AuthenticationCoordinator.swift           | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/Riot/Modules/Authentication/AuthenticationCoordinator.swift b/Riot/Modules/Authentication/AuthenticationCoordinator.swift
index 295a591f73..b47c20b3bc 100644
--- a/Riot/Modules/Authentication/AuthenticationCoordinator.swift
+++ b/Riot/Modules/Authentication/AuthenticationCoordinator.swift
@@ -151,7 +151,9 @@ final class AuthenticationCoordinator: NSObject, AuthenticationCoordinatorProtoc
             if authenticationService.state.homeserver.needsRegistrationFallback {
                 showFallback(for: flow)
             } else {
-                showRegistrationScreen()
+                // Tchap: force email registration mode
+//                showRegistrationScreen()
+                TchapShowVerifyEmailScreen()
             }
         case .login:
             if authenticationService.state.homeserver.needsLoginFallback {
@@ -379,6 +381,38 @@ final class AuthenticationCoordinator: NSObject, AuthenticationCoordinatorProtoc
         }
     }
     
+    // Tchap: start Registration with VerifyEmail screen
+    /// Shows the login screen.
+    @MainActor private func TchapShowVerifyEmailScreen() {
+        MXLog.debug("[AuthenticationCoordinator] TchapShowVerifyEmailScreen")
+        
+        guard let registrationWizard = authenticationService.registrationWizard else {
+            MXLog.failure("[AuthenticationCoordinator] showStage: Missing the RegistrationWizard needed to complete the stage.")
+            displayError(message: VectorL10n.errorCommonMessage)
+            return
+        }
+        let homeserver = authenticationService.state.homeserver
+
+        let parameters = AuthenticationVerifyEmailCoordinatorParameters(registrationWizard: registrationWizard,
+                                                                        homeserver: authenticationService.state.homeserver)
+        let coordinator = AuthenticationVerifyEmailCoordinator(parameters: parameters)
+        coordinator.callback = { [weak self] result in
+            self?.registrationStageDidComplete(with: result)
+        }
+
+        coordinator.start()
+        add(childCoordinator: coordinator)
+        
+        if navigationRouter.modules.isEmpty {
+            navigationRouter.setRootModule(coordinator, popCompletion: nil)
+        } else {
+            navigationRouter.push(coordinator, animated: true) { [weak self] in
+                self?.remove(childCoordinator: coordinator)
+            }
+        }
+    }
+
+    
     /// Displays the next view in the flow based on the result from the registration screen.
     @MainActor private func registrationCoordinator(_ coordinator: AuthenticationRegistrationCoordinator,
                                                     didCallbackWith result: AuthenticationRegistrationCoordinatorResult) {

From c26dfaf3917f79bba0b87fb181cb238a04325158 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 3 Sep 2024 13:39:59 +0200
Subject: [PATCH 15/21] Customize Element onboarding splash screen to mimic
 Tchap

---
 .../View/OnboardingSplashScreen.swift         | 287 ++++++++++--------
 1 file changed, 167 insertions(+), 120 deletions(-)

diff --git a/RiotSwiftUI/Modules/Onboarding/SplashScreen/View/OnboardingSplashScreen.swift b/RiotSwiftUI/Modules/Onboarding/SplashScreen/View/OnboardingSplashScreen.swift
index b342398826..7bb7b80987 100644
--- a/RiotSwiftUI/Modules/Onboarding/SplashScreen/View/OnboardingSplashScreen.swift
+++ b/RiotSwiftUI/Modules/Onboarding/SplashScreen/View/OnboardingSplashScreen.swift
@@ -25,13 +25,14 @@ struct OnboardingSplashScreen: View {
     @Environment(\.theme) private var theme
     @Environment(\.layoutDirection) private var layoutDirection
     
-    private var isLeftToRight: Bool { layoutDirection == .leftToRight }
-    private var pageCount: Int { viewModel.viewState.content.count }
-    
-    /// A timer to automatically animate the pages.
-    @State private var pageTimer: Timer?
-    /// The amount of offset to apply when a drag gesture is in progress.
-    @State private var dragOffset: CGFloat = .zero
+    // Tchap: remove carousel
+//    private var isLeftToRight: Bool { layoutDirection == .leftToRight }
+//    private var pageCount: Int { viewModel.viewState.content.count }
+//    
+//    /// A timer to automatically animate the pages.
+//    @State private var pageTimer: Timer?
+//    /// The amount of offset to apply when a drag gesture is in progress.
+//    @State private var dragOffset: CGFloat = .zero
     
     // MARK: Public
     
@@ -43,28 +44,41 @@ struct OnboardingSplashScreen: View {
                 Spacer()
                     .frame(height: OnboardingMetrics.spacerHeight(in: geometry))
                 
-                // The main content of the carousel
-                HStack(alignment: .top, spacing: 0) {
-                    // Add a hidden page at the start of the carousel duplicating the content of the last page
-                    OnboardingSplashScreenPage(content: viewModel.viewState.content[pageCount - 1])
-                        .frame(width: geometry.size.width)
-                    
-                    ForEach(0..<pageCount, id: \.self) { index in
-                        OnboardingSplashScreenPage(content: viewModel.viewState.content[index])
-                            .frame(width: geometry.size.width)
-                    }
-                }
-                .offset(x: pageOffset(in: geometry))
+                // Tchap: remove carousel
+//                // The main content of the carousel
+//                HStack(alignment: .top, spacing: 0) {
+//                    // Add a hidden page at the start of the carousel duplicating the content of the last page
+//                    OnboardingSplashScreenPage(content: viewModel.viewState.content[pageCount - 1])
+//                        .frame(width: geometry.size.width)
+//                    
+//                    ForEach(0..<pageCount, id: \.self) { index in
+//                        OnboardingSplashScreenPage(content: viewModel.viewState.content[index])
+//                            .frame(width: geometry.size.width)
+//                    }
+//                }
+//                .offset(x: pageOffset(in: geometry))
+//                
+//                Spacer()
+//                
+//                OnboardingSplashScreenPageIndicator(pageCount: pageCount,
+//                                                    pageIndex: viewModel.pageIndex)
+//                    .frame(width: geometry.size.width)
+//                    .padding(.bottom)
                 
                 Spacer()
                 
-                OnboardingSplashScreenPageIndicator(pageCount: pageCount,
-                                                    pageIndex: viewModel.pageIndex)
-                    .frame(width: geometry.size.width)
-                    .padding(.bottom)
+                // Tchap: welcome title
+                HStack() {
+                    Spacer()
+                    Text(TchapL10n.welcomeTitle)
+                        .font(.system(size: 22.0, weight: .light))
+                        .foregroundStyle(Color(ThemeService.shared().theme.textTertiaryColor))
+                    Spacer()
+                }
                 
                 Spacer()
-                
+                Spacer()
+
                 buttons
                     .frame(width: geometry.size.width)
                     .padding(.bottom, OnboardingMetrics.actionButtonBottomPadding)
@@ -74,36 +88,67 @@ struct OnboardingSplashScreen: View {
                     .frame(height: OnboardingMetrics.spacerHeight(in: geometry))
             }
             .frame(maxHeight: .infinity)
-            .background(background.ignoresSafeArea().offset(x: pageOffset(in: geometry)))
-            .gesture(
-                DragGesture()
-                    .onChanged(handleDragGestureChange)
-                    .onEnded { handleDragGestureEnded($0, viewSize: geometry.size) }
-            )
+            // Tchap: tchap background color
+            .background(Color(ThemeService.shared().theme.backgroundColor))
+            // Tchap: remove carousel
+//            .background(background.ignoresSafeArea().offset(x: pageOffset(in: geometry)))
+//            .gesture(
+//                DragGesture()
+//                    .onChanged(handleDragGestureChange)
+//                    .onEnded { handleDragGestureEnded($0, viewSize: geometry.size) }
+//            )
         }
         .accentColor(theme.colors.accent)
         .navigationBarHidden(true)
-        .onAppear {
-            startTimer()
-        }
-        .onDisappear { stopTimer() }
+        // Tchap: remove carousel
+//        .onAppear {
+//            startTimer()
+//        }
+//        .onDisappear { stopTimer() }
         .track(screen: .welcome)
     }
     
     /// The main action buttons.
     var buttons: some View {
-        VStack(spacing: 12) {
-            Button { viewModel.send(viewAction: .register) } label: {
-                Text(VectorL10n.onboardingSplashRegisterButtonTitle)
+        // Tchap: set Tchap buttons
+//        VStack(spacing: 12) {
+//            Button { viewModel.send(viewAction: .register) } label: {
+//                Text(VectorL10n.onboardingSplashRegisterButtonTitle)
+//            }
+//            .buttonStyle(PrimaryActionButtonStyle())
+//            
+//            Button { viewModel.send(viewAction: .login) } label: {
+//                Text(VectorL10n.onboardingSplashLoginButtonTitle)
+//                    .font(theme.fonts.body)
+//                    .padding(12)
+//            }
+//        }
+//        .padding(.horizontal, 16)
+//        .readableFrame()
+        
+        HStack {
+            HStack {
+                Spacer()
+                Button { viewModel.send(viewAction: .register) } label: {
+                    Text(TchapL10n.welcomeRegisterAction)
+                }
+                Spacer()
             }
-            .buttonStyle(PrimaryActionButtonStyle())
             
-            Button { viewModel.send(viewAction: .login) } label: {
-                Text(VectorL10n.onboardingSplashLoginButtonTitle)
-                    .font(theme.fonts.body)
-                    .padding(12)
+            Rectangle()
+                .foregroundColor(Color(ThemeService.shared().theme.selectedBackgroundColor))
+                .frame(width: 1.0, height: 52.0)
+            
+            HStack {
+                Spacer()
+                Button { viewModel.send(viewAction: .login) } label: {
+                    Text(TchapL10n.welcomeLoginAction)
+                }
+                Spacer()
             }
         }
+        .foregroundStyle(Color(ThemeService.shared().theme.tintColor))
+        .font(.system(size: 15.0))
         .padding(.horizontal, 16)
         .readableFrame()
     }
@@ -123,85 +168,87 @@ struct OnboardingSplashScreen: View {
     
     // MARK: - Animation
     
-    /// Starts the animation timer for an automatic carousel effect.
-    private func startTimer() {
-        guard pageTimer == nil else { return }
-        
-        pageTimer = Timer.scheduledTimer(withTimeInterval: 5, repeats: true) { _ in
-            if viewModel.pageIndex == pageCount - 1 {
-                viewModel.send(viewAction: .hiddenPage)
-                
-                withAnimation(.easeInOut(duration: 0.7)) {
-                    viewModel.send(viewAction: .nextPage)
-                }
-            } else {
-                withAnimation(.easeInOut(duration: 0.7)) {
-                    viewModel.send(viewAction: .nextPage)
-                }
-            }
-        }
-    }
-    
-    /// Stops the animation timer for manual interaction.
-    private func stopTimer() {
-        guard let pageTimer = pageTimer else { return }
-        
-        self.pageTimer = nil
-        pageTimer.invalidate()
-    }
-    
-    /// The offset to apply to the `HStack` of pages.
-    private func pageOffset(in geometry: GeometryProxy) -> CGFloat {
-        (CGFloat(viewModel.pageIndex + 1) * -geometry.size.width) + dragOffset
-    }
-    
-    // MARK: - Gestures
-    
-    /// Whether or not a drag gesture is valid or not.
-    /// - Parameter width: The gesture's translation width.
-    /// - Returns: `true` if there is another page to drag to.
-    private func shouldSwipeForTranslation(_ width: CGFloat) -> Bool {
-        if viewModel.pageIndex == 0 {
-            return isLeftToRight ? width < 0 : width > 0
-        } else if viewModel.pageIndex == pageCount - 1 {
-            return isLeftToRight ? width > 0 : width < 0
-        }
-        
-        return true
-    }
-    
-    /// Updates the `dragOffset` based on the gesture's value.
-    /// - Parameter drag: The drag gesture value to handle.
-    private func handleDragGestureChange(_ drag: DragGesture.Value) {
-        guard shouldSwipeForTranslation(drag.translation.width) else { return }
-        
-        stopTimer()
-        
-        // Animate the change over a few frames to smooth out any stuttering.
-        withAnimation(.linear(duration: 0.05)) {
-            dragOffset = isLeftToRight ? drag.translation.width : -drag.translation.width
-        }
-    }
+    // Tchap: remove carousel
     
-    /// Clears the drag offset and informs the view model to switch to another page if necessary.
-    /// - Parameter viewSize: The size of the view in which the gesture took place.
-    private func handleDragGestureEnded(_ drag: DragGesture.Value, viewSize: CGSize) {
-        guard shouldSwipeForTranslation(drag.predictedEndTranslation.width) else {
-            // Reset the offset just in case.
-            withAnimation { dragOffset = 0 }
-            return
-        }
-        
-        withAnimation(.easeInOut(duration: 0.2)) {
-            if drag.predictedEndTranslation.width < -viewSize.width / 2 {
-                viewModel.send(viewAction: .nextPage)
-            } else if drag.predictedEndTranslation.width > viewSize.width / 2 {
-                viewModel.send(viewAction: .previousPage)
-            }
-            
-            dragOffset = 0
-        }
-    }
+//    /// Starts the animation timer for an automatic carousel effect.
+//    private func startTimer() {
+//        guard pageTimer == nil else { return }
+//        
+//        pageTimer = Timer.scheduledTimer(withTimeInterval: 5, repeats: true) { _ in
+//            if viewModel.pageIndex == pageCount - 1 {
+//                viewModel.send(viewAction: .hiddenPage)
+//                
+//                withAnimation(.easeInOut(duration: 0.7)) {
+//                    viewModel.send(viewAction: .nextPage)
+//                }
+//            } else {
+//                withAnimation(.easeInOut(duration: 0.7)) {
+//                    viewModel.send(viewAction: .nextPage)
+//                }
+//            }
+//        }
+//    }
+//    
+//    /// Stops the animation timer for manual interaction.
+//    private func stopTimer() {
+//        guard let pageTimer = pageTimer else { return }
+//        
+//        self.pageTimer = nil
+//        pageTimer.invalidate()
+//    }
+//    
+//    /// The offset to apply to the `HStack` of pages.
+//    private func pageOffset(in geometry: GeometryProxy) -> CGFloat {
+//        (CGFloat(viewModel.pageIndex + 1) * -geometry.size.width) + dragOffset
+//    }
+//    
+//    // MARK: - Gestures
+//    
+//    /// Whether or not a drag gesture is valid or not.
+//    /// - Parameter width: The gesture's translation width.
+//    /// - Returns: `true` if there is another page to drag to.
+//    private func shouldSwipeForTranslation(_ width: CGFloat) -> Bool {
+//        if viewModel.pageIndex == 0 {
+//            return isLeftToRight ? width < 0 : width > 0
+//        } else if viewModel.pageIndex == pageCount - 1 {
+//            return isLeftToRight ? width > 0 : width < 0
+//        }
+//        
+//        return true
+//    }
+//    
+//    /// Updates the `dragOffset` based on the gesture's value.
+//    /// - Parameter drag: The drag gesture value to handle.
+//    private func handleDragGestureChange(_ drag: DragGesture.Value) {
+//        guard shouldSwipeForTranslation(drag.translation.width) else { return }
+//        
+//        stopTimer()
+//        
+//        // Animate the change over a few frames to smooth out any stuttering.
+//        withAnimation(.linear(duration: 0.05)) {
+//            dragOffset = isLeftToRight ? drag.translation.width : -drag.translation.width
+//        }
+//    }
+//    
+//    /// Clears the drag offset and informs the view model to switch to another page if necessary.
+//    /// - Parameter viewSize: The size of the view in which the gesture took place.
+//    private func handleDragGestureEnded(_ drag: DragGesture.Value, viewSize: CGSize) {
+//        guard shouldSwipeForTranslation(drag.predictedEndTranslation.width) else {
+//            // Reset the offset just in case.
+//            withAnimation { dragOffset = 0 }
+//            return
+//        }
+//        
+//        withAnimation(.easeInOut(duration: 0.2)) {
+//            if drag.predictedEndTranslation.width < -viewSize.width / 2 {
+//                viewModel.send(viewAction: .nextPage)
+//            } else if drag.predictedEndTranslation.width > viewSize.width / 2 {
+//                viewModel.send(viewAction: .previousPage)
+//            }
+//            
+//            dragOffset = 0
+//        }
+//    }
 }
 
 // MARK: - Previews

From df4a149f1d4aed733a9d358363bfe26e1bacceb2 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 3 Sep 2024 16:05:50 +0200
Subject: [PATCH 16/21] Remove Tchap welcome classes

---
 .../AllChats/AllChatsViewController.swift     |   8 +-
 Riot/Modules/TabBar/TabBarCoordinator.swift   |  30 ++--
 .../Modules/Welcome/WelcomeCoordinator.swift  | 157 ------------------
 .../WelcomeCoordinatorBridgePresenter.swift   | 116 -------------
 .../Welcome/WelcomeCoordinatorType.swift      |  21 ---
 .../Welcome/WelcomeViewController.storyboard  |  76 ---------
 .../Welcome/WelcomeViewController.swift       | 122 --------------
 7 files changed, 18 insertions(+), 512 deletions(-)
 delete mode 100644 Tchap/Modules/Welcome/WelcomeCoordinator.swift
 delete mode 100644 Tchap/Modules/Welcome/WelcomeCoordinatorBridgePresenter.swift
 delete mode 100644 Tchap/Modules/Welcome/WelcomeCoordinatorType.swift
 delete mode 100644 Tchap/Modules/Welcome/WelcomeViewController.storyboard
 delete mode 100644 Tchap/Modules/Welcome/WelcomeViewController.swift

diff --git a/Riot/Modules/Home/AllChats/AllChatsViewController.swift b/Riot/Modules/Home/AllChats/AllChatsViewController.swift
index 688047ed4d..7fd2540690 100644
--- a/Riot/Modules/Home/AllChats/AllChatsViewController.swift
+++ b/Riot/Modules/Home/AllChats/AllChatsViewController.swift
@@ -108,7 +108,7 @@ class AllChatsViewController: HomeViewController {
     // Reference to the current onboarding flow. It is always nil unless the flow is being presented.
     private(set) var onboardingCoordinatorBridgePresenter: OnboardingCoordinatorBridgePresenter?
     // Tchap: Use welcomeCoordinator instead of onboardingCoordinator
-    private(set) var welcomeCoordinatorBridgePresenter: WelcomeCoordinatorBridgePresenter?
+//    private(set) var welcomeCoordinatorBridgePresenter: WelcomeCoordinatorBridgePresenter?
     
     // Tell whether the onboarding screen is preparing.
     private(set) var isOnboardingInProgress: Bool = false
@@ -921,8 +921,7 @@ extension AllChatsViewController: SplitViewMasterViewControllerProtocol {
         // This method can be called after the user chooses to clear their data as the MXSession
         // is opened to call logout from. So we only set the credentials when authentication isn't
         // in progress to prevent a second soft logout screen being shown.
-        // Tchap: Use WelcomeCoordinatorBridgePresenter instead of OnboardingCoordinatorBridgePresenter
-        guard self.welcomeCoordinatorBridgePresenter == nil && !self.isOnboardingCoordinatorPreparing else {
+        guard self.onboardingCoordinatorBridgePresenter == nil && !self.isOnboardingCoordinatorPreparing else {
             return
         }
 
@@ -1092,8 +1091,7 @@ extension AllChatsViewController: SplitViewMasterViewControllerProtocol {
 
     private func showOnboardingFlowAndResetSessionFlags(_ resetSessionFlags: Bool) {
         // Check whether an authentication screen is not already shown or preparing
-        // Tchap: Use WelcomeCoordinatorBridgePresenter instead of OnboardingCoordinatorBridgePresenter
-        guard self.welcomeCoordinatorBridgePresenter == nil && !self.isOnboardingCoordinatorPreparing else {
+        guard self.onboardingCoordinatorBridgePresenter == nil && !self.isOnboardingCoordinatorPreparing else {
             return
         }
 
diff --git a/Riot/Modules/TabBar/TabBarCoordinator.swift b/Riot/Modules/TabBar/TabBarCoordinator.swift
index b3ce06ba84..0d240cc191 100644
--- a/Riot/Modules/TabBar/TabBarCoordinator.swift
+++ b/Riot/Modules/TabBar/TabBarCoordinator.swift
@@ -639,13 +639,13 @@ final class TabBarCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
     }
     
     private func showWelcome(animated: Bool = false) {
-        let welcomeCoordinator = WelcomeCoordinator()
-        welcomeCoordinator.delegate = self
-        welcomeCoordinator.start()
-        self.add(childCoordinator: welcomeCoordinator)
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5 , execute: { [weak self] in
-            self?.navigationRouter.present(welcomeCoordinator, animated: animated)
-        })
+//        let welcomeCoordinator = WelcomeCoordinator()
+//        welcomeCoordinator.delegate = self
+//        welcomeCoordinator.start()
+//        self.add(childCoordinator: welcomeCoordinator)
+//        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5 , execute: { [weak self] in
+//            self?.navigationRouter.present(welcomeCoordinator, animated: animated)
+//        })
     }
     
     private func userDidLogin() -> Bool {
@@ -1163,14 +1163,14 @@ extension TabBarCoordinator: SecureBackupSetupCoordinatorBridgePresenterDelegate
 }
 
 // MARK: - WelcomeCoordinatorDelegate
-extension TabBarCoordinator: WelcomeCoordinatorDelegate {
-    func welcomeCoordinatorUserDidAuthenticate(_ coordinator: WelcomeCoordinatorType) {
-        // Check that the new account actually exists before removing the current coordinator
-        if userDidLogin() {
-            self.remove(childCoordinator: coordinator)
-        }
-    }
-}
+//extension TabBarCoordinator: WelcomeCoordinatorDelegate {
+//    func welcomeCoordinatorUserDidAuthenticate(_ coordinator: WelcomeCoordinatorType) {
+//        // Check that the new account actually exists before removing the current coordinator
+//        if userDidLogin() {
+//            self.remove(childCoordinator: coordinator)
+//        }
+//    }
+//}
 
 // MARK: - RoomsViewControllerDelegate
 extension TabBarCoordinator: RoomsViewControllerDelegate {
diff --git a/Tchap/Modules/Welcome/WelcomeCoordinator.swift b/Tchap/Modules/Welcome/WelcomeCoordinator.swift
deleted file mode 100644
index b7e8175cec..0000000000
--- a/Tchap/Modules/Welcome/WelcomeCoordinator.swift
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- Copyright 2018 New Vector Ltd
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import Foundation
-
-protocol WelcomeCoordinatorDelegate: AnyObject {
-    func welcomeCoordinatorUserDidAuthenticate(_ coordinator: WelcomeCoordinatorType)
-}
-
-final class WelcomeCoordinator: WelcomeCoordinatorType {
-    
-    // MARK: - Properties
-    
-    // MARK: Private
-    
-    private let navigationRouter: NavigationRouterType
-    private let welcomeViewController: WelcomeViewController
-    
-    // MARK: Public
-    
-    var childCoordinators: [Coordinator] = []
-    
-    weak var delegate: WelcomeCoordinatorDelegate?
-    
-    // MARK: - Setup
-    
-    init() {
-        let navController = RiotNavigationController()
-        navController.modalPresentationStyle = .fullScreen
-        self.navigationRouter = NavigationRouter(navigationController: navController)
-        
-        let welcomeViewController = WelcomeViewController.instantiate()
-        welcomeViewController.vc_removeBackTitle()
-        self.welcomeViewController = welcomeViewController        
-    }
-    
-    // MARK: - Public methods
-    
-    func start() {
-        self.navigationRouter.setRootModule(self.welcomeViewController, hideNavigationBar: true, animated: false, popCompletion: nil)
-        self.welcomeViewController.delegate = self
-    }
-    
-    func toPresentable() -> UIViewController {
-        return self.navigationRouter.toPresentable()
-    }
-    
-    // MARK: - Private methods
-    
-    @MainActor private func showAuthentication() async {
-        let authService = AuthenticationService.shared
-        await updateAuthServiceForDirectAuthentication()
-        let parameters = AuthenticationLoginCoordinatorParameters(navigationRouter: self.navigationRouter,
-                                                                  authenticationService: authService,
-                                                                  loginMode: .password)
-        let authenticationLoginCoordinator = AuthenticationLoginCoordinator(parameters: parameters)
-        authenticationLoginCoordinator.callback = { [weak self] result in
-            guard let self = self else { return }
-            self.delegate?.welcomeCoordinatorUserDidAuthenticate(self)
-        }
-        authenticationLoginCoordinator.start()
-        self.add(childCoordinator: authenticationLoginCoordinator)
-        
-        if navigationRouter.modules.isEmpty {
-            navigationRouter.setRootModule(authenticationLoginCoordinator, popCompletion: nil)
-        } else {
-            navigationRouter.push(authenticationLoginCoordinator, animated: true) { [weak self] in
-                self?.remove(childCoordinator: authenticationLoginCoordinator)
-            }
-        }
-    }
-    
-    // Start login flow by updating AuthenticationService
-    private func updateAuthServiceForDirectAuthentication() async {
-        let authService = AuthenticationService.shared
-        authService.reset()
-        do {
-            try await authService.startFlow(.login)
-        } catch {
-            MXLog.error("[WelcomeCoordinator] Unable to start flow for login.")
-        }
-    }
-    
-    @MainActor private func showRegistration() async {
-        let authenticationService = AuthenticationService.shared
-        do {
-            try await authenticationService.startFlow(.register)
-        } catch {
-            MXLog.error("[WelcomeCoordinator] showRegistration error")
-        }
-        guard let registrationWizard = authenticationService.registrationWizard else {
-            return
-        }
-        let parameters = AuthenticationVerifyEmailCoordinatorParameters(registrationWizard: registrationWizard,
-                                                                        homeserver: authenticationService.state.homeserver)
-        let coordinator = AuthenticationVerifyEmailCoordinator(parameters: parameters)
-        coordinator.callback = { [weak self] result in
-            guard let self = self else { return }
-            switch result {
-            case .cancel:
-                MXLog.warning("[WelcomeCoordinator] Registration cancelled")
-                self.cancelRegisterFlow()
-            case .completed(let registrationResult):
-                switch registrationResult {
-                case .success:
-                    self.delegate?.welcomeCoordinatorUserDidAuthenticate(self)
-                case .flowResponse:
-                    MXLog.warning("[WelcomeCoordinator] flowResponse")
-                }
-            }
-        }
-        
-        coordinator.start()
-        add(childCoordinator: coordinator)
-        
-        if navigationRouter.modules.isEmpty {
-            navigationRouter.setRootModule(coordinator, popCompletion: nil)
-        } else {
-            navigationRouter.push(coordinator, animated: true) { [weak self] in
-                self?.remove(childCoordinator: coordinator)
-            }
-        }
-    }
-    
-    /// Cancels the registration flow, returning to the Welcome screen.
-    private func cancelRegisterFlow() {
-        navigationRouter.popAllModules(animated: false)
-    }
-}
-
-// MARK: - WelcomeViewControllerDelegate
-extension WelcomeCoordinator: WelcomeViewControllerDelegate {
-    @MainActor func welcomeViewControllerDidTapLoginButton(_ welcomeViewController: WelcomeViewController) {
-        Task {
-            await self.showAuthentication()
-        }
-    }
-    
-    @MainActor func welcomeViewControllerDidTapRegisterButton(_ welcomeViewController: WelcomeViewController) {
-        Task {
-            await self.showRegistration()
-        }
-    }
-}
diff --git a/Tchap/Modules/Welcome/WelcomeCoordinatorBridgePresenter.swift b/Tchap/Modules/Welcome/WelcomeCoordinatorBridgePresenter.swift
deleted file mode 100644
index 5ae6c26267..0000000000
--- a/Tchap/Modules/Welcome/WelcomeCoordinatorBridgePresenter.swift
+++ /dev/null
@@ -1,116 +0,0 @@
-// 
-// Copyright 2022 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-/// WelcomeCoordinatorBridgePresenter enables to start WelcomeCoordinator from a view controller.
-/// This bridge is used while waiting for global usage of coordinator pattern.
-/// **WARNING**: This class breaks the Coordinator abstraction and it has been introduced for **Objective-C compatibility only** (mainly for integration in legacy view controllers). Each bridge should be removed
-/// once the underlying Coordinator has been integrated by another Coordinator.
-@objcMembers
-final class WelcomeCoordinatorBridgePresenter: NSObject {
-    
-    // MARK: - Constants
-    
-    private enum NavigationType {
-        case present
-        case push
-    }
-    
-    // MARK: - Properties
-    
-    // MARK: Private
-    
-    private var navigationType: NavigationType = .present
-    private var coordinator: WelcomeCoordinator?
-    
-    // MARK: Public
-    
-    var completion: (() -> Void)?
-    
-    // MARK: - Public
-    
-    func present(from viewController: UIViewController, animated: Bool) {
-        let welcomeCoordinator = makeWelcomeCoordinator()
-        
-        let presentable = welcomeCoordinator.toPresentable()
-        presentable.modalPresentationStyle = .fullScreen
-        presentable.modalTransitionStyle = .crossDissolve
-        
-        viewController.present(presentable, animated: animated, completion: nil)
-        welcomeCoordinator.start()
-        
-        self.coordinator = welcomeCoordinator
-        self.navigationType = .present
-    }
-    
-    func push(from navigationController: UINavigationController, animated: Bool) {
-                
-        let navigationRouter = NavigationRouterStore.shared.navigationRouter(for: navigationController)
-        
-        let welcomeCoordinator = makeWelcomeCoordinator(navigationRouter: navigationRouter)
-
-        welcomeCoordinator.start() // Will trigger the view controller push
-        
-        self.coordinator = welcomeCoordinator
-        self.navigationType = .push
-    }
-    
-    func dismiss(animated: Bool, completion: (() -> Void)?) {
-        guard let coordinator = self.coordinator else {
-            return
-        }
-
-        switch navigationType {
-        case .present:
-            // Dismiss modal
-            coordinator.toPresentable().dismiss(animated: animated) {
-                self.coordinator = nil
-
-                if let completion = completion {
-                    completion()
-                }
-            }
-        case .push:
-            // Pop view controller from UINavigationController
-            guard let navigationController = coordinator.toPresentable() as? UINavigationController else {
-                return
-            }
-            navigationController.popViewController(animated: animated)
-            self.coordinator = nil
-
-            if let completion = completion {
-                completion()
-            }
-        }
-    }
-    
-    // MARK: - Private
-    
-    /// Makes an `WelcomeCoordinator` using the supplied navigation router, or creating one if needed.
-    private func makeWelcomeCoordinator(navigationRouter: NavigationRouterType? = nil) -> WelcomeCoordinator {
-        let welcomeCoordinator = WelcomeCoordinator()
-        welcomeCoordinator.delegate = self
-        return welcomeCoordinator
-    }
-}
-
-// MARK: - WelcomeCoordinatorDelegate
-extension WelcomeCoordinatorBridgePresenter: WelcomeCoordinatorDelegate {
-    func welcomeCoordinatorUserDidAuthenticate(_ coordinator: WelcomeCoordinatorType) {
-        self.completion?()
-    }
-}
diff --git a/Tchap/Modules/Welcome/WelcomeCoordinatorType.swift b/Tchap/Modules/Welcome/WelcomeCoordinatorType.swift
deleted file mode 100644
index aedbc99eb3..0000000000
--- a/Tchap/Modules/Welcome/WelcomeCoordinatorType.swift
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- Copyright 2018 New Vector Ltd
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import Foundation
-
-/// `WelcomeCoordinatorType` is a protocol describing a Coordinator that handle welcome navigation flow.
-protocol WelcomeCoordinatorType: Coordinator, Presentable {    
-}
diff --git a/Tchap/Modules/Welcome/WelcomeViewController.storyboard b/Tchap/Modules/Welcome/WelcomeViewController.storyboard
deleted file mode 100644
index 61015ae9a3..0000000000
--- a/Tchap/Modules/Welcome/WelcomeViewController.storyboard
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="GI0-WS-UMc">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--Welcome View Controller-->
-        <scene sceneID="pkY-qk-M2a">
-            <objects>
-                <viewController id="GI0-WS-UMc" customClass="WelcomeViewController" customModule="Tchap" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="Lzt-XD-X7W">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e8O-74-cvD">
-                                <rect key="frame" x="20" y="209" width="335" height="26.5"/>
-                                <fontDescription key="fontDescription" type="system" weight="light" pointSize="22"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dMQ-g0-JN2">
-                                <rect key="frame" x="20" y="593" width="147" height="30"/>
-                                <state key="normal" title="Button"/>
-                                <connections>
-                                    <action selector="registerButtonAction:" destination="GI0-WS-UMc" eventType="touchUpInside" id="d69-Gr-EPw"/>
-                                </connections>
-                            </button>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hTp-fL-9o8">
-                                <rect key="frame" x="187" y="582" width="1" height="52"/>
-                                <color key="backgroundColor" red="0.33836611049681253" green="0.43916532595071023" blue="1" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="1" id="2T4-ZO-INs"/>
-                                    <constraint firstAttribute="height" constant="52" id="mFs-7z-Lcf"/>
-                                </constraints>
-                            </view>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="u7L-Qx-m9o">
-                                <rect key="frame" x="207" y="593" width="148" height="30"/>
-                                <state key="normal" title="Button"/>
-                                <connections>
-                                    <action selector="loginButtonAction:" destination="GI0-WS-UMc" eventType="touchUpInside" id="s1a-aI-RfW"/>
-                                </connections>
-                            </button>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="oBJ-KQ-riZ"/>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <constraints>
-                            <constraint firstItem="u7L-Qx-m9o" firstAttribute="leading" secondItem="hTp-fL-9o8" secondAttribute="leading" constant="20" id="70w-oh-ATr"/>
-                            <constraint firstItem="hTp-fL-9o8" firstAttribute="centerX" secondItem="oBJ-KQ-riZ" secondAttribute="centerX" id="C5C-IC-0hP"/>
-                            <constraint firstItem="oBJ-KQ-riZ" firstAttribute="trailing" secondItem="e8O-74-cvD" secondAttribute="trailing" constant="20" id="Jyz-WZ-hHC"/>
-                            <constraint firstItem="hTp-fL-9o8" firstAttribute="leading" secondItem="dMQ-g0-JN2" secondAttribute="trailing" constant="20" id="MdE-N7-5Fp"/>
-                            <constraint firstItem="u7L-Qx-m9o" firstAttribute="centerY" secondItem="hTp-fL-9o8" secondAttribute="centerY" id="R41-A2-HKi"/>
-                            <constraint firstItem="e8O-74-cvD" firstAttribute="leading" secondItem="oBJ-KQ-riZ" secondAttribute="leading" constant="20" id="XzH-yN-CUr"/>
-                            <constraint firstItem="e8O-74-cvD" firstAttribute="centerY" secondItem="oBJ-KQ-riZ" secondAttribute="centerY" multiplier="2:3" id="erv-6g-6fh"/>
-                            <constraint firstItem="oBJ-KQ-riZ" firstAttribute="trailing" secondItem="u7L-Qx-m9o" secondAttribute="trailing" constant="20" id="nrN-aO-3qE"/>
-                            <constraint firstItem="dMQ-g0-JN2" firstAttribute="leading" secondItem="oBJ-KQ-riZ" secondAttribute="leading" constant="20" id="umk-vL-Bs4"/>
-                            <constraint firstItem="oBJ-KQ-riZ" firstAttribute="bottom" secondItem="hTp-fL-9o8" secondAttribute="bottom" constant="33" id="wlj-7J-zOs"/>
-                            <constraint firstItem="dMQ-g0-JN2" firstAttribute="centerY" secondItem="hTp-fL-9o8" secondAttribute="centerY" id="yDL-J9-tb2"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="buttonsSeparatorView" destination="hTp-fL-9o8" id="wIx-oE-CY3"/>
-                        <outlet property="loginButton" destination="u7L-Qx-m9o" id="xHs-Sh-AwF"/>
-                        <outlet property="registerButton" destination="dMQ-g0-JN2" id="Nbu-uJ-DKf"/>
-                        <outlet property="titleLabel" destination="e8O-74-cvD" id="HpE-16-KaD"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="hL3-Da-L8K" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-31.199999999999999" y="187.55622188905548"/>
-        </scene>
-    </scenes>
-</document>
diff --git a/Tchap/Modules/Welcome/WelcomeViewController.swift b/Tchap/Modules/Welcome/WelcomeViewController.swift
deleted file mode 100644
index f283b6df30..0000000000
--- a/Tchap/Modules/Welcome/WelcomeViewController.swift
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- Copyright 2018 New Vector Ltd
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-protocol WelcomeViewControllerDelegate: AnyObject {
-    func welcomeViewControllerDidTapLoginButton(_ welcomeViewController: WelcomeViewController)
-    func welcomeViewControllerDidTapRegisterButton(_ welcomeViewController: WelcomeViewController)
-}
-
-final class WelcomeViewController: UIViewController {
-    
-    // MARK: - Properties
-    
-    // MARK: Outlets
-    
-    @IBOutlet private weak var titleLabel: UILabel!
-    @IBOutlet private weak var registerButton: UIButton!
-    @IBOutlet private weak var loginButton: UIButton!
-    @IBOutlet private weak var buttonsSeparatorView: UIView!
-    
-    // MARK: Private
-    
-    private var theme: Theme!
-    
-    // MARK: Public
-    
-    weak var delegate: WelcomeViewControllerDelegate?
-    
-    // MARK: - Setup
-    
-    class func instantiate() -> WelcomeViewController {
-        let viewController = StoryboardScene.WelcomeViewController.initialScene.instantiate()
-        return viewController
-    }
-    
-    // MARK: - Life cycle
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        // Do any additional setup after loading the view.
-        
-        self.title = TchapL10n.authenticationTitle
-        
-        self.setupViews()
-
-        self.registerThemeServiceDidChangeThemeNotification()
-        self.theme = ThemeService.shared().theme
-        self.update(theme: self.theme)
-    }
-    
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        
-        self.navigationController?.setNavigationBarHidden(true, animated: animated)
-    }
-    
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        
-        self.navigationController?.setNavigationBarHidden(false, animated: animated)
-    }
-    
-    override var preferredStatusBarStyle: UIStatusBarStyle {
-        return ThemeService.shared().theme.statusBarStyle
-    }
-    
-    // MARK: - Private
-    
-    private func setupViews() {
-        self.titleLabel.text = TchapL10n.welcomeTitle
-        
-        self.registerButton.setTitle(TchapL10n.welcomeRegisterAction, for: .normal)
-        self.registerButton.titleLabel?.numberOfLines = 0
-        
-        self.loginButton.setTitle(TchapL10n.welcomeLoginAction, for: .normal)
-        self.loginButton.titleLabel?.numberOfLines = 0
-    }
-    
-    private func registerThemeServiceDidChangeThemeNotification() {
-        NotificationCenter.default.addObserver(self, selector: #selector(themeDidChange), name: .themeServiceDidChangeTheme, object: nil)
-    }
-    
-    @objc private func themeDidChange() {
-        self.update(theme: ThemeService.shared().theme)
-    }
-    
-    // MARK: - Actions
-    
-    @IBAction private func loginButtonAction(_ sender: Any) {
-        self.delegate?.welcomeViewControllerDidTapLoginButton(self)
-    }
-    
-    @IBAction private func registerButtonAction(_ sender: Any) {
-        self.delegate?.welcomeViewControllerDidTapRegisterButton(self)
-    }
-}
-
-// MARK: - Theme
-private extension WelcomeViewController {
-    private func update(theme: Theme) {
-        self.theme = theme
-        
-        self.view.backgroundColor = theme.backgroundColor
-        self.titleLabel.textColor = theme.textTertiaryColor
-        self.buttonsSeparatorView.backgroundColor = theme.selectedBackgroundColor
-        
-        theme.applyStyle(onButton: self.loginButton)
-        theme.applyStyle(onButton: self.registerButton)
-    }
-}

From 87b6c683dbd6737156d0a8d24c7e5653b2b69595 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 3 Sep 2024 16:11:24 +0200
Subject: [PATCH 17/21] Revert "Remove Tchap welcome classes"

This reverts commit df4a149f1d4aed733a9d358363bfe26e1bacceb2.
---
 .../AllChats/AllChatsViewController.swift     |   8 +-
 Riot/Modules/TabBar/TabBarCoordinator.swift   |  30 ++--
 .../Modules/Welcome/WelcomeCoordinator.swift  | 157 ++++++++++++++++++
 .../WelcomeCoordinatorBridgePresenter.swift   | 116 +++++++++++++
 .../Welcome/WelcomeCoordinatorType.swift      |  21 +++
 .../Welcome/WelcomeViewController.storyboard  |  76 +++++++++
 .../Welcome/WelcomeViewController.swift       | 122 ++++++++++++++
 7 files changed, 512 insertions(+), 18 deletions(-)
 create mode 100644 Tchap/Modules/Welcome/WelcomeCoordinator.swift
 create mode 100644 Tchap/Modules/Welcome/WelcomeCoordinatorBridgePresenter.swift
 create mode 100644 Tchap/Modules/Welcome/WelcomeCoordinatorType.swift
 create mode 100644 Tchap/Modules/Welcome/WelcomeViewController.storyboard
 create mode 100644 Tchap/Modules/Welcome/WelcomeViewController.swift

diff --git a/Riot/Modules/Home/AllChats/AllChatsViewController.swift b/Riot/Modules/Home/AllChats/AllChatsViewController.swift
index 7fd2540690..688047ed4d 100644
--- a/Riot/Modules/Home/AllChats/AllChatsViewController.swift
+++ b/Riot/Modules/Home/AllChats/AllChatsViewController.swift
@@ -108,7 +108,7 @@ class AllChatsViewController: HomeViewController {
     // Reference to the current onboarding flow. It is always nil unless the flow is being presented.
     private(set) var onboardingCoordinatorBridgePresenter: OnboardingCoordinatorBridgePresenter?
     // Tchap: Use welcomeCoordinator instead of onboardingCoordinator
-//    private(set) var welcomeCoordinatorBridgePresenter: WelcomeCoordinatorBridgePresenter?
+    private(set) var welcomeCoordinatorBridgePresenter: WelcomeCoordinatorBridgePresenter?
     
     // Tell whether the onboarding screen is preparing.
     private(set) var isOnboardingInProgress: Bool = false
@@ -921,7 +921,8 @@ extension AllChatsViewController: SplitViewMasterViewControllerProtocol {
         // This method can be called after the user chooses to clear their data as the MXSession
         // is opened to call logout from. So we only set the credentials when authentication isn't
         // in progress to prevent a second soft logout screen being shown.
-        guard self.onboardingCoordinatorBridgePresenter == nil && !self.isOnboardingCoordinatorPreparing else {
+        // Tchap: Use WelcomeCoordinatorBridgePresenter instead of OnboardingCoordinatorBridgePresenter
+        guard self.welcomeCoordinatorBridgePresenter == nil && !self.isOnboardingCoordinatorPreparing else {
             return
         }
 
@@ -1091,7 +1092,8 @@ extension AllChatsViewController: SplitViewMasterViewControllerProtocol {
 
     private func showOnboardingFlowAndResetSessionFlags(_ resetSessionFlags: Bool) {
         // Check whether an authentication screen is not already shown or preparing
-        guard self.onboardingCoordinatorBridgePresenter == nil && !self.isOnboardingCoordinatorPreparing else {
+        // Tchap: Use WelcomeCoordinatorBridgePresenter instead of OnboardingCoordinatorBridgePresenter
+        guard self.welcomeCoordinatorBridgePresenter == nil && !self.isOnboardingCoordinatorPreparing else {
             return
         }
 
diff --git a/Riot/Modules/TabBar/TabBarCoordinator.swift b/Riot/Modules/TabBar/TabBarCoordinator.swift
index 0d240cc191..b3ce06ba84 100644
--- a/Riot/Modules/TabBar/TabBarCoordinator.swift
+++ b/Riot/Modules/TabBar/TabBarCoordinator.swift
@@ -639,13 +639,13 @@ final class TabBarCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
     }
     
     private func showWelcome(animated: Bool = false) {
-//        let welcomeCoordinator = WelcomeCoordinator()
-//        welcomeCoordinator.delegate = self
-//        welcomeCoordinator.start()
-//        self.add(childCoordinator: welcomeCoordinator)
-//        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5 , execute: { [weak self] in
-//            self?.navigationRouter.present(welcomeCoordinator, animated: animated)
-//        })
+        let welcomeCoordinator = WelcomeCoordinator()
+        welcomeCoordinator.delegate = self
+        welcomeCoordinator.start()
+        self.add(childCoordinator: welcomeCoordinator)
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5 , execute: { [weak self] in
+            self?.navigationRouter.present(welcomeCoordinator, animated: animated)
+        })
     }
     
     private func userDidLogin() -> Bool {
@@ -1163,14 +1163,14 @@ extension TabBarCoordinator: SecureBackupSetupCoordinatorBridgePresenterDelegate
 }
 
 // MARK: - WelcomeCoordinatorDelegate
-//extension TabBarCoordinator: WelcomeCoordinatorDelegate {
-//    func welcomeCoordinatorUserDidAuthenticate(_ coordinator: WelcomeCoordinatorType) {
-//        // Check that the new account actually exists before removing the current coordinator
-//        if userDidLogin() {
-//            self.remove(childCoordinator: coordinator)
-//        }
-//    }
-//}
+extension TabBarCoordinator: WelcomeCoordinatorDelegate {
+    func welcomeCoordinatorUserDidAuthenticate(_ coordinator: WelcomeCoordinatorType) {
+        // Check that the new account actually exists before removing the current coordinator
+        if userDidLogin() {
+            self.remove(childCoordinator: coordinator)
+        }
+    }
+}
 
 // MARK: - RoomsViewControllerDelegate
 extension TabBarCoordinator: RoomsViewControllerDelegate {
diff --git a/Tchap/Modules/Welcome/WelcomeCoordinator.swift b/Tchap/Modules/Welcome/WelcomeCoordinator.swift
new file mode 100644
index 0000000000..b7e8175cec
--- /dev/null
+++ b/Tchap/Modules/Welcome/WelcomeCoordinator.swift
@@ -0,0 +1,157 @@
+/*
+ Copyright 2018 New Vector Ltd
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import Foundation
+
+protocol WelcomeCoordinatorDelegate: AnyObject {
+    func welcomeCoordinatorUserDidAuthenticate(_ coordinator: WelcomeCoordinatorType)
+}
+
+final class WelcomeCoordinator: WelcomeCoordinatorType {
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    private let navigationRouter: NavigationRouterType
+    private let welcomeViewController: WelcomeViewController
+    
+    // MARK: Public
+    
+    var childCoordinators: [Coordinator] = []
+    
+    weak var delegate: WelcomeCoordinatorDelegate?
+    
+    // MARK: - Setup
+    
+    init() {
+        let navController = RiotNavigationController()
+        navController.modalPresentationStyle = .fullScreen
+        self.navigationRouter = NavigationRouter(navigationController: navController)
+        
+        let welcomeViewController = WelcomeViewController.instantiate()
+        welcomeViewController.vc_removeBackTitle()
+        self.welcomeViewController = welcomeViewController        
+    }
+    
+    // MARK: - Public methods
+    
+    func start() {
+        self.navigationRouter.setRootModule(self.welcomeViewController, hideNavigationBar: true, animated: false, popCompletion: nil)
+        self.welcomeViewController.delegate = self
+    }
+    
+    func toPresentable() -> UIViewController {
+        return self.navigationRouter.toPresentable()
+    }
+    
+    // MARK: - Private methods
+    
+    @MainActor private func showAuthentication() async {
+        let authService = AuthenticationService.shared
+        await updateAuthServiceForDirectAuthentication()
+        let parameters = AuthenticationLoginCoordinatorParameters(navigationRouter: self.navigationRouter,
+                                                                  authenticationService: authService,
+                                                                  loginMode: .password)
+        let authenticationLoginCoordinator = AuthenticationLoginCoordinator(parameters: parameters)
+        authenticationLoginCoordinator.callback = { [weak self] result in
+            guard let self = self else { return }
+            self.delegate?.welcomeCoordinatorUserDidAuthenticate(self)
+        }
+        authenticationLoginCoordinator.start()
+        self.add(childCoordinator: authenticationLoginCoordinator)
+        
+        if navigationRouter.modules.isEmpty {
+            navigationRouter.setRootModule(authenticationLoginCoordinator, popCompletion: nil)
+        } else {
+            navigationRouter.push(authenticationLoginCoordinator, animated: true) { [weak self] in
+                self?.remove(childCoordinator: authenticationLoginCoordinator)
+            }
+        }
+    }
+    
+    // Start login flow by updating AuthenticationService
+    private func updateAuthServiceForDirectAuthentication() async {
+        let authService = AuthenticationService.shared
+        authService.reset()
+        do {
+            try await authService.startFlow(.login)
+        } catch {
+            MXLog.error("[WelcomeCoordinator] Unable to start flow for login.")
+        }
+    }
+    
+    @MainActor private func showRegistration() async {
+        let authenticationService = AuthenticationService.shared
+        do {
+            try await authenticationService.startFlow(.register)
+        } catch {
+            MXLog.error("[WelcomeCoordinator] showRegistration error")
+        }
+        guard let registrationWizard = authenticationService.registrationWizard else {
+            return
+        }
+        let parameters = AuthenticationVerifyEmailCoordinatorParameters(registrationWizard: registrationWizard,
+                                                                        homeserver: authenticationService.state.homeserver)
+        let coordinator = AuthenticationVerifyEmailCoordinator(parameters: parameters)
+        coordinator.callback = { [weak self] result in
+            guard let self = self else { return }
+            switch result {
+            case .cancel:
+                MXLog.warning("[WelcomeCoordinator] Registration cancelled")
+                self.cancelRegisterFlow()
+            case .completed(let registrationResult):
+                switch registrationResult {
+                case .success:
+                    self.delegate?.welcomeCoordinatorUserDidAuthenticate(self)
+                case .flowResponse:
+                    MXLog.warning("[WelcomeCoordinator] flowResponse")
+                }
+            }
+        }
+        
+        coordinator.start()
+        add(childCoordinator: coordinator)
+        
+        if navigationRouter.modules.isEmpty {
+            navigationRouter.setRootModule(coordinator, popCompletion: nil)
+        } else {
+            navigationRouter.push(coordinator, animated: true) { [weak self] in
+                self?.remove(childCoordinator: coordinator)
+            }
+        }
+    }
+    
+    /// Cancels the registration flow, returning to the Welcome screen.
+    private func cancelRegisterFlow() {
+        navigationRouter.popAllModules(animated: false)
+    }
+}
+
+// MARK: - WelcomeViewControllerDelegate
+extension WelcomeCoordinator: WelcomeViewControllerDelegate {
+    @MainActor func welcomeViewControllerDidTapLoginButton(_ welcomeViewController: WelcomeViewController) {
+        Task {
+            await self.showAuthentication()
+        }
+    }
+    
+    @MainActor func welcomeViewControllerDidTapRegisterButton(_ welcomeViewController: WelcomeViewController) {
+        Task {
+            await self.showRegistration()
+        }
+    }
+}
diff --git a/Tchap/Modules/Welcome/WelcomeCoordinatorBridgePresenter.swift b/Tchap/Modules/Welcome/WelcomeCoordinatorBridgePresenter.swift
new file mode 100644
index 0000000000..5ae6c26267
--- /dev/null
+++ b/Tchap/Modules/Welcome/WelcomeCoordinatorBridgePresenter.swift
@@ -0,0 +1,116 @@
+// 
+// Copyright 2022 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+/// WelcomeCoordinatorBridgePresenter enables to start WelcomeCoordinator from a view controller.
+/// This bridge is used while waiting for global usage of coordinator pattern.
+/// **WARNING**: This class breaks the Coordinator abstraction and it has been introduced for **Objective-C compatibility only** (mainly for integration in legacy view controllers). Each bridge should be removed
+/// once the underlying Coordinator has been integrated by another Coordinator.
+@objcMembers
+final class WelcomeCoordinatorBridgePresenter: NSObject {
+    
+    // MARK: - Constants
+    
+    private enum NavigationType {
+        case present
+        case push
+    }
+    
+    // MARK: - Properties
+    
+    // MARK: Private
+    
+    private var navigationType: NavigationType = .present
+    private var coordinator: WelcomeCoordinator?
+    
+    // MARK: Public
+    
+    var completion: (() -> Void)?
+    
+    // MARK: - Public
+    
+    func present(from viewController: UIViewController, animated: Bool) {
+        let welcomeCoordinator = makeWelcomeCoordinator()
+        
+        let presentable = welcomeCoordinator.toPresentable()
+        presentable.modalPresentationStyle = .fullScreen
+        presentable.modalTransitionStyle = .crossDissolve
+        
+        viewController.present(presentable, animated: animated, completion: nil)
+        welcomeCoordinator.start()
+        
+        self.coordinator = welcomeCoordinator
+        self.navigationType = .present
+    }
+    
+    func push(from navigationController: UINavigationController, animated: Bool) {
+                
+        let navigationRouter = NavigationRouterStore.shared.navigationRouter(for: navigationController)
+        
+        let welcomeCoordinator = makeWelcomeCoordinator(navigationRouter: navigationRouter)
+
+        welcomeCoordinator.start() // Will trigger the view controller push
+        
+        self.coordinator = welcomeCoordinator
+        self.navigationType = .push
+    }
+    
+    func dismiss(animated: Bool, completion: (() -> Void)?) {
+        guard let coordinator = self.coordinator else {
+            return
+        }
+
+        switch navigationType {
+        case .present:
+            // Dismiss modal
+            coordinator.toPresentable().dismiss(animated: animated) {
+                self.coordinator = nil
+
+                if let completion = completion {
+                    completion()
+                }
+            }
+        case .push:
+            // Pop view controller from UINavigationController
+            guard let navigationController = coordinator.toPresentable() as? UINavigationController else {
+                return
+            }
+            navigationController.popViewController(animated: animated)
+            self.coordinator = nil
+
+            if let completion = completion {
+                completion()
+            }
+        }
+    }
+    
+    // MARK: - Private
+    
+    /// Makes an `WelcomeCoordinator` using the supplied navigation router, or creating one if needed.
+    private func makeWelcomeCoordinator(navigationRouter: NavigationRouterType? = nil) -> WelcomeCoordinator {
+        let welcomeCoordinator = WelcomeCoordinator()
+        welcomeCoordinator.delegate = self
+        return welcomeCoordinator
+    }
+}
+
+// MARK: - WelcomeCoordinatorDelegate
+extension WelcomeCoordinatorBridgePresenter: WelcomeCoordinatorDelegate {
+    func welcomeCoordinatorUserDidAuthenticate(_ coordinator: WelcomeCoordinatorType) {
+        self.completion?()
+    }
+}
diff --git a/Tchap/Modules/Welcome/WelcomeCoordinatorType.swift b/Tchap/Modules/Welcome/WelcomeCoordinatorType.swift
new file mode 100644
index 0000000000..aedbc99eb3
--- /dev/null
+++ b/Tchap/Modules/Welcome/WelcomeCoordinatorType.swift
@@ -0,0 +1,21 @@
+/*
+ Copyright 2018 New Vector Ltd
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+import Foundation
+
+/// `WelcomeCoordinatorType` is a protocol describing a Coordinator that handle welcome navigation flow.
+protocol WelcomeCoordinatorType: Coordinator, Presentable {    
+}
diff --git a/Tchap/Modules/Welcome/WelcomeViewController.storyboard b/Tchap/Modules/Welcome/WelcomeViewController.storyboard
new file mode 100644
index 0000000000..61015ae9a3
--- /dev/null
+++ b/Tchap/Modules/Welcome/WelcomeViewController.storyboard
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="GI0-WS-UMc">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Welcome View Controller-->
+        <scene sceneID="pkY-qk-M2a">
+            <objects>
+                <viewController id="GI0-WS-UMc" customClass="WelcomeViewController" customModule="Tchap" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Lzt-XD-X7W">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e8O-74-cvD">
+                                <rect key="frame" x="20" y="209" width="335" height="26.5"/>
+                                <fontDescription key="fontDescription" type="system" weight="light" pointSize="22"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dMQ-g0-JN2">
+                                <rect key="frame" x="20" y="593" width="147" height="30"/>
+                                <state key="normal" title="Button"/>
+                                <connections>
+                                    <action selector="registerButtonAction:" destination="GI0-WS-UMc" eventType="touchUpInside" id="d69-Gr-EPw"/>
+                                </connections>
+                            </button>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hTp-fL-9o8">
+                                <rect key="frame" x="187" y="582" width="1" height="52"/>
+                                <color key="backgroundColor" red="0.33836611049681253" green="0.43916532595071023" blue="1" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="1" id="2T4-ZO-INs"/>
+                                    <constraint firstAttribute="height" constant="52" id="mFs-7z-Lcf"/>
+                                </constraints>
+                            </view>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="u7L-Qx-m9o">
+                                <rect key="frame" x="207" y="593" width="148" height="30"/>
+                                <state key="normal" title="Button"/>
+                                <connections>
+                                    <action selector="loginButtonAction:" destination="GI0-WS-UMc" eventType="touchUpInside" id="s1a-aI-RfW"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="oBJ-KQ-riZ"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="u7L-Qx-m9o" firstAttribute="leading" secondItem="hTp-fL-9o8" secondAttribute="leading" constant="20" id="70w-oh-ATr"/>
+                            <constraint firstItem="hTp-fL-9o8" firstAttribute="centerX" secondItem="oBJ-KQ-riZ" secondAttribute="centerX" id="C5C-IC-0hP"/>
+                            <constraint firstItem="oBJ-KQ-riZ" firstAttribute="trailing" secondItem="e8O-74-cvD" secondAttribute="trailing" constant="20" id="Jyz-WZ-hHC"/>
+                            <constraint firstItem="hTp-fL-9o8" firstAttribute="leading" secondItem="dMQ-g0-JN2" secondAttribute="trailing" constant="20" id="MdE-N7-5Fp"/>
+                            <constraint firstItem="u7L-Qx-m9o" firstAttribute="centerY" secondItem="hTp-fL-9o8" secondAttribute="centerY" id="R41-A2-HKi"/>
+                            <constraint firstItem="e8O-74-cvD" firstAttribute="leading" secondItem="oBJ-KQ-riZ" secondAttribute="leading" constant="20" id="XzH-yN-CUr"/>
+                            <constraint firstItem="e8O-74-cvD" firstAttribute="centerY" secondItem="oBJ-KQ-riZ" secondAttribute="centerY" multiplier="2:3" id="erv-6g-6fh"/>
+                            <constraint firstItem="oBJ-KQ-riZ" firstAttribute="trailing" secondItem="u7L-Qx-m9o" secondAttribute="trailing" constant="20" id="nrN-aO-3qE"/>
+                            <constraint firstItem="dMQ-g0-JN2" firstAttribute="leading" secondItem="oBJ-KQ-riZ" secondAttribute="leading" constant="20" id="umk-vL-Bs4"/>
+                            <constraint firstItem="oBJ-KQ-riZ" firstAttribute="bottom" secondItem="hTp-fL-9o8" secondAttribute="bottom" constant="33" id="wlj-7J-zOs"/>
+                            <constraint firstItem="dMQ-g0-JN2" firstAttribute="centerY" secondItem="hTp-fL-9o8" secondAttribute="centerY" id="yDL-J9-tb2"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="buttonsSeparatorView" destination="hTp-fL-9o8" id="wIx-oE-CY3"/>
+                        <outlet property="loginButton" destination="u7L-Qx-m9o" id="xHs-Sh-AwF"/>
+                        <outlet property="registerButton" destination="dMQ-g0-JN2" id="Nbu-uJ-DKf"/>
+                        <outlet property="titleLabel" destination="e8O-74-cvD" id="HpE-16-KaD"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="hL3-Da-L8K" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-31.199999999999999" y="187.55622188905548"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/Tchap/Modules/Welcome/WelcomeViewController.swift b/Tchap/Modules/Welcome/WelcomeViewController.swift
new file mode 100644
index 0000000000..f283b6df30
--- /dev/null
+++ b/Tchap/Modules/Welcome/WelcomeViewController.swift
@@ -0,0 +1,122 @@
+/*
+ Copyright 2018 New Vector Ltd
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+protocol WelcomeViewControllerDelegate: AnyObject {
+    func welcomeViewControllerDidTapLoginButton(_ welcomeViewController: WelcomeViewController)
+    func welcomeViewControllerDidTapRegisterButton(_ welcomeViewController: WelcomeViewController)
+}
+
+final class WelcomeViewController: UIViewController {
+    
+    // MARK: - Properties
+    
+    // MARK: Outlets
+    
+    @IBOutlet private weak var titleLabel: UILabel!
+    @IBOutlet private weak var registerButton: UIButton!
+    @IBOutlet private weak var loginButton: UIButton!
+    @IBOutlet private weak var buttonsSeparatorView: UIView!
+    
+    // MARK: Private
+    
+    private var theme: Theme!
+    
+    // MARK: Public
+    
+    weak var delegate: WelcomeViewControllerDelegate?
+    
+    // MARK: - Setup
+    
+    class func instantiate() -> WelcomeViewController {
+        let viewController = StoryboardScene.WelcomeViewController.initialScene.instantiate()
+        return viewController
+    }
+    
+    // MARK: - Life cycle
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        // Do any additional setup after loading the view.
+        
+        self.title = TchapL10n.authenticationTitle
+        
+        self.setupViews()
+
+        self.registerThemeServiceDidChangeThemeNotification()
+        self.theme = ThemeService.shared().theme
+        self.update(theme: self.theme)
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        
+        self.navigationController?.setNavigationBarHidden(true, animated: animated)
+    }
+    
+    override func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        
+        self.navigationController?.setNavigationBarHidden(false, animated: animated)
+    }
+    
+    override var preferredStatusBarStyle: UIStatusBarStyle {
+        return ThemeService.shared().theme.statusBarStyle
+    }
+    
+    // MARK: - Private
+    
+    private func setupViews() {
+        self.titleLabel.text = TchapL10n.welcomeTitle
+        
+        self.registerButton.setTitle(TchapL10n.welcomeRegisterAction, for: .normal)
+        self.registerButton.titleLabel?.numberOfLines = 0
+        
+        self.loginButton.setTitle(TchapL10n.welcomeLoginAction, for: .normal)
+        self.loginButton.titleLabel?.numberOfLines = 0
+    }
+    
+    private func registerThemeServiceDidChangeThemeNotification() {
+        NotificationCenter.default.addObserver(self, selector: #selector(themeDidChange), name: .themeServiceDidChangeTheme, object: nil)
+    }
+    
+    @objc private func themeDidChange() {
+        self.update(theme: ThemeService.shared().theme)
+    }
+    
+    // MARK: - Actions
+    
+    @IBAction private func loginButtonAction(_ sender: Any) {
+        self.delegate?.welcomeViewControllerDidTapLoginButton(self)
+    }
+    
+    @IBAction private func registerButtonAction(_ sender: Any) {
+        self.delegate?.welcomeViewControllerDidTapRegisterButton(self)
+    }
+}
+
+// MARK: - Theme
+private extension WelcomeViewController {
+    private func update(theme: Theme) {
+        self.theme = theme
+        
+        self.view.backgroundColor = theme.backgroundColor
+        self.titleLabel.textColor = theme.textTertiaryColor
+        self.buttonsSeparatorView.backgroundColor = theme.selectedBackgroundColor
+        
+        theme.applyStyle(onButton: self.loginButton)
+        theme.applyStyle(onButton: self.registerButton)
+    }
+}

From 057c9709bb850b0fcce0856da0889a57b9830487 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 3 Sep 2024 16:15:15 +0200
Subject: [PATCH 18/21] Remove calls to Tchap welcome classes

---
 .../AllChats/AllChatsViewController.swift     |  8 ++---
 Riot/Modules/TabBar/TabBarCoordinator.swift   | 32 ++++++++++---------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/Riot/Modules/Home/AllChats/AllChatsViewController.swift b/Riot/Modules/Home/AllChats/AllChatsViewController.swift
index 688047ed4d..f7e4f51066 100644
--- a/Riot/Modules/Home/AllChats/AllChatsViewController.swift
+++ b/Riot/Modules/Home/AllChats/AllChatsViewController.swift
@@ -107,8 +107,6 @@ class AllChatsViewController: HomeViewController {
     
     // Reference to the current onboarding flow. It is always nil unless the flow is being presented.
     private(set) var onboardingCoordinatorBridgePresenter: OnboardingCoordinatorBridgePresenter?
-    // Tchap: Use welcomeCoordinator instead of onboardingCoordinator
-    private(set) var welcomeCoordinatorBridgePresenter: WelcomeCoordinatorBridgePresenter?
     
     // Tell whether the onboarding screen is preparing.
     private(set) var isOnboardingInProgress: Bool = false
@@ -921,8 +919,7 @@ extension AllChatsViewController: SplitViewMasterViewControllerProtocol {
         // This method can be called after the user chooses to clear their data as the MXSession
         // is opened to call logout from. So we only set the credentials when authentication isn't
         // in progress to prevent a second soft logout screen being shown.
-        // Tchap: Use WelcomeCoordinatorBridgePresenter instead of OnboardingCoordinatorBridgePresenter
-        guard self.welcomeCoordinatorBridgePresenter == nil && !self.isOnboardingCoordinatorPreparing else {
+        guard self.self.onboardingCoordinatorBridgePresenter == nil && !self.isOnboardingCoordinatorPreparing else {
             return
         }
 
@@ -1092,8 +1089,7 @@ extension AllChatsViewController: SplitViewMasterViewControllerProtocol {
 
     private func showOnboardingFlowAndResetSessionFlags(_ resetSessionFlags: Bool) {
         // Check whether an authentication screen is not already shown or preparing
-        // Tchap: Use WelcomeCoordinatorBridgePresenter instead of OnboardingCoordinatorBridgePresenter
-        guard self.welcomeCoordinatorBridgePresenter == nil && !self.isOnboardingCoordinatorPreparing else {
+        guard self.self.onboardingCoordinatorBridgePresenter == nil && !self.isOnboardingCoordinatorPreparing else {
             return
         }
 
diff --git a/Riot/Modules/TabBar/TabBarCoordinator.swift b/Riot/Modules/TabBar/TabBarCoordinator.swift
index b3ce06ba84..bbee1ab268 100644
--- a/Riot/Modules/TabBar/TabBarCoordinator.swift
+++ b/Riot/Modules/TabBar/TabBarCoordinator.swift
@@ -639,13 +639,14 @@ final class TabBarCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
     }
     
     private func showWelcome(animated: Bool = false) {
-        let welcomeCoordinator = WelcomeCoordinator()
-        welcomeCoordinator.delegate = self
-        welcomeCoordinator.start()
-        self.add(childCoordinator: welcomeCoordinator)
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5 , execute: { [weak self] in
-            self?.navigationRouter.present(welcomeCoordinator, animated: animated)
-        })
+        // Tchap: remove calls to Welcome classes
+//        let welcomeCoordinator = WelcomeCoordinator()
+//        welcomeCoordinator.delegate = self
+//        welcomeCoordinator.start()
+//        self.add(childCoordinator: welcomeCoordinator)
+//        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5 , execute: { [weak self] in
+//            self?.navigationRouter.present(welcomeCoordinator, animated: animated)
+//        })
     }
     
     private func userDidLogin() -> Bool {
@@ -1163,14 +1164,15 @@ extension TabBarCoordinator: SecureBackupSetupCoordinatorBridgePresenterDelegate
 }
 
 // MARK: - WelcomeCoordinatorDelegate
-extension TabBarCoordinator: WelcomeCoordinatorDelegate {
-    func welcomeCoordinatorUserDidAuthenticate(_ coordinator: WelcomeCoordinatorType) {
-        // Check that the new account actually exists before removing the current coordinator
-        if userDidLogin() {
-            self.remove(childCoordinator: coordinator)
-        }
-    }
-}
+// Tchap: remove calls to Tchap Welcome classes
+//extension TabBarCoordinator: WelcomeCoordinatorDelegate {
+//    func welcomeCoordinatorUserDidAuthenticate(_ coordinator: WelcomeCoordinatorType) {
+//        // Check that the new account actually exists before removing the current coordinator
+//        if userDidLogin() {
+//            self.remove(childCoordinator: coordinator)
+//        }
+//    }
+//}
 
 // MARK: - RoomsViewControllerDelegate
 extension TabBarCoordinator: RoomsViewControllerDelegate {

From ec4453e3a9f6b71d85cabf351dfb899a8386b91b Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 3 Sep 2024 16:16:36 +0200
Subject: [PATCH 19/21] Remove instantiation of TabBarCoordinator (no more used
 since newLayout)

---
 .../SplitView/SplitViewCoordinator.swift      | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/Riot/Modules/SplitView/SplitViewCoordinator.swift b/Riot/Modules/SplitView/SplitViewCoordinator.swift
index 61271f31bc..22172510cc 100644
--- a/Riot/Modules/SplitView/SplitViewCoordinator.swift
+++ b/Riot/Modules/SplitView/SplitViewCoordinator.swift
@@ -93,7 +93,9 @@ final class SplitViewCoordinator: NSObject, SplitViewCoordinatorType {
             self.splitViewController.delegate = self
             
             // Create primary controller
-            let masterCoordinator: SplitViewMasterCoordinatorProtocol = BuildSettings.newAppLayoutEnabled ? self.createAllChatsCoordinator() : self.createTabBarCoordinator()
+            // Tchap: force using AllChatsCoordinator because newLayout is always TRUE
+//            let masterCoordinator: SplitViewMasterCoordinatorProtocol = BuildSettings.newAppLayoutEnabled ? self.createAllChatsCoordinator() : self.createTabBarCoordinator()
+            let masterCoordinator: SplitViewMasterCoordinatorProtocol = self.createAllChatsCoordinator()
             masterCoordinator.splitViewMasterPresentableDelegate = self
             masterCoordinator.start(with: spaceId)
             
@@ -182,14 +184,15 @@ final class SplitViewCoordinator: NSObject, SplitViewCoordinatorType {
         return coordinator
     }
     
-    private func createTabBarCoordinator() -> TabBarCoordinator {
-        
-        let coordinatorParameters = TabBarCoordinatorParameters(userSessionsService: self.parameters.userSessionsService, appNavigator: self.parameters.appNavigator)
-        
-        let tabBarCoordinator = TabBarCoordinator(parameters: coordinatorParameters)
-        tabBarCoordinator.delegate = self
-        return tabBarCoordinator
-    }
+    // Tchap: don't use TabBarCoordinator anymore now that newLayout is always TRUE
+//    private func createTabBarCoordinator() -> TabBarCoordinator {
+//        
+//        let coordinatorParameters = TabBarCoordinatorParameters(userSessionsService: self.parameters.userSessionsService, appNavigator: self.parameters.appNavigator)
+//        
+//        let tabBarCoordinator = TabBarCoordinator(parameters: coordinatorParameters)
+//        tabBarCoordinator.delegate = self
+//        return tabBarCoordinator
+//    }
     
     private func resetDetailNavigationControllerWithPlaceholder(animated: Bool) {
         guard let detailNavigationRouter = self.detailNavigationRouter else {

From 0e93ffcc5b3e8c960cd32f31c660de21007a4f60 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Tue, 3 Sep 2024 16:26:51 +0200
Subject: [PATCH 20/21] Remove Tchap Welcome files

---
 .../Modules/Welcome/WelcomeCoordinator.swift  | 157 ------------------
 .../WelcomeCoordinatorBridgePresenter.swift   | 116 -------------
 .../Welcome/WelcomeCoordinatorType.swift      |  21 ---
 .../Welcome/WelcomeViewController.storyboard  |  76 ---------
 .../Welcome/WelcomeViewController.swift       | 122 --------------
 5 files changed, 492 deletions(-)
 delete mode 100644 Tchap/Modules/Welcome/WelcomeCoordinator.swift
 delete mode 100644 Tchap/Modules/Welcome/WelcomeCoordinatorBridgePresenter.swift
 delete mode 100644 Tchap/Modules/Welcome/WelcomeCoordinatorType.swift
 delete mode 100644 Tchap/Modules/Welcome/WelcomeViewController.storyboard
 delete mode 100644 Tchap/Modules/Welcome/WelcomeViewController.swift

diff --git a/Tchap/Modules/Welcome/WelcomeCoordinator.swift b/Tchap/Modules/Welcome/WelcomeCoordinator.swift
deleted file mode 100644
index b7e8175cec..0000000000
--- a/Tchap/Modules/Welcome/WelcomeCoordinator.swift
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- Copyright 2018 New Vector Ltd
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import Foundation
-
-protocol WelcomeCoordinatorDelegate: AnyObject {
-    func welcomeCoordinatorUserDidAuthenticate(_ coordinator: WelcomeCoordinatorType)
-}
-
-final class WelcomeCoordinator: WelcomeCoordinatorType {
-    
-    // MARK: - Properties
-    
-    // MARK: Private
-    
-    private let navigationRouter: NavigationRouterType
-    private let welcomeViewController: WelcomeViewController
-    
-    // MARK: Public
-    
-    var childCoordinators: [Coordinator] = []
-    
-    weak var delegate: WelcomeCoordinatorDelegate?
-    
-    // MARK: - Setup
-    
-    init() {
-        let navController = RiotNavigationController()
-        navController.modalPresentationStyle = .fullScreen
-        self.navigationRouter = NavigationRouter(navigationController: navController)
-        
-        let welcomeViewController = WelcomeViewController.instantiate()
-        welcomeViewController.vc_removeBackTitle()
-        self.welcomeViewController = welcomeViewController        
-    }
-    
-    // MARK: - Public methods
-    
-    func start() {
-        self.navigationRouter.setRootModule(self.welcomeViewController, hideNavigationBar: true, animated: false, popCompletion: nil)
-        self.welcomeViewController.delegate = self
-    }
-    
-    func toPresentable() -> UIViewController {
-        return self.navigationRouter.toPresentable()
-    }
-    
-    // MARK: - Private methods
-    
-    @MainActor private func showAuthentication() async {
-        let authService = AuthenticationService.shared
-        await updateAuthServiceForDirectAuthentication()
-        let parameters = AuthenticationLoginCoordinatorParameters(navigationRouter: self.navigationRouter,
-                                                                  authenticationService: authService,
-                                                                  loginMode: .password)
-        let authenticationLoginCoordinator = AuthenticationLoginCoordinator(parameters: parameters)
-        authenticationLoginCoordinator.callback = { [weak self] result in
-            guard let self = self else { return }
-            self.delegate?.welcomeCoordinatorUserDidAuthenticate(self)
-        }
-        authenticationLoginCoordinator.start()
-        self.add(childCoordinator: authenticationLoginCoordinator)
-        
-        if navigationRouter.modules.isEmpty {
-            navigationRouter.setRootModule(authenticationLoginCoordinator, popCompletion: nil)
-        } else {
-            navigationRouter.push(authenticationLoginCoordinator, animated: true) { [weak self] in
-                self?.remove(childCoordinator: authenticationLoginCoordinator)
-            }
-        }
-    }
-    
-    // Start login flow by updating AuthenticationService
-    private func updateAuthServiceForDirectAuthentication() async {
-        let authService = AuthenticationService.shared
-        authService.reset()
-        do {
-            try await authService.startFlow(.login)
-        } catch {
-            MXLog.error("[WelcomeCoordinator] Unable to start flow for login.")
-        }
-    }
-    
-    @MainActor private func showRegistration() async {
-        let authenticationService = AuthenticationService.shared
-        do {
-            try await authenticationService.startFlow(.register)
-        } catch {
-            MXLog.error("[WelcomeCoordinator] showRegistration error")
-        }
-        guard let registrationWizard = authenticationService.registrationWizard else {
-            return
-        }
-        let parameters = AuthenticationVerifyEmailCoordinatorParameters(registrationWizard: registrationWizard,
-                                                                        homeserver: authenticationService.state.homeserver)
-        let coordinator = AuthenticationVerifyEmailCoordinator(parameters: parameters)
-        coordinator.callback = { [weak self] result in
-            guard let self = self else { return }
-            switch result {
-            case .cancel:
-                MXLog.warning("[WelcomeCoordinator] Registration cancelled")
-                self.cancelRegisterFlow()
-            case .completed(let registrationResult):
-                switch registrationResult {
-                case .success:
-                    self.delegate?.welcomeCoordinatorUserDidAuthenticate(self)
-                case .flowResponse:
-                    MXLog.warning("[WelcomeCoordinator] flowResponse")
-                }
-            }
-        }
-        
-        coordinator.start()
-        add(childCoordinator: coordinator)
-        
-        if navigationRouter.modules.isEmpty {
-            navigationRouter.setRootModule(coordinator, popCompletion: nil)
-        } else {
-            navigationRouter.push(coordinator, animated: true) { [weak self] in
-                self?.remove(childCoordinator: coordinator)
-            }
-        }
-    }
-    
-    /// Cancels the registration flow, returning to the Welcome screen.
-    private func cancelRegisterFlow() {
-        navigationRouter.popAllModules(animated: false)
-    }
-}
-
-// MARK: - WelcomeViewControllerDelegate
-extension WelcomeCoordinator: WelcomeViewControllerDelegate {
-    @MainActor func welcomeViewControllerDidTapLoginButton(_ welcomeViewController: WelcomeViewController) {
-        Task {
-            await self.showAuthentication()
-        }
-    }
-    
-    @MainActor func welcomeViewControllerDidTapRegisterButton(_ welcomeViewController: WelcomeViewController) {
-        Task {
-            await self.showRegistration()
-        }
-    }
-}
diff --git a/Tchap/Modules/Welcome/WelcomeCoordinatorBridgePresenter.swift b/Tchap/Modules/Welcome/WelcomeCoordinatorBridgePresenter.swift
deleted file mode 100644
index 5ae6c26267..0000000000
--- a/Tchap/Modules/Welcome/WelcomeCoordinatorBridgePresenter.swift
+++ /dev/null
@@ -1,116 +0,0 @@
-// 
-// Copyright 2022 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-/// WelcomeCoordinatorBridgePresenter enables to start WelcomeCoordinator from a view controller.
-/// This bridge is used while waiting for global usage of coordinator pattern.
-/// **WARNING**: This class breaks the Coordinator abstraction and it has been introduced for **Objective-C compatibility only** (mainly for integration in legacy view controllers). Each bridge should be removed
-/// once the underlying Coordinator has been integrated by another Coordinator.
-@objcMembers
-final class WelcomeCoordinatorBridgePresenter: NSObject {
-    
-    // MARK: - Constants
-    
-    private enum NavigationType {
-        case present
-        case push
-    }
-    
-    // MARK: - Properties
-    
-    // MARK: Private
-    
-    private var navigationType: NavigationType = .present
-    private var coordinator: WelcomeCoordinator?
-    
-    // MARK: Public
-    
-    var completion: (() -> Void)?
-    
-    // MARK: - Public
-    
-    func present(from viewController: UIViewController, animated: Bool) {
-        let welcomeCoordinator = makeWelcomeCoordinator()
-        
-        let presentable = welcomeCoordinator.toPresentable()
-        presentable.modalPresentationStyle = .fullScreen
-        presentable.modalTransitionStyle = .crossDissolve
-        
-        viewController.present(presentable, animated: animated, completion: nil)
-        welcomeCoordinator.start()
-        
-        self.coordinator = welcomeCoordinator
-        self.navigationType = .present
-    }
-    
-    func push(from navigationController: UINavigationController, animated: Bool) {
-                
-        let navigationRouter = NavigationRouterStore.shared.navigationRouter(for: navigationController)
-        
-        let welcomeCoordinator = makeWelcomeCoordinator(navigationRouter: navigationRouter)
-
-        welcomeCoordinator.start() // Will trigger the view controller push
-        
-        self.coordinator = welcomeCoordinator
-        self.navigationType = .push
-    }
-    
-    func dismiss(animated: Bool, completion: (() -> Void)?) {
-        guard let coordinator = self.coordinator else {
-            return
-        }
-
-        switch navigationType {
-        case .present:
-            // Dismiss modal
-            coordinator.toPresentable().dismiss(animated: animated) {
-                self.coordinator = nil
-
-                if let completion = completion {
-                    completion()
-                }
-            }
-        case .push:
-            // Pop view controller from UINavigationController
-            guard let navigationController = coordinator.toPresentable() as? UINavigationController else {
-                return
-            }
-            navigationController.popViewController(animated: animated)
-            self.coordinator = nil
-
-            if let completion = completion {
-                completion()
-            }
-        }
-    }
-    
-    // MARK: - Private
-    
-    /// Makes an `WelcomeCoordinator` using the supplied navigation router, or creating one if needed.
-    private func makeWelcomeCoordinator(navigationRouter: NavigationRouterType? = nil) -> WelcomeCoordinator {
-        let welcomeCoordinator = WelcomeCoordinator()
-        welcomeCoordinator.delegate = self
-        return welcomeCoordinator
-    }
-}
-
-// MARK: - WelcomeCoordinatorDelegate
-extension WelcomeCoordinatorBridgePresenter: WelcomeCoordinatorDelegate {
-    func welcomeCoordinatorUserDidAuthenticate(_ coordinator: WelcomeCoordinatorType) {
-        self.completion?()
-    }
-}
diff --git a/Tchap/Modules/Welcome/WelcomeCoordinatorType.swift b/Tchap/Modules/Welcome/WelcomeCoordinatorType.swift
deleted file mode 100644
index aedbc99eb3..0000000000
--- a/Tchap/Modules/Welcome/WelcomeCoordinatorType.swift
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- Copyright 2018 New Vector Ltd
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-import Foundation
-
-/// `WelcomeCoordinatorType` is a protocol describing a Coordinator that handle welcome navigation flow.
-protocol WelcomeCoordinatorType: Coordinator, Presentable {    
-}
diff --git a/Tchap/Modules/Welcome/WelcomeViewController.storyboard b/Tchap/Modules/Welcome/WelcomeViewController.storyboard
deleted file mode 100644
index 61015ae9a3..0000000000
--- a/Tchap/Modules/Welcome/WelcomeViewController.storyboard
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="GI0-WS-UMc">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--Welcome View Controller-->
-        <scene sceneID="pkY-qk-M2a">
-            <objects>
-                <viewController id="GI0-WS-UMc" customClass="WelcomeViewController" customModule="Tchap" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="Lzt-XD-X7W">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e8O-74-cvD">
-                                <rect key="frame" x="20" y="209" width="335" height="26.5"/>
-                                <fontDescription key="fontDescription" type="system" weight="light" pointSize="22"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dMQ-g0-JN2">
-                                <rect key="frame" x="20" y="593" width="147" height="30"/>
-                                <state key="normal" title="Button"/>
-                                <connections>
-                                    <action selector="registerButtonAction:" destination="GI0-WS-UMc" eventType="touchUpInside" id="d69-Gr-EPw"/>
-                                </connections>
-                            </button>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hTp-fL-9o8">
-                                <rect key="frame" x="187" y="582" width="1" height="52"/>
-                                <color key="backgroundColor" red="0.33836611049681253" green="0.43916532595071023" blue="1" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="1" id="2T4-ZO-INs"/>
-                                    <constraint firstAttribute="height" constant="52" id="mFs-7z-Lcf"/>
-                                </constraints>
-                            </view>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="u7L-Qx-m9o">
-                                <rect key="frame" x="207" y="593" width="148" height="30"/>
-                                <state key="normal" title="Button"/>
-                                <connections>
-                                    <action selector="loginButtonAction:" destination="GI0-WS-UMc" eventType="touchUpInside" id="s1a-aI-RfW"/>
-                                </connections>
-                            </button>
-                        </subviews>
-                        <viewLayoutGuide key="safeArea" id="oBJ-KQ-riZ"/>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <constraints>
-                            <constraint firstItem="u7L-Qx-m9o" firstAttribute="leading" secondItem="hTp-fL-9o8" secondAttribute="leading" constant="20" id="70w-oh-ATr"/>
-                            <constraint firstItem="hTp-fL-9o8" firstAttribute="centerX" secondItem="oBJ-KQ-riZ" secondAttribute="centerX" id="C5C-IC-0hP"/>
-                            <constraint firstItem="oBJ-KQ-riZ" firstAttribute="trailing" secondItem="e8O-74-cvD" secondAttribute="trailing" constant="20" id="Jyz-WZ-hHC"/>
-                            <constraint firstItem="hTp-fL-9o8" firstAttribute="leading" secondItem="dMQ-g0-JN2" secondAttribute="trailing" constant="20" id="MdE-N7-5Fp"/>
-                            <constraint firstItem="u7L-Qx-m9o" firstAttribute="centerY" secondItem="hTp-fL-9o8" secondAttribute="centerY" id="R41-A2-HKi"/>
-                            <constraint firstItem="e8O-74-cvD" firstAttribute="leading" secondItem="oBJ-KQ-riZ" secondAttribute="leading" constant="20" id="XzH-yN-CUr"/>
-                            <constraint firstItem="e8O-74-cvD" firstAttribute="centerY" secondItem="oBJ-KQ-riZ" secondAttribute="centerY" multiplier="2:3" id="erv-6g-6fh"/>
-                            <constraint firstItem="oBJ-KQ-riZ" firstAttribute="trailing" secondItem="u7L-Qx-m9o" secondAttribute="trailing" constant="20" id="nrN-aO-3qE"/>
-                            <constraint firstItem="dMQ-g0-JN2" firstAttribute="leading" secondItem="oBJ-KQ-riZ" secondAttribute="leading" constant="20" id="umk-vL-Bs4"/>
-                            <constraint firstItem="oBJ-KQ-riZ" firstAttribute="bottom" secondItem="hTp-fL-9o8" secondAttribute="bottom" constant="33" id="wlj-7J-zOs"/>
-                            <constraint firstItem="dMQ-g0-JN2" firstAttribute="centerY" secondItem="hTp-fL-9o8" secondAttribute="centerY" id="yDL-J9-tb2"/>
-                        </constraints>
-                    </view>
-                    <connections>
-                        <outlet property="buttonsSeparatorView" destination="hTp-fL-9o8" id="wIx-oE-CY3"/>
-                        <outlet property="loginButton" destination="u7L-Qx-m9o" id="xHs-Sh-AwF"/>
-                        <outlet property="registerButton" destination="dMQ-g0-JN2" id="Nbu-uJ-DKf"/>
-                        <outlet property="titleLabel" destination="e8O-74-cvD" id="HpE-16-KaD"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="hL3-Da-L8K" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-31.199999999999999" y="187.55622188905548"/>
-        </scene>
-    </scenes>
-</document>
diff --git a/Tchap/Modules/Welcome/WelcomeViewController.swift b/Tchap/Modules/Welcome/WelcomeViewController.swift
deleted file mode 100644
index f283b6df30..0000000000
--- a/Tchap/Modules/Welcome/WelcomeViewController.swift
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- Copyright 2018 New Vector Ltd
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-protocol WelcomeViewControllerDelegate: AnyObject {
-    func welcomeViewControllerDidTapLoginButton(_ welcomeViewController: WelcomeViewController)
-    func welcomeViewControllerDidTapRegisterButton(_ welcomeViewController: WelcomeViewController)
-}
-
-final class WelcomeViewController: UIViewController {
-    
-    // MARK: - Properties
-    
-    // MARK: Outlets
-    
-    @IBOutlet private weak var titleLabel: UILabel!
-    @IBOutlet private weak var registerButton: UIButton!
-    @IBOutlet private weak var loginButton: UIButton!
-    @IBOutlet private weak var buttonsSeparatorView: UIView!
-    
-    // MARK: Private
-    
-    private var theme: Theme!
-    
-    // MARK: Public
-    
-    weak var delegate: WelcomeViewControllerDelegate?
-    
-    // MARK: - Setup
-    
-    class func instantiate() -> WelcomeViewController {
-        let viewController = StoryboardScene.WelcomeViewController.initialScene.instantiate()
-        return viewController
-    }
-    
-    // MARK: - Life cycle
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        // Do any additional setup after loading the view.
-        
-        self.title = TchapL10n.authenticationTitle
-        
-        self.setupViews()
-
-        self.registerThemeServiceDidChangeThemeNotification()
-        self.theme = ThemeService.shared().theme
-        self.update(theme: self.theme)
-    }
-    
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-        
-        self.navigationController?.setNavigationBarHidden(true, animated: animated)
-    }
-    
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        
-        self.navigationController?.setNavigationBarHidden(false, animated: animated)
-    }
-    
-    override var preferredStatusBarStyle: UIStatusBarStyle {
-        return ThemeService.shared().theme.statusBarStyle
-    }
-    
-    // MARK: - Private
-    
-    private func setupViews() {
-        self.titleLabel.text = TchapL10n.welcomeTitle
-        
-        self.registerButton.setTitle(TchapL10n.welcomeRegisterAction, for: .normal)
-        self.registerButton.titleLabel?.numberOfLines = 0
-        
-        self.loginButton.setTitle(TchapL10n.welcomeLoginAction, for: .normal)
-        self.loginButton.titleLabel?.numberOfLines = 0
-    }
-    
-    private func registerThemeServiceDidChangeThemeNotification() {
-        NotificationCenter.default.addObserver(self, selector: #selector(themeDidChange), name: .themeServiceDidChangeTheme, object: nil)
-    }
-    
-    @objc private func themeDidChange() {
-        self.update(theme: ThemeService.shared().theme)
-    }
-    
-    // MARK: - Actions
-    
-    @IBAction private func loginButtonAction(_ sender: Any) {
-        self.delegate?.welcomeViewControllerDidTapLoginButton(self)
-    }
-    
-    @IBAction private func registerButtonAction(_ sender: Any) {
-        self.delegate?.welcomeViewControllerDidTapRegisterButton(self)
-    }
-}
-
-// MARK: - Theme
-private extension WelcomeViewController {
-    private func update(theme: Theme) {
-        self.theme = theme
-        
-        self.view.backgroundColor = theme.backgroundColor
-        self.titleLabel.textColor = theme.textTertiaryColor
-        self.buttonsSeparatorView.backgroundColor = theme.selectedBackgroundColor
-        
-        theme.applyStyle(onButton: self.loginButton)
-        theme.applyStyle(onButton: self.registerButton)
-    }
-}

From c660860c8b95672d03aa2232ae440e350474b126 Mon Sep 17 00:00:00 2001
From: Nicolas Buquet <nbuquet@buquet-net.com>
Date: Thu, 26 Sep 2024 16:26:13 +0200
Subject: [PATCH 21/21] Add Changelog

---
 changelog.d/1083.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/1083.feature

diff --git a/changelog.d/1083.feature b/changelog.d/1083.feature
new file mode 100644
index 0000000000..39225afdd3
--- /dev/null
+++ b/changelog.d/1083.feature
@@ -0,0 +1 @@
+Activer la connexion par SSO
\ No newline at end of file