From ecd5ee426fcd87d8527635c144079bb02c4d76b3 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Thu, 27 Nov 2025 10:59:40 +0000
Subject: [PATCH] Enable the latest event sorter.

---
 ElementX/Sources/Application/Settings/AppSettings.swift      | 4 ----
 .../DeveloperOptionsScreenModels.swift                       | 1 -
 .../DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift | 5 -----
 .../Services/Room/RoomSummary/RoomSummaryProvider.swift      | 2 +-
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/ElementX/Sources/Application/Settings/AppSettings.swift b/ElementX/Sources/Application/Settings/AppSettings.swift
index 1e18db5b4..df454f02d 100644
--- a/ElementX/Sources/Application/Settings/AppSettings.swift
+++ b/ElementX/Sources/Application/Settings/AppSettings.swift
@@ -64,7 +64,6 @@ final class AppSettings {
         case threadsEnabled
         case developerOptionsEnabled
         case linkPreviewsEnabled
-        case latestEventSorterEnabled
         case spaceSettingsEnabled
         case focusEventOnNotificationTap
         
@@ -400,9 +399,6 @@ final class AppSettings {
     @UserPreference(key: UserDefaultsKeys.linkPreviewsEnabled, defaultValue: false, storageType: .userDefaults(store))
     var linkPreviewsEnabled
     
-    @UserPreference(key: UserDefaultsKeys.latestEventSorterEnabled, defaultValue: false, storageType: .userDefaults(store))
-    var latestEventSorterEnabled
-    
     @UserPreference(key: UserDefaultsKeys.developerOptionsEnabled, defaultValue: isDevelopmentBuild, storageType: .userDefaults(store))
     var developerOptionsEnabled
 }
diff --git a/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift b/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift
index a242707c0..94f26097f 100644
--- a/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift
+++ b/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift
@@ -53,7 +53,6 @@ protocol DeveloperOptionsProtocol: AnyObject {
     var fuzzyRoomListSearchEnabled: Bool { get set }
     var lowPriorityFilterEnabled: Bool { get set }
     var knockingEnabled: Bool { get set }
-    var latestEventSorterEnabled: Bool { get set }
     
     var linkPreviewsEnabled: Bool { get set }
     
diff --git a/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift b/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift
index 023a73c53..8324c42b8 100644
--- a/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift
+++ b/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift
@@ -59,11 +59,6 @@ struct DeveloperOptionsScreen: View {
                 Toggle(isOn: $context.lowPriorityFilterEnabled) {
                     Text("Low priority filter")
                 }
-                
-                Toggle(isOn: $context.latestEventSorterEnabled) {
-                    Text("Latest event sorter")
-                    Text("Requires app reboot")
-                }
             }
             
             Section("Timeline") {
diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift
index 7f492bde3..1332d7637 100644
--- a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift
+++ b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift
@@ -91,7 +91,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
         
         do {
             listUpdatesSubscriptionResult = roomList.entriesWithDynamicAdaptersWith(pageSize: UInt32(roomListPageSize),
-                                                                                    enableLatestEventSorter: appSettings.latestEventSorterEnabled,
+                                                                                    enableLatestEventSorter: true,
                                                                                     listener: SDKListener { [weak self] updates in
                                                                                         guard let self else { return }
                                                                                         diffsPublisher.send(updates)