mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 06:55:59 +00:00
Fix thread summaries being shown when the thread feature flag was disabled.
This commit is contained in:
@@ -120,7 +120,9 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
|
|||||||
.onTapGesture { }
|
.onTapGesture { }
|
||||||
}
|
}
|
||||||
|
|
||||||
if !context.viewState.timelineKind.isThread, let threadSummary = timelineItem.properties.threadSummary {
|
if context.viewState.areThreadsEnabled,
|
||||||
|
!context.viewState.timelineKind.isThread,
|
||||||
|
let threadSummary = timelineItem.properties.threadSummary {
|
||||||
TimelineThreadSummaryView(threadSummary: threadSummary) {
|
TimelineThreadSummaryView(threadSummary: threadSummary) {
|
||||||
context.send(viewAction: .displayThread(itemID: timelineItem.id))
|
context.send(viewAction: .displayThread(itemID: timelineItem.id))
|
||||||
}
|
}
|
||||||
@@ -319,8 +321,14 @@ private extension View {
|
|||||||
// MARK: - Previews
|
// MARK: - Previews
|
||||||
|
|
||||||
struct TimelineItemBubbledStylerView_Previews: PreviewProvider, TestablePreview {
|
struct TimelineItemBubbledStylerView_Previews: PreviewProvider, TestablePreview {
|
||||||
static let viewModel = TimelineViewModel.mock
|
static let viewModel: TimelineViewModel = {
|
||||||
|
ServiceLocator.shared.settings.threadsEnabled = true
|
||||||
|
return TimelineViewModel.mock
|
||||||
|
}()
|
||||||
|
|
||||||
static let viewModelWithPins: TimelineViewModel = {
|
static let viewModelWithPins: TimelineViewModel = {
|
||||||
|
ServiceLocator.shared.settings.threadsEnabled = true
|
||||||
|
|
||||||
let roomProxy = JoinedRoomProxyMock(.init(name: "Preview Room", pinnedEventIDs: ["pinned"]))
|
let roomProxy = JoinedRoomProxyMock(.init(name: "Preview Room", pinnedEventIDs: ["pinned"]))
|
||||||
return TimelineViewModel(roomProxy: roomProxy,
|
return TimelineViewModel(roomProxy: roomProxy,
|
||||||
focussedEventID: nil,
|
focussedEventID: nil,
|
||||||
|
|||||||
Reference in New Issue
Block a user