Skip to content

Commit b895d20

Browse files
authored
Merge pull request #5678 from wikimedia/T416230
T416230: Remove + disable timeline of behavior for logged out
2 parents 01ab06d + 4d10ce2 commit b895d20

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

WMFComponents/Sources/WMFComponents/Components/Activity Tab/View Models/WMFActivityTabCustomizeViewModel.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public final class WMFActivityTabCustomizeViewModel: ObservableObject {
3838
let isTimeSpentReadingOn = isLoggedIn ? await dataController.isTimeSpentReadingOn : false
3939
let isReadingInsightsOn = isLoggedIn ? await dataController.isReadingInsightsOn : false
4040
let isEditingInsightsOn = isLoggedIn ? await dataController.isEditingInsightsOn : false
41-
let isTimelineOfBehaviorOn = await dataController.isTimelineOfBehaviorOn
41+
let isTimelineOfBehaviorOn = isLoggedIn ? await dataController.isTimelineOfBehaviorOn : false
4242

4343
self.isTimeSpentReadingOn = isTimeSpentReadingOn
4444
self.isReadingInsightsOn = isReadingInsightsOn
@@ -82,11 +82,11 @@ public final class WMFActivityTabCustomizeViewModel: ObservableObject {
8282

8383
$isTimelineOfBehaviorOn
8484
.sink { [weak self] value in
85-
guard let self else { return }
85+
guard let self, self.isLoggedIn else { return }
86+
8687
Task {
8788
await self.dataController.updateIsTimelineOfBehaviorOn(value)
8889
}
89-
9090
}
9191
.store(in: &cancellables)
9292
}

WMFComponents/Sources/WMFComponents/Components/Activity Tab/WMFActivityTabCustomizeView.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,14 @@ public struct WMFActivityTabCustomizeView: View {
6464
isOn: $viewModel.isTimelineOfBehaviorOn
6565
)
6666
.listRowBackground(Color(theme.paperBackground).edgesIgnoringSafeArea([.all]))
67+
.onChange(of: viewModel.isTimelineOfBehaviorOn) { newValue in
68+
guard newValue == true else { return }
69+
guard viewModel.isLoggedIn else {
70+
viewModel.isTimelineOfBehaviorOn = false
71+
viewModel.presentLoggedInToastAction?()
72+
return
73+
}
74+
}
6775
} footer: {
6876
Text(viewModel.localizedStrings.footer)
6977
.font(Font(WMFFont.for(.caption1)))

WMFComponents/Sources/WMFComponents/Components/Activity Tab/WMFActivityTabView.swift

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@ public struct WMFActivityTabView: View {
3232
loggedInList(proxy: proxy)
3333
}
3434
} else {
35-
if !viewModel.customizeViewModel.isTimelineOfBehaviorOn {
36-
customizedEmptyState()
37-
} else {
38-
loggedOutList(proxy: proxy)
39-
}
35+
loggedOutList(proxy: proxy)
4036
}
4137
}
4238
}
@@ -188,7 +184,6 @@ public struct WMFActivityTabView: View {
188184
private func loggedOutList(proxy: ScrollViewProxy) -> some View {
189185
if viewModel.sections.count == 0 {
190186
VStack {
191-
192187
Section {
193188
loggedOutView
194189
.accessibilityElement(children: .contain)

0 commit comments

Comments
 (0)