Add the same unsaved changes alerts that Android has. (#4803)

* Add an alert to Discard or Save when there are unsaved changes on the RoomDetailsEditScreen.

* Add an alert to Discard or Save when there are unsaved changes on the UserDetailsEditScreen.

* Add an alert to Discard or Save when there are unsaved changes on the SecurityAndPrivacyScreen.

* Update strings.

ElementX.xcodeproj/project.pbxproj

@@ -1067,6 +1067,7 @@
 		BDC4EB54CC3036730475CB8B /* QRCodeLoginScreenViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 25E7E9B7FEAB6169D960C206 /* QRCodeLoginScreenViewModelTests.swift */; };
 		BDED6DA7AD1E76018C424143 /* LegalInformationScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C34667458773B02AB5FB0B2 /* LegalInformationScreenViewModel.swift */; };
 		BDFF0AEBF57B5B124062DAEF /* GeneratedAccessibilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4CEB4590CCF70F0E3C0B171 /* GeneratedAccessibilityTests.swift */; };
+		BE011C4473B9A8F12CBFE92A /* UserDetailsEditScreenViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61F58D94C936A1B731D78DE1 /* UserDetailsEditScreenViewModelTests.swift */; };
 		BE8075CA131C5EA3665C9E0D /* SpaceRoomProxyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A01F2E9FD8FF95AB89A345E6 /* SpaceRoomProxyProtocol.swift */; };
 		BE8E5985771DF9137C6CE89A /* ProcessInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 077B01C13BBA2996272C5FB5 /* ProcessInfo.swift */; };
 		BEC6DFEA506085D3027E353C /* MediaEventsTimelineScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 002399C6CB875C4EBB01CBC0 /* MediaEventsTimelineScreen.swift */; };
@@ -2031,6 +2032,7 @@
 		604A69C081B935D6A38DE6D8 /* UserProfileScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfileScreenModels.swift; sourceTree = "<group>"; };
 		60C9BAE9F9436B14E4E22E8F /* PinnedItemsBannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinnedItemsBannerView.swift; sourceTree = "<group>"; };
 		61B33F23681660E940BA57F4 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/SAS.strings; sourceTree = "<group>"; };
+		61F58D94C936A1B731D78DE1 /* UserDetailsEditScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDetailsEditScreenViewModelTests.swift; sourceTree = "<group>"; };
 		622D09D4ECE759189009AEAF /* MapLibreMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapLibreMapView.swift; sourceTree = "<group>"; };
 		624244C398804ADC885239AA /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Localizable.strings; sourceTree = "<group>"; };
 		627A8B5E798CC778C363655E /* KnockRequestsListEmptyStateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KnockRequestsListEmptyStateView.swift; sourceTree = "<group>"; };
@@ -4723,6 +4725,7 @@
 				76310030C831D4610A705603 /* URLComponentsTests.swift */,
 				3AB34956C87731AB094DB33A /* URLTests.swift */,
 				EB3B237387B8288A5A938F1B /* UserAgentBuilderTests.swift */,
+				61F58D94C936A1B731D78DE1 /* UserDetailsEditScreenViewModelTests.swift */,
 				2429224EB0EEA34D35CE9249 /* UserIndicatorControllerTests.swift */,
 				BA241DEEF7C8A7181C0AEDC9 /* UserPreferenceTests.swift */,
 				71E2E5103702D13361D09100 /* UserProfileScreenViewModelTests.swift */,
@@ -7496,6 +7499,7 @@
 				20C16A3F718802B0E4A19C83 /* URLComponentsTests.swift in Sources */,
 				49BBEC46D523BF6A41400048 /* URLTests.swift in Sources */,
 				8D3E1FADD78E72504DE0E402 /* UserAgentBuilderTests.swift in Sources */,
+				BE011C4473B9A8F12CBFE92A /* UserDetailsEditScreenViewModelTests.swift in Sources */,
 				E313BDD2B8813144139B2E00 /* UserDiscoveryServiceTest.swift in Sources */,
 				A1DF0E1E526A981ED6D5DF44 /* UserIndicatorControllerTests.swift in Sources */,
 				04F17DE71A50206336749BAC /* UserPreferenceTests.swift in Sources */,

ElementX/Resources/Localizations/en-US.lproj/Localizable.strings

@@ -374,6 +374,7 @@
 "dialog_default_video_quality_selector_subtitle" = "Select the default quality of videos you upload.";
 "dialog_title_confirmation" = "Confirmation";
 "dialog_title_warning" = "Warning";
+"dialog_unsaved_changes_description" = "You have unsaved changes.";
 "dialog_unsaved_changes_description_ios" = "Your changes won’t be saved";
 "dialog_unsaved_changes_title" = "Save changes?";
 "dialog_video_quality_selector_subtitle_file_size" = "The max file size allowed is: %1$@";
@@ -1041,7 +1042,6 @@
 "screen_room_change_role_moderators_owner_section_footer" = "Owners automatically have admin privileges.";
 "screen_room_change_role_moderators_title" = "Edit Moderators";
 "screen_room_change_role_owners_title" = "Choose Owners";
-"screen_room_change_role_unsaved_changes_description" = "You have unsaved changes.";
 "screen_room_details_add_topic_title" = "Add topic";
 "screen_room_details_badge_encrypted" = "Encrypted";
 "screen_room_details_badge_not_encrypted" = "Not encrypted";
@@ -1425,6 +1425,7 @@
 "screen_room_change_role_section_administrators" = "Admins";
 "screen_room_change_role_section_moderators" = "Moderators";
 "screen_room_change_role_section_users" = "Members";
+"screen_room_change_role_unsaved_changes_description" = "You have unsaved changes.";
 "screen_room_change_role_unsaved_changes_title" = "Save changes?";
 "screen_room_details_badge_public" = "Public room";
 "screen_room_details_invite_people_title" = "Invite people";

ElementX/Resources/Localizations/en.lproj/Localizable.strings

@@ -374,6 +374,7 @@
 "dialog_default_video_quality_selector_subtitle" = "Select the default quality of videos you upload.";
 "dialog_title_confirmation" = "Confirmation";
 "dialog_title_warning" = "Warning";
+"dialog_unsaved_changes_description" = "You have unsaved changes.";
 "dialog_unsaved_changes_description_ios" = "Your changes won’t be saved";
 "dialog_unsaved_changes_title" = "Save changes?";
 "dialog_video_quality_selector_subtitle_file_size" = "The max file size allowed is: %1$@";
@@ -1041,7 +1042,6 @@
 "screen_room_change_role_moderators_owner_section_footer" = "Owners automatically have admin privileges.";
 "screen_room_change_role_moderators_title" = "Edit Moderators";
 "screen_room_change_role_owners_title" = "Choose Owners";
-"screen_room_change_role_unsaved_changes_description" = "You have unsaved changes.";
 "screen_room_details_add_topic_title" = "Add topic";
 "screen_room_details_badge_encrypted" = "Encrypted";
 "screen_room_details_badge_not_encrypted" = "Not encrypted";
@@ -1425,6 +1425,7 @@
 "screen_room_change_role_section_administrators" = "Admins";
 "screen_room_change_role_section_moderators" = "Moderators";
 "screen_room_change_role_section_users" = "Members";
+"screen_room_change_role_unsaved_changes_description" = "You have unsaved changes.";
 "screen_room_change_role_unsaved_changes_title" = "Save changes?";
 "screen_room_details_badge_public" = "Public room";
 "screen_room_details_invite_people_title" = "Invite people";

ElementX/Sources/FlowCoordinators/RoomFlowCoordinator.swift

@@ -1355,6 +1355,8 @@ class RoomFlowCoordinator: FlowCoordinatorProtocol {
             switch action {
             case .displayEditAddressScreen:
                 presentEditAddressScreen()
+            case .dismiss:
+                navigationStackCoordinator.pop()
             }
         }
         .store(in: &cancellables)

ElementX/Sources/FlowCoordinators/SettingsFlowCoordinator.swift

@@ -155,6 +155,14 @@ class SettingsFlowCoordinator: FlowCoordinatorProtocol {
                                                                              navigationStackCoordinator: navigationStackCoordinator,
                                                                              userIndicatorController: flowParameters.userIndicatorController,
                                                                              appSettings: flowParameters.appSettings))
+        coordinator.actions
+            .sink { [weak self] action in
+                switch action {
+                case .dismiss:
+                    self?.navigationStackCoordinator.pop()
+                }
+            }
+            .store(in: &cancellables)
         
         navigationStackCoordinator.push(coordinator)
     }

ElementX/Sources/FlowCoordinators/SpaceSettingsFlowCoordinator.swift

@@ -256,6 +256,8 @@ final class SpaceSettingsFlowCoordinator: FlowCoordinatorProtocol {
             switch action {
             case .displayEditAddressScreen:
                 self.stateMachine.tryEvent(.presentEditAddress)
+            case .dismiss:
+                navigationStackCoordinator.pop()
             }
         }
         .store(in: &cancellables)

ElementX/Sources/Generated/Strings.swift

@@ -854,6 +854,8 @@ internal enum L10n {
   internal static var dialogTitleSuccess: String { return L10n.tr("Localizable", "dialog_title_success") }
   /// Warning
   internal static var dialogTitleWarning: String { return L10n.tr("Localizable", "dialog_title_warning") }
+  /// You have unsaved changes.
+  internal static var dialogUnsavedChangesDescription: String { return L10n.tr("Localizable", "dialog_unsaved_changes_description") }
   /// Your changes won’t be saved
   internal static var dialogUnsavedChangesDescriptionIos: String { return L10n.tr("Localizable", "dialog_unsaved_changes_description_ios") }
   /// Save changes?

ElementX/Sources/Mocks/ClientProxyMock.swift

@@ -82,9 +82,9 @@ extension ClientProxyMock {
         uploadMediaReturnValue = .failure(.sdkError(ClientProxyMockError.generic))
         loadUserDisplayNameReturnValue = .failure(.sdkError(ClientProxyMockError.generic))
         setUserDisplayNameReturnValue = .failure(.sdkError(ClientProxyMockError.generic))
-        loadUserAvatarURLReturnValue = .failure(.sdkError(ClientProxyMockError.generic))
+        loadUserAvatarURLReturnValue = .success(())
-        setUserAvatarMediaReturnValue = .failure(.sdkError(ClientProxyMockError.generic))
+        setUserAvatarMediaReturnValue = .success(())
-        removeUserAvatarReturnValue = .failure(.sdkError(ClientProxyMockError.generic))
+        removeUserAvatarReturnValue = .success(())
         isAliasAvailableReturnValue = .success(true)
         searchUsersSearchTermLimitReturnValue = .success(.init(results: [], limited: false))
         profileForReturnValue = .success(.init(userID: "@a:b.com", displayName: "Some user"))

ElementX/Sources/Screens/RoomDetailsEditScreen/RoomDetailsEditScreenModels.swift

@@ -15,12 +15,6 @@ enum RoomDetailsEditScreenViewModelAction {
     case displayMediaPicker
 }
 
-struct RoomDetailsEditScreenViewStateBindings {
-    var name: String
-    var topic: String
-    var showMediaSheet = false
-}
-
 struct RoomDetailsEditScreenViewState: BindableState {
     let roomID: String
     let isSpace: Bool
@@ -66,6 +60,18 @@ struct RoomDetailsEditScreenViewState: BindableState {
     }
 }
 
+struct RoomDetailsEditScreenViewStateBindings {
+    var name: String
+    var topic: String
+    var showMediaSheet = false
+    
+    var alertInfo: AlertInfo<RoomDetailsEditScreenAlertType>?
+}
+
+enum RoomDetailsEditScreenAlertType {
+    case unsavedChanges
+}
+
 enum RoomDetailsEditScreenViewAction {
     case cancel
     case save

ElementX/Sources/Screens/RoomDetailsEditScreen/RoomDetailsEditScreenViewModel.swift

@@ -60,9 +60,9 @@ class RoomDetailsEditScreenViewModel: RoomDetailsEditScreenViewModelType, RoomDe
     override func process(viewAction: RoomDetailsEditScreenViewAction) {
         switch viewAction {
         case .cancel:
-            actionsSubject.send(.cancel)
+            cancel()
         case .save:
-            saveRoomDetails()
+            Task { await saveRoomDetails() }
         case .presentMediaSource:
             state.bindings.showMediaSheet = true
         case .displayCameraPicker:
@@ -110,50 +110,60 @@ class RoomDetailsEditScreenViewModel: RoomDetailsEditScreenViewModelType, RoomDe
         }
     }
     
-    private func saveRoomDetails() {
+    private func cancel() {
-        Task {
+        if state.canSave {
-            let userIndicatorID = UUID().uuidString
+            state.bindings.alertInfo = .init(id: .unsavedChanges,
-            defer {
+                                             title: L10n.dialogUnsavedChangesTitle,
-                userIndicatorController.retractIndicatorWithId(userIndicatorID)
+                                             message: L10n.dialogUnsavedChangesDescription,
-            }
+                                             primaryButton: .init(title: L10n.actionSave) { Task { await self.saveRoomDetails() } },
-            userIndicatorController.submitIndicator(UserIndicator(id: userIndicatorID,
+                                             secondaryButton: .init(title: L10n.actionDiscard, role: .cancel) { self.actionsSubject.send(.cancel) })
-                                                                  type: .modal(progress: .indeterminate, interactiveDismissDisabled: true, allowsInteraction: false),
+        } else {
-                                                                  title: L10n.screenRoomDetailsUpdatingRoom,
+            actionsSubject.send(.cancel)
-                                                                  persistent: true))
+        }
-            
+    }
-            do {
+    
-                try await withThrowingTaskGroup(of: Void.self) { group in
+    private func saveRoomDetails() async {
-                    if state.avatarDidChange {
+        let userIndicatorID = UUID().uuidString
-                        group.addTask {
+        defer {
-                            if let localMedia = await self.state.localMedia {
+            userIndicatorController.retractIndicatorWithId(userIndicatorID)
-                                try await self.roomProxy.uploadAvatar(media: localMedia).get()
+        }
-                            } else if await self.state.avatarURL == nil {
+        userIndicatorController.submitIndicator(UserIndicator(id: userIndicatorID,
-                                try await self.roomProxy.removeAvatar().get()
+                                                              type: .modal(progress: .indeterminate, interactiveDismissDisabled: true, allowsInteraction: false),
-                            }
+                                                              title: L10n.screenRoomDetailsUpdatingRoom,
+                                                              persistent: true))
+        
+        do {
+            try await withThrowingTaskGroup(of: Void.self) { group in
+                if state.avatarDidChange {
+                    group.addTask {
+                        if let localMedia = await self.state.localMedia {
+                            try await self.roomProxy.uploadAvatar(media: localMedia).get()
+                        } else if await self.state.avatarURL == nil {
+                            try await self.roomProxy.removeAvatar().get()
                         }
                     }
-                    
-                    if state.nameDidChange {
-                        group.addTask {
-                            try await self.roomProxy.setName(self.state.bindings.name).get()
-                        }
-                    }
-                    
-                    if state.topicDidChange {
-                        group.addTask {
-                            try await self.roomProxy.setTopic(self.state.bindings.topic).get()
-                        }
-                    }
-                    
-                    try await group.waitForAll()
                 }
                 
-                actionsSubject.send(.saveFinished)
+                if state.nameDidChange {
-            } catch {
+                    group.addTask {
-                userIndicatorController.alertInfo = .init(id: .init(),
+                        try await self.roomProxy.setName(self.state.bindings.name).get()
-                                                          title: L10n.screenRoomDetailsEditionErrorTitle,
+                    }
-                                                          message: L10n.screenRoomDetailsEditionError)
+                }
+                
+                if state.topicDidChange {
+                    group.addTask {
+                        try await self.roomProxy.setTopic(self.state.bindings.topic).get()
+                    }
+                }
+                
+                try await group.waitForAll()
             }
+            
+            actionsSubject.send(.saveFinished)
+        } catch {
+            userIndicatorController.alertInfo = .init(id: .init(),
+                                                      title: L10n.screenRoomDetailsEditionErrorTitle,
+                                                      message: L10n.screenRoomDetailsEditionError)
         }
     }
 }

ElementX/Sources/Screens/RoomDetailsEditScreen/View/RoomDetailsEditScreen.swift

@@ -30,6 +30,7 @@ struct RoomDetailsEditScreen: View {
         .navigationBarTitleDisplayMode(.inline)
         .toolbar { toolbar }
         .track(screen: .RoomSettings)
+        .alert(item: $context.alertInfo)
     }
     
     // MARK: - Private

ElementX/Sources/Screens/SecurityAndPrivacyScreen/SecurityAndPrivacyScreenCoordinator.swift

@@ -18,6 +18,7 @@ struct SecurityAndPrivacyScreenCoordinatorParameters {
 
 enum SecurityAndPrivacyScreenCoordinatorAction {
     case displayEditAddressScreen
+    case dismiss
 }
 
 final class SecurityAndPrivacyScreenCoordinator: CoordinatorProtocol {
@@ -45,6 +46,8 @@ final class SecurityAndPrivacyScreenCoordinator: CoordinatorProtocol {
             switch action {
             case .displayEditAddressScreen:
                 actionsSubject.send(.displayEditAddressScreen)
+            case .dismiss:
+                actionsSubject.send(.dismiss)
             }
         }
         .store(in: &cancellables)

ElementX/Sources/Screens/SecurityAndPrivacyScreen/SecurityAndPrivacyScreenModels.swift

@@ -10,6 +10,7 @@ import Foundation
 
 enum SecurityAndPrivacyScreenViewModelAction {
     case displayEditAddressScreen
+    case dismiss
 }
 
 struct SecurityAndPrivacyScreenViewState: BindableState {
@@ -188,9 +189,11 @@ enum SecurityAndPrivacyRoomAccessType: Equatable {
 
 enum SecurityAndPrivacyAlertType {
     case enableEncryption
+    case unsavedChanges
 }
 
 enum SecurityAndPrivacyScreenViewAction {
+    case cancel
     case save
     case tryUpdatingEncryption(Bool)
     case editAddress

ElementX/Sources/Screens/SecurityAndPrivacyScreen/SecurityAndPrivacyScreenViewModel.swift

@@ -62,10 +62,10 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
         MXLog.info("View model: received view action: \(viewAction)")
         
         switch viewAction {
+        case .cancel:
+            showUnsavedChangesAlert() // The cancel button is only shown when there are unsaved changes.
         case .save:
-            Task {
+            Task { await saveDesiredSettings() }
-                await saveDesiredSettings()
-            }
         case .tryUpdatingEncryption(let updatedValue):
             if updatedValue {
                 state.bindings.alertInfo = .init(id: .enableEncryption,
@@ -168,12 +168,19 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
         }
     }
     
-    private func saveDesiredSettings() async {
+    private func showUnsavedChangesAlert() {
+        state.bindings.alertInfo = .init(id: .unsavedChanges,
+                                         title: L10n.dialogUnsavedChangesTitle,
+                                         message: L10n.dialogUnsavedChangesDescription,
+                                         primaryButton: .init(title: L10n.actionSave) { Task { await self.saveDesiredSettings(shouldDismiss: true) } },
+                                         secondaryButton: .init(title: L10n.actionDiscard, role: .cancel) { self.actionsSubject.send(.dismiss) })
+    }
+    
+    private func saveDesiredSettings(shouldDismiss: Bool = false) async {
         showLoadingIndicator()
+        defer { hideLoadingIndicator() }
         
-        defer {
+        var hasFailures = false
-            hideLoadingIndicator()
-        }
         
         if state.currentSettings.isEncryptionEnabled != state.bindings.desiredSettings.isEncryptionEnabled {
             switch await roomProxy.enableEncryption() {
@@ -181,6 +188,7 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
                 state.currentSettings.isEncryptionEnabled = state.bindings.desiredSettings.isEncryptionEnabled
             case .failure:
                 userIndicatorController.submitIndicator(.init(title: L10n.errorUnknown))
+                hasFailures = true
             }
         }
         
@@ -190,6 +198,7 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
                 state.currentSettings.historyVisibility = state.bindings.desiredSettings.historyVisibility
             case .failure:
                 userIndicatorController.submitIndicator(.init(title: L10n.errorUnknown))
+                hasFailures = true
             }
         }
         
@@ -205,6 +214,7 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
                 state.currentSettings.accessType = state.bindings.desiredSettings.accessType
             case .failure:
                 userIndicatorController.submitIndicator(.init(title: L10n.errorUnknown))
+                hasFailures = true
             }
         }
         
@@ -216,8 +226,13 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
                 state.currentSettings.isVisibileInRoomDirectory = state.bindings.desiredSettings.isVisibileInRoomDirectory
             case .failure:
                 userIndicatorController.submitIndicator(.init(title: L10n.errorUnknown))
+                hasFailures = true
             }
         }
+        
+        if shouldDismiss, !hasFailures {
+            actionsSubject.send(.dismiss)
+        }
     }
     
     private func handleSelectedSpaceMembersAccess() {

ElementX/Sources/Screens/SecurityAndPrivacyScreen/View/SecurityAndPrivacyScreen.swift

@@ -39,6 +39,7 @@ struct SecurityAndPrivacyScreen: View {
         .compoundList()
         .navigationBarTitleDisplayMode(.inline)
         .navigationTitle(L10n.screenSecurityAndPrivacyTitle)
+        .navigationBarBackButtonHidden(!context.viewState.isSaveDisabled)
         .toolbar { toolbar }
         .alert(item: $context.alertInfo)
     }
@@ -185,6 +186,14 @@ struct SecurityAndPrivacyScreen: View {
     
     @ToolbarContentBuilder
     private var toolbar: some ToolbarContent {
+        ToolbarItem(placement: .cancellationAction) {
+            if !context.viewState.isSaveDisabled {
+                Button(L10n.actionCancel) {
+                    context.send(viewAction: .cancel)
+                }
+            }
+        }
+        
         ToolbarItem(placement: .confirmationAction) {
             Button(L10n.actionSave) {
                 context.send(viewAction: .save)

ElementX/Sources/Screens/Settings/UserDetailsEditScreen/UserDetailsEditScreenCoordinator.swift

@@ -18,11 +18,20 @@ struct UserDetailsEditScreenCoordinatorParameters {
     let appSettings: AppSettings
 }
 
+enum UserDetailsEditScreenCoordinatorAction {
+    case dismiss
+}
+
 final class UserDetailsEditScreenCoordinator: CoordinatorProtocol {
     private let parameters: UserDetailsEditScreenCoordinatorParameters
     private var viewModel: UserDetailsEditScreenViewModelProtocol
     private var cancellables = Set<AnyCancellable>()
     
+    private let actionsSubject: PassthroughSubject<RoomDetailsEditScreenCoordinatorAction, Never> = .init()
+    var actions: AnyPublisher<RoomDetailsEditScreenCoordinatorAction, Never> {
+        actionsSubject.eraseToAnyPublisher()
+    }
+    
     init(parameters: UserDetailsEditScreenCoordinatorParameters) {
         self.parameters = parameters
         
@@ -34,13 +43,17 @@ final class UserDetailsEditScreenCoordinator: CoordinatorProtocol {
     func start() {
         viewModel.actions
             .sink { [weak self] action in
+                guard let self else { return }
+                
                 switch action {
+                case .dismiss:
+                    actionsSubject.send(.dismiss)
                 case .displayCameraPicker:
-                    self?.displayMediaPickerWithMode(.init(source: .camera, selectionType: .single))
+                    displayMediaPickerWithMode(.init(source: .camera, selectionType: .single))
                 case .displayMediaPicker:
-                    self?.displayMediaPickerWithMode(.init(source: .photoLibrary, selectionType: .single))
+                    displayMediaPickerWithMode(.init(source: .photoLibrary, selectionType: .single))
                 case .displayFilePicker:
-                    self?.displayMediaPickerWithMode(.init(source: .documents, selectionType: .single))
+                    displayMediaPickerWithMode(.init(source: .documents, selectionType: .single))
                 }
             }
             .store(in: &cancellables)

ElementX/Sources/Screens/Settings/UserDetailsEditScreen/UserDetailsEditScreenModels.swift

@@ -9,6 +9,7 @@
 import Foundation
 
 enum UserDetailsEditScreenViewModelAction {
+    case dismiss
     case displayCameraPicker
     case displayMediaPicker
     case displayFilePicker
@@ -46,9 +47,16 @@ struct UserDetailsEditScreenViewState: BindableState {
 struct UserDetailsEditScreenViewStateBindings {
     var name = ""
     var showMediaSheet = false
+    
+    var alertInfo: AlertInfo<UserDetailsEditScreenAlertType>?
+}
+
+enum UserDetailsEditScreenAlertType {
+    case unsavedChanges
 }
 
 enum UserDetailsEditScreenViewAction {
+    case cancel
     case save
     case presentMediaSource
     case displayCameraPicker

ElementX/Sources/Screens/Settings/UserDetailsEditScreen/UserDetailsEditScreenViewModel.swift

@@ -65,8 +65,10 @@ class UserDetailsEditScreenViewModel: UserDetailsEditScreenViewModelType, UserDe
     
     override func process(viewAction: UserDetailsEditScreenViewAction) {
         switch viewAction {
+        case .cancel:
+            showUnsavedChangesAlert() // The cancel button is only shown when there are unsaved changes.
         case .save:
-            saveUserDetails()
+            Task { await saveUserDetails() }
         case .presentMediaSource:
             state.bindings.showMediaSheet = true
         case .displayCameraPicker:
@@ -106,42 +108,52 @@ class UserDetailsEditScreenViewModel: UserDetailsEditScreenViewModelType, UserDe
     
     // MARK: - Private
     
-    private func saveUserDetails() {
+    private func showUnsavedChangesAlert() {
-        Task {
+        state.bindings.alertInfo = .init(id: .unsavedChanges,
-            let userIndicatorID = UUID().uuidString
+                                         title: L10n.dialogUnsavedChangesTitle,
-            defer {
+                                         message: L10n.dialogUnsavedChangesDescription,
-                userIndicatorController.retractIndicatorWithId(userIndicatorID)
+                                         primaryButton: .init(title: L10n.actionSave) { Task { await self.saveUserDetails(shouldDismiss: true) } },
-            }
+                                         secondaryButton: .init(title: L10n.actionDiscard, role: .cancel) { self.actionsSubject.send(.dismiss) })
-            userIndicatorController.submitIndicator(UserIndicator(id: userIndicatorID,
+    }
-                                                                  type: .modal(progress: .indeterminate, interactiveDismissDisabled: true, allowsInteraction: false),
+    
-                                                                  title: L10n.screenEditProfileUpdatingDetails,
+    private func saveUserDetails(shouldDismiss: Bool = false) async {
-                                                                  persistent: true))
+        let userIndicatorID = UUID().uuidString
-            
+        defer {
-            do {
+            userIndicatorController.retractIndicatorWithId(userIndicatorID)
-                try await withThrowingTaskGroup(of: Void.self) { group in
+        }
-                    if state.avatarDidChange {
+        userIndicatorController.submitIndicator(UserIndicator(id: userIndicatorID,
-                        group.addTask {
+                                                              type: .modal(progress: .indeterminate, interactiveDismissDisabled: true, allowsInteraction: false),
-                            if let localMedia = await self.state.localMedia {
+                                                              title: L10n.screenEditProfileUpdatingDetails,
-                                try await self.clientProxy.setUserAvatar(media: localMedia).get()
+                                                              persistent: true))
-                            } else if await self.state.selectedAvatarURL == nil {
+        
-                                try await self.clientProxy.removeUserAvatar().get()
+        do {
-                            }
+            try await withThrowingTaskGroup(of: Void.self) { group in
+                if state.avatarDidChange {
+                    group.addTask {
+                        if let localMedia = await self.state.localMedia {
+                            try await self.clientProxy.setUserAvatar(media: localMedia).get()
+                        } else if await self.state.selectedAvatarURL == nil {
+                            try await self.clientProxy.removeUserAvatar().get()
                         }
                     }
-                    
-                    if state.nameDidChange {
-                        group.addTask {
-                            try await self.clientProxy.setUserDisplayName(self.state.bindings.name).get()
-                        }
-                    }
-                    
-                    try await group.waitForAll()
                 }
-            } catch {
+                
-                userIndicatorController.alertInfo = .init(id: .init(),
+                if state.nameDidChange {
-                                                          title: L10n.screenEditProfileErrorTitle,
+                    group.addTask {
-                                                          message: L10n.screenEditProfileError)
+                        try await self.clientProxy.setUserDisplayName(self.state.bindings.name).get()
+                    }
+                }
+                
+                try await group.waitForAll()
             }
+            
+            if shouldDismiss {
+                actionsSubject.send(.dismiss)
+            }
+        } catch {
+            userIndicatorController.alertInfo = .init(id: .init(),
+                                                      title: L10n.screenEditProfileErrorTitle,
+                                                      message: L10n.screenEditProfileError)
         }
     }
 }

ElementX/Sources/Screens/Settings/UserDetailsEditScreen/View/UserDetailsEditScreen.swift

@@ -31,13 +31,22 @@ struct UserDetailsEditScreen: View {
         .scrollDismissesKeyboard(.immediately)
         .navigationTitle(L10n.screenEditProfileTitle)
         .navigationBarTitleDisplayMode(.inline)
+        .navigationBarBackButtonHidden(context.viewState.canSave)
         .toolbar { toolbar }
+        .alert(item: $context.alertInfo)
     }
     
     // MARK: - Private
     
     @ToolbarContentBuilder
     private var toolbar: some ToolbarContent {
+        ToolbarItem(placement: .cancellationAction) {
+            if context.viewState.canSave {
+                Button(L10n.actionCancel) {
+                    context.send(viewAction: .cancel)
+                }
+            }
+        }
         ToolbarItem(placement: .confirmationAction) {
             Button(L10n.actionSave) {
                 context.send(viewAction: .save)

UnitTests/Sources/RoomDetailsEditScreenViewModelTests.swift

@@ -71,7 +71,7 @@ class RoomDetailsEditScreenViewModelTests: XCTestCase {
         XCTAssertFalse(context.viewState.canSave)
     }
     
-    func testSaveShowsSheet() {
+    func testAvatarPickerShowsSheet() {
         setupViewModel(roomProxyConfiguration: .init(name: "Some room", members: [.mockMeAdmin]))
         context.name = "name"
         XCTAssertFalse(context.showMediaSheet)
@@ -93,6 +93,47 @@ class RoomDetailsEditScreenViewModelTests: XCTestCase {
         XCTAssertEqual(action, .saveFinished)
     }
     
+    func testCancelWithoutChanges() async throws {
+        setupViewModel(roomProxyConfiguration: .init(name: "Some room", members: [.mockMeAdmin]))
+        XCTAssertFalse(context.viewState.canSave)
+        XCTAssertNil(context.alertInfo)
+        
+        var deferred = deferFulfillment(viewModel.actions) { $0 == .cancel }
+        context.send(viewAction: .cancel)
+        try await deferred.fulfill()
+        XCTAssertNil(context.alertInfo)
+    }
+    
+    func testCancelWithChangesAndDiscard() async throws {
+        setupViewModel(roomProxyConfiguration: .init(name: "Some room", members: [.mockMeAdmin]))
+        context.name = "name"
+        XCTAssertTrue(context.viewState.canSave)
+        XCTAssertNil(context.alertInfo)
+        
+        context.send(viewAction: .cancel)
+        
+        XCTAssertNotNil(context.alertInfo)
+        
+        let deferred = deferFulfillment(viewModel.actions) { $0 == .cancel }
+        context.alertInfo?.secondaryButton?.action?() // Discard
+        try await deferred.fulfill()
+    }
+    
+    func testCancelWithChangesAndSave() async throws {
+        setupViewModel(roomProxyConfiguration: .init(name: "Some room", members: [.mockMeAdmin]))
+        context.name = "name"
+        XCTAssertTrue(context.viewState.canSave)
+        XCTAssertNil(context.alertInfo)
+        
+        context.send(viewAction: .cancel)
+        
+        XCTAssertNotNil(context.alertInfo)
+        
+        let deferred = deferFulfillment(viewModel.actions) { $0 == .saveFinished }
+        context.alertInfo?.primaryButton.action?() // Save
+        try await deferred.fulfill()
+    }
+    
     func testErrorShownOnFailedFetchOfMedia() async throws {
         setupViewModel(roomProxyConfiguration: .init(name: "Some room", members: [.mockMeAdmin]))
         viewModel.didSelectMediaUrl(url: .picturesDirectory)

UnitTests/Sources/SecurityAndPrivacyScreenViewModelTests.swift

@@ -88,6 +88,67 @@ class SecurityAndPrivacyScreenViewModelTests: XCTestCase {
         }
     }
     
+    func testSave() async throws {
+        setupViewModel(isSpaceSettingsEnabled: false, joinedParentSpaces: [], joinRule: .public)
+        
+        // Saving shouldn't dismiss this screen (or trigger any other action).
+        let deferred = deferFailure(viewModel.actionsPublisher, timeout: 1) { _ in true }
+        
+        context.desiredSettings.accessType = .inviteOnly
+        context.send(viewAction: .save)
+        
+        try await deferred.fulfill()
+    }
+    
+    func testCancelWithChangesAndDiscard() async throws {
+        setupViewModel(isSpaceSettingsEnabled: false, joinedParentSpaces: [], joinRule: .public)
+        context.desiredSettings.accessType = .inviteOnly
+        XCTAssertFalse(context.viewState.isSaveDisabled)
+        XCTAssertNil(context.alertInfo)
+        
+        context.send(viewAction: .cancel)
+        
+        XCTAssertNotNil(context.alertInfo)
+        
+        let deferred = deferFulfillment(viewModel.actionsPublisher) { $0 == .dismiss }
+        context.alertInfo?.secondaryButton?.action?() // Discard
+        try await deferred.fulfill()
+    }
+    
+    func testCancelWithChangesAndSave() async throws {
+        setupViewModel(isSpaceSettingsEnabled: false, joinedParentSpaces: [], joinRule: .public)
+        context.desiredSettings.accessType = .inviteOnly
+        XCTAssertFalse(context.viewState.isSaveDisabled)
+        XCTAssertNil(context.alertInfo)
+        
+        context.send(viewAction: .cancel)
+        
+        XCTAssertNotNil(context.alertInfo)
+        
+        let deferred = deferFulfillment(viewModel.actionsPublisher) { $0 == .dismiss }
+        context.alertInfo?.primaryButton.action?() // Save
+        try await deferred.fulfill()
+    }
+    
+    func testCancelWithChangesAndSaveWithFailure() async throws {
+        setupViewModel(isSpaceSettingsEnabled: false, joinedParentSpaces: [], joinRule: .public)
+        roomProxy.updateJoinRuleReturnValue = .failure(.sdkError(RoomProxyMockError.generic))
+        context.desiredSettings.accessType = .inviteOnly
+        XCTAssertFalse(context.viewState.isSaveDisabled)
+        XCTAssertNil(context.alertInfo)
+        
+        context.send(viewAction: .cancel)
+        
+        XCTAssertNotNil(context.alertInfo)
+        
+        // The screen should not be dismissed if a failure occurred.
+        let deferred = deferFailure(viewModel.actionsPublisher, timeout: 1) { _ in true }
+        context.alertInfo?.primaryButton.action?() // Save
+        try await deferred.fulfill()
+    }
+    
+    // MARK: - Helpers
+    
     private func setupViewModel(isSpaceSettingsEnabled: Bool,
                                 joinedParentSpaces: [SpaceRoomProxyProtocol],
                                 joinRule: JoinRule) {
@@ -98,6 +159,7 @@ class SecurityAndPrivacyScreenViewModelTests: XCTestCase {
                                               members: .allMembersAsCreator,
                                               joinRule: joinRule,
                                               isVisibleInPublicDirectory: true))
+        roomProxy.updateJoinRuleReturnValue = .success(())
         
         viewModel = SecurityAndPrivacyScreenViewModel(roomProxy: roomProxy,
                                                       clientProxy: ClientProxyMock(.init(userIDServerName: "matrix.org",

UnitTests/Sources/UserDetailsEditScreenViewModelTests.swift

@@ -0,0 +1,101 @@
+//
+// Copyright 2025 Element Creations Ltd.
+// Copyright 2022-2025 New Vector Ltd.
+//
+// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+// Please see LICENSE files in the repository root for full details.
+//
+
+import Combine
+import XCTest
+
+@testable import ElementX
+
+@MainActor
+class UserDetailsEditScreenViewModelTests: XCTestCase {
+    var viewModel: UserDetailsEditScreenViewModel!
+    
+    var userIndicatorController: UserIndicatorControllerMock!
+    
+    var context: UserDetailsEditScreenViewModelType.Context {
+        viewModel.context
+    }
+    
+    func testCannotSaveOnLanding() {
+        setupViewModel()
+        XCTAssertFalse(context.viewState.canSave)
+    }
+    
+    func testNameDidChange() {
+        setupViewModel()
+        context.name = "name"
+        XCTAssertTrue(context.viewState.nameDidChange)
+        XCTAssertTrue(context.viewState.canSave)
+    }
+    
+    func testEmptyNameCannotBeSaved() {
+        setupViewModel()
+        context.name = ""
+        XCTAssertFalse(context.viewState.canSave)
+    }
+    
+    func testAvatarPickerShowsSheet() {
+        setupViewModel()
+        context.name = "name"
+        XCTAssertFalse(context.showMediaSheet)
+        context.send(viewAction: .presentMediaSource)
+        XCTAssertTrue(context.showMediaSheet)
+    }
+    
+    func testSave() async throws {
+        setupViewModel()
+        
+        // Saving shouldn't dismiss this screen (or trigger any other action).
+        let deferred = deferFailure(viewModel.actions, timeout: 1) { _ in true }
+        
+        context.name = "name"
+        context.send(viewAction: .save)
+        
+        try await deferred.fulfill()
+    }
+    
+    func testCancelWithChangesAndDiscard() async throws {
+        setupViewModel()
+        context.name = "name"
+        XCTAssertTrue(context.viewState.canSave)
+        XCTAssertNil(context.alertInfo)
+        
+        context.send(viewAction: .cancel)
+        
+        XCTAssertNotNil(context.alertInfo)
+        
+        let deferred = deferFulfillment(viewModel.actions) { $0 == .dismiss }
+        context.alertInfo?.secondaryButton?.action?() // Discard
+        try await deferred.fulfill()
+    }
+    
+    func testCancelWithChangesAndSave() async throws {
+        setupViewModel()
+        context.name = "name"
+        XCTAssertTrue(context.viewState.canSave)
+        XCTAssertNil(context.alertInfo)
+        
+        context.send(viewAction: .cancel)
+        
+        XCTAssertNotNil(context.alertInfo)
+        
+        let deferred = deferFulfillment(viewModel.actions) { $0 == .dismiss }
+        context.alertInfo?.primaryButton.action?() // Save
+        try await deferred.fulfill()
+    }
+    
+    // MARK: - Private
+    
+    private func setupViewModel() {
+        userIndicatorController = UserIndicatorControllerMock.default
+        
+        viewModel = .init(userSession: UserSessionMock(.init()),
+                          mediaUploadingPreprocessor: MediaUploadingPreprocessor(appSettings: ServiceLocator.shared.settings),
+                          userIndicatorController: userIndicatorController)
+    }
+}