Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Guard user suggestions behind feature flag so that they don't impact releasability of other room creation features #770

Merged
merged 6 commits into from
Apr 6, 2023
Merged

Guard user suggestions behind feature flag so that they don't impact releasability of other room creation features #770

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
614956d
Guard user suggestions behind feature flag so that they don't impact …
Johennes Apr 5, 2023
7bee487
Erase user section before fetching data and make user section view vi…
Johennes Apr 6, 2023
c79c335
Don't persist feature flag
Johennes Apr 6, 2023
b88777b
Move state section back into fetchSuggestions to unbreak tests
Johennes Apr 6, 2023
cab3073
Merge branch 'develop' into johannes/put-suggestions-behind-feature-flag
Johennes Apr 6, 2023
fa78a30
Merge branch 'develop' into johannes/put-suggestions-behind-feature-flag
Johennes Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ElementX/Sources/Application/AppSettings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ final class AppSettings: ObservableObject {
case pusherProfileTag
case shouldCollapseRoomStateEvents
case startChatFlowEnabled = "showStartChatFlow"
case startChatUserSuggestionsEnabled
case mediaUploadingFlowEnabled
}

Expand Down Expand Up @@ -164,6 +165,9 @@ final class AppSettings: ObservableObject {
@UserSetting(key: UserDefaultsKeys.startChatFlowEnabled.rawValue, defaultValue: false, persistIn: store)
var startChatFlowEnabled

@UserSetting(key: UserDefaultsKeys.startChatUserSuggestionsEnabled.rawValue, defaultValue: false, persistIn: store)
Johennes marked this conversation as resolved.
Show resolved Hide resolved
var startChatUserSuggestionsEnabled

// MARK: Media Uploading

@UserSetting(key: UserDefaultsKeys.mediaUploadingFlowEnabled.rawValue, defaultValue: false, persistIn: nil)
Expand Down
2 changes: 2 additions & 0 deletions ElementX/Sources/Screens/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@ struct DeveloperOptionsScreenViewState: BindableState {
struct DeveloperOptionsScreenViewStateBindings {
var shouldCollapseRoomStateEvents: Bool
var startChatFlowEnabled: Bool
var startChatUserSuggestionsEnabled: Bool
var mediaUploadFlowEnabled: Bool
}

enum DeveloperOptionsScreenViewAction {
case changedShouldCollapseRoomStateEvents
case changedStartChatFlowEnabled
case changedStartChatUserSuggestionsEnabled
case changedMediaUploadFlowEnabled
}
3 changes: 3 additions & 0 deletions ElementX/Sources/Screens/DeveloperOptionsScreen/DeveloperOptionsScreenViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class DeveloperOptionsScreenViewModel: DeveloperOptionsScreenViewModelType, Deve
init() {
let bindings = DeveloperOptionsScreenViewStateBindings(shouldCollapseRoomStateEvents: ServiceLocator.shared.settings.shouldCollapseRoomStateEvents,
startChatFlowEnabled: ServiceLocator.shared.settings.startChatFlowEnabled,
startChatUserSuggestionsEnabled: ServiceLocator.shared.settings.startChatUserSuggestionsEnabled,
mediaUploadFlowEnabled: ServiceLocator.shared.settings.mediaUploadingFlowEnabled)
let state = DeveloperOptionsScreenViewState(bindings: bindings)

Expand All @@ -40,6 +41,8 @@ class DeveloperOptionsScreenViewModel: DeveloperOptionsScreenViewModelType, Deve
ServiceLocator.shared.settings.shouldCollapseRoomStateEvents = state.bindings.shouldCollapseRoomStateEvents
case .changedStartChatFlowEnabled:
ServiceLocator.shared.settings.startChatFlowEnabled = state.bindings.startChatFlowEnabled
case .changedStartChatUserSuggestionsEnabled:
ServiceLocator.shared.settings.startChatUserSuggestionsEnabled = state.bindings.startChatUserSuggestionsEnabled
case .changedMediaUploadFlowEnabled:
ServiceLocator.shared.settings.mediaUploadingFlowEnabled = state.bindings.mediaUploadFlowEnabled
}
Expand Down
7 changes: 7 additions & 0 deletions ElementX/Sources/Screens/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ struct DeveloperOptionsScreen: View {
context.send(viewAction: .changedStartChatFlowEnabled)
}

Toggle(isOn: $context.startChatUserSuggestionsEnabled) {
Text("Start chat user suggestions")
}
.onChange(of: context.startChatUserSuggestionsEnabled) { _ in
context.send(viewAction: .changedStartChatUserSuggestionsEnabled)
}

Toggle(isOn: $context.mediaUploadFlowEnabled) {
Text("Show Media Uploading flow")
}
Expand Down
2 changes: 1 addition & 1 deletion ElementX/Sources/Screens/StartChat/StartChatViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class StartChatViewModel: StartChatViewModelType, StartChatViewModelProtocol {
}

private func fetchSuggestions() {
state.usersSection = .init(type: .suggestions, users: [.mockAlice, .mockBob, .mockCharlie])
state.usersSection = .init(type: .suggestions, users: ServiceLocator.shared.settings.startChatUserSuggestionsEnabled ? [.mockAlice, .mockBob, .mockCharlie] : [])
alfogrillo marked this conversation as resolved.
Show resolved Hide resolved
}

private func createDirectRoom(with user: UserProfile) async {
Expand Down
2 changes: 1 addition & 1 deletion ElementX/Sources/Screens/StartChat/View/StartChatScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ struct StartChatScreen: View {
}
}
} header: {
if let title = context.viewState.usersSection.type.title {
if !context.viewState.usersSection.users.isEmpty, let title = context.viewState.usersSection.type.title {
Johennes marked this conversation as resolved.
Show resolved Hide resolved
Text(title)
}
}
Expand Down
1 change: 1 addition & 0 deletions changelog.d/pr-770.change
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Guard user suggestions behind feature flag so that they don't impact releasability of other room creation features