feat(healthchat): advertise the account status in settings

Pending approval and an incomplete profile were only visible in the members tab, which a new user has no reason to open.
2026-11-04 01:20:12 +00:00 · 2026-10-09 14:39:33 +02:00
parent 181c518dc7
commit d9524130fa
22 changed files with 556 additions and 296 deletions
@@ -12,7 +12,7 @@ import SwiftUI
 typealias SettingsScreenViewModelType = StateStoreViewModelV2<SettingsScreenViewState, SettingsScreenViewAction>

 class SettingsScreenViewModel: SettingsScreenViewModelType, SettingsScreenViewModelProtocol {
-    private let userSettings: UserSettings
+    private let appSettings: AppSettings
    private let clientProxy: ClientProxyProtocol
    private let userIndicatorController: UserIndicatorControllerProtocol
    
@@ -22,35 +22,30 @@ class SettingsScreenViewModel: SettingsScreenViewModelType, SettingsScreenViewMo
        actionsSubject.eraseToAnyPublisher()
    }
    
-    init(userSession: UserSessionProtocol, isBugReportServiceEnabled: Bool, isInSecondaryWindow: Bool, userIndicatorController: UserIndicatorControllerProtocol) {
-        userSettings = userSession.userSettings
+    init(userSession: UserSessionProtocol, appSettings: AppSettings, appHooks: AppHooks, isBugReportServiceEnabled: Bool, isInSecondaryWindow: Bool, userIndicatorController: UserIndicatorControllerProtocol) {
+        self.appSettings = appSettings
        clientProxy = userSession.clientProxy
        self.userIndicatorController = userIndicatorController
        
        super.init(initialViewState: .init(deviceID: userSession.clientProxy.deviceID,
                                           userProfile: userSession.clientProxy.userProfilePublisher.value,
-                                           showLinkNewDeviceButton: userSettings.app.linkNewDeviceEnabled,
-                                           showAddAccountButton: userSettings.app.multiAccountEnabled,
+                                           showLinkNewDeviceButton: appSettings.linkNewDeviceEnabled,
                                           showAccountDeactivation: userSession.clientProxy.canDeactivateAccount,
-                                           showDeveloperOptions: userSettings.app.developerOptionsEnabled,
-                                           showAnalyticsSettings: userSettings.app.canPromptForAnalytics,
+                                           showDeveloperOptions: appSettings.developerOptionsEnabled,
+                                           showAnalyticsSettings: appSettings.canPromptForAnalytics,
                                           isBugReportServiceEnabled: isBugReportServiceEnabled,
                                           navigationBarVisibility: isInSecondaryWindow ? .hidden : .automatic,
-                                           bindings: .init(userSettings: userSettings)),
+                                           appHooks: appHooks),
                   mediaProvider: userSession.mediaProvider)
        
-        userSettings.app.developerOptionsEnabledPublisher
+        appSettings.developerOptionsEnabledPublisher
            .weakAssign(to: \.state.showDeveloperOptions, on: self)
            .store(in: &cancellables)
        
-        userSettings.app.linkNewDeviceEnabledPublisher
+        appSettings.linkNewDeviceEnabledPublisher
            .weakAssign(to: \.state.showLinkNewDeviceButton, on: self)
            .store(in: &cancellables)
        
-        userSettings.app.multiAccountEnabledPublisher
-            .weakAssign(to: \.state.showAddAccountButton, on: self)
-            .store(in: &cancellables)
-        
        userSession.clientProxy.userProfilePublisher
            .receive(on: DispatchQueue.main)
            .weakAssign(to: \.state.userProfile, on: self)
@@ -78,6 +73,18 @@ class SettingsScreenViewModel: SettingsScreenViewModelType, SettingsScreenViewMo
            }
            .store(in: &cancellables)
        
+        userSession.clientProxy.ignoredUsersPublisher
+            .receive(on: DispatchQueue.main)
+            .map {
+                guard let blockedUsers = $0 else {
+                    return false
+                }
+                
+                return !blockedUsers.isEmpty
+            }
+            .weakAssign(to: \.state.showBlockedUsers, on: self)
+            .store(in: &cancellables)
+        
        Task {
            if case .success(true) = await userSession.clientProxy.isUserStatusSupported() {
                state.showUserStatusInput = true
@@ -91,7 +98,6 @@ class SettingsScreenViewModel: SettingsScreenViewModelType, SettingsScreenViewMo
        switch viewAction {
        case .close:
            actionsSubject.send(.close)
-            
        case .userDetails:
            actionsSubject.send(.userDetails)
        case .userStatus(.pickStatus):
@@ -108,45 +114,36 @@ class SettingsScreenViewModel: SettingsScreenViewModelType, SettingsScreenViewMo
        case .userStatus(.cancel):
            state.bindings.isPresentingStatusPicker = false
            state.bindings.isShowingCustomStatusField = false
-            
-        case .addAccount:
-            actionsSubject.send(.addAccount)
-            
-        case let .manageAccount(url):
-            actionsSubject.send(.manageAccount(url: url))
        case .linkNewDevice:
            actionsSubject.send(.linkNewDevice)
-        case .notifications:
-            actionsSubject.send(.notifications)
-        case .secureBackup:
-            actionsSubject.send(.secureBackup)
-        case .moderationAndSafety:
-            actionsSubject.send(.moderationAndSafety)
-        case .reportBug:
-            actionsSubject.send(.reportBug)
-            
-        case .logout:
-            actionsSubject.send(.logout)
-        case .deactivateAccount:
-            actionsSubject.send(.deactivateAccount)
-            
-        case .mediaUploadQuality:
-            actionsSubject.send(.mediaUploadQuality)
-        case .appLock:
-            actionsSubject.send(.appLock)
-        case .locationSharing:
-            actionsSubject.send(.locationSharing)
+        case let .manageAccount(url):
+            actionsSubject.send(.manageAccount(url: url))
        case .analytics:
            actionsSubject.send(.analytics)
-        case .labs:
-            actionsSubject.send(.labs)
+        case .appLock:
+            actionsSubject.send(.appLock)
+        case .reportBug:
+            actionsSubject.send(.reportBug)
        case .about:
            actionsSubject.send(.about)
-            
+        case .blockedUsers:
+            actionsSubject.send(.blockedUsers)
+        case .logout:
+            actionsSubject.send(.logout)
+        case .secureBackup:
+            actionsSubject.send(.secureBackup)
+        case .notifications:
+            actionsSubject.send(.notifications)
+        case .advancedSettings:
+            actionsSubject.send(.advancedSettings)
+        case .labs:
+            actionsSubject.send(.labs)
        case .enableDeveloperOptions:
-            userSettings.app.developerOptionsEnabled.toggle()
+            appSettings.developerOptionsEnabled.toggle()
        case .developerOptions:
            actionsSubject.send(.developerOptions)
+        case .deactivateAccount:
+            actionsSubject.send(.deactivateAccount)
        }
    }