From a948e2d3aa1117fb631811f510123395dafa8da7 Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Fri, 25 Sep 2026 14:22:40 +0100
Subject: [PATCH] Rebase on develop.

---
 .../View/PinnedEventsTimelineScreen.swift              | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ElementX/Sources/Screens/PinnedEventsTimelineScreen/View/PinnedEventsTimelineScreen.swift b/ElementX/Sources/Screens/PinnedEventsTimelineScreen/View/PinnedEventsTimelineScreen.swift
index 5b2b4f453..1baddfff9 100644
--- a/ElementX/Sources/Screens/PinnedEventsTimelineScreen/View/PinnedEventsTimelineScreen.swift
+++ b/ElementX/Sources/Screens/PinnedEventsTimelineScreen/View/PinnedEventsTimelineScreen.swift
@@ -106,18 +106,18 @@ struct PinnedEventsTimelineScreen_Previews: PreviewProvider, TestablePreview {
         let eventIDs = timelineItems.compactMap { ($0 as? EventBasedTimelineItemProtocol)?.id.eventID }
         let timelineController = TimelineControllerMock(.init(timelineKind: .pinned, timelineItems: timelineItems))
         
-        let appSettings = AppSettings.volatile()
-        appSettings.messageMultiSelectEnabled = isSelecting
+        let userSettings = UserSettings.volatile()
+        userSettings.messageMultiSelectEnabled = isSelecting
+        let userSession = UserSessionMock(.init(userSettings: userSettings))
         
         let timelineViewModel = TimelineViewModel(roomProxy: JoinedRoomProxyMock(.init(name: "Preview room", pinnedEventIDs: Set(eventIDs))),
                                                   timelineController: timelineController,
-                                                  userSession: UserSessionMock(.init()),
+                                                  userSession: userSession,
                                                   mediaPlayerProvider: MediaPlayerProviderMock(),
                                                   userIndicatorController: UserIndicatorControllerMock(),
                                                   appMediator: AppMediatorMock(.init()),
-                                                  appSettings: appSettings,
                                                   analyticsService: AnalyticsServiceMock(.init()),
-                                                  emojiProvider: EmojiProvider(appSettings: appSettings),
+                                                  emojiProvider: EmojiProvider(userSettings: .volatile()),
                                                   linkMetadataProvider: LinkMetadataProvider(),
                                                   timelineControllerFactory: TimelineControllerFactoryMock(.init()))