Push the deactivate account screen. (#3297)

element-hq · Sep 18, 2024 · 5078f57 · 5078f57
1 parent 5625e78
commit 5078f57
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 41 deletions.
diff --git a/ElementX/Sources/FlowCoordinators/SettingsFlowCoordinator.swift b/ElementX/Sources/FlowCoordinators/SettingsFlowCoordinator.swift
@@ -242,8 +242,6 @@ class SettingsFlowCoordinator: FlowCoordinatorProtocol {
     }
 
     private func presentDeactivateAccount() {
-        let navigationCoordinator = NavigationStackCoordinator()
-
         let parameters = DeactivateAccountScreenCoordinatorParameters(clientProxy: parameters.userSession.clientProxy,
                                                                       userIndicatorController: parameters.userIndicatorController)
         let coordinator = DeactivateAccountScreenCoordinator(parameters: parameters)
@@ -253,16 +251,13 @@ class SettingsFlowCoordinator: FlowCoordinatorProtocol {
                 guard let self else { return }
 
                 switch action {
-                case .cancel:
-                    navigationStackCoordinator.setSheetCoordinator(nil)
                 case .accountDeactivated:
                     actionsSubject.send(.forceLogout)
                 }
             }
             .store(in: &cancellables)
 
-        navigationCoordinator.setRootCoordinator(coordinator)
-        navigationStackCoordinator.setSheetCoordinator(navigationCoordinator)
+        navigationStackCoordinator.push(coordinator)
     }
 
     // MARK: OIDC Account Management

diff --git a/ElementX/Sources/Screens/DeactivateAccountScreen/DeactivateAccountScreenCoordinator.swift b/ElementX/Sources/Screens/DeactivateAccountScreen/DeactivateAccountScreenCoordinator.swift
@@ -14,7 +14,6 @@ struct DeactivateAccountScreenCoordinatorParameters {
 }
 
 enum DeactivateAccountScreenCoordinatorAction {
-    case cancel
     case accountDeactivated
 }
 
@@ -42,8 +41,6 @@ final class DeactivateAccountScreenCoordinator: CoordinatorProtocol {
 
             guard let self else { return }
             switch action {
-            case .cancel:
-                actionsSubject.send(.cancel)
             case .accountDeactivated:
                 actionsSubject.send(.accountDeactivated)
             }

diff --git a/ElementX/Sources/Screens/DeactivateAccountScreen/DeactivateAccountScreenModels.swift b/ElementX/Sources/Screens/DeactivateAccountScreen/DeactivateAccountScreenModels.swift
@@ -8,7 +8,6 @@
 import Foundation
 
 enum DeactivateAccountScreenViewModelAction {
-    case cancel
     case accountDeactivated
 }
 
@@ -50,5 +49,4 @@ enum DeactivateAccountScreenAlert {
 
 enum DeactivateAccountScreenViewAction {
     case deactivate
-    case cancel
 }
diff --git a/ElementX/Sources/Screens/DeactivateAccountScreen/DeactivateAccountScreenViewModel.swift b/ElementX/Sources/Screens/DeactivateAccountScreen/DeactivateAccountScreenViewModel.swift
@@ -30,8 +30,6 @@ class DeactivateAccountScreenViewModel: DeactivateAccountScreenViewModelType, De
         MXLog.info("View model: received view action: \(viewAction)")
 
         switch viewAction {
-        case .cancel:
-            actionsSubject.send(.cancel)
         case .deactivate:
             showDeactivationConfirmation()
         }

diff --git a/ElementX/Sources/Screens/DeactivateAccountScreen/View/DeactivateAccountScreen.swift b/ElementX/Sources/Screens/DeactivateAccountScreen/View/DeactivateAccountScreen.swift
@@ -29,7 +29,6 @@ struct DeactivateAccountScreen: View {
         }
         .navigationTitle(L10n.screenDeactivateAccountTitle)
         .navigationBarTitleDisplayMode(.inline)
-        .toolbar { toolbar }
         .alert(item: $context.alertInfo)
     }
 
@@ -71,14 +70,6 @@ struct DeactivateAccountScreen: View {
                 .compoundListSectionHeader()
         }
     }
-
-    private var toolbar: some ToolbarContent {
-        ToolbarItem(placement: .cancellationAction) {
-            Button(L10n.actionCancel) {
-                context.send(viewAction: .cancel)
-            }
-        }
-    }
 }
 
 private struct InfoItem: View {

diff --git a/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift b/ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift
@@ -181,11 +181,12 @@ struct SettingsScreen: View {
                         context.send(viewAction: .logout)
                     })
                     .accessibilityIdentifier(A11yIdentifiers.settingsScreen.logout)
+
             if context.viewState.showAccountDeactivation {
                 ListRow(label: .action(title: L10n.actionDeactivateAccount,
                                        icon: \.warning,
                                        role: .destructive),
-                        kind: .button {
+                        kind: .navigationLink {
                             context.send(viewAction: .deactivateAccount)
                         })
             }

diff --git a/...ources/__Snapshots__/PreviewTests/test_deactivateAccountScreen-iPad-en-GB.1.png b/...ources/__Snapshots__/PreviewTests/test_deactivateAccountScreen-iPad-en-GB.1.png
diff --git a/...urces/__Snapshots__/PreviewTests/test_deactivateAccountScreen-iPad-pseudo.1.png b/...urces/__Snapshots__/PreviewTests/test_deactivateAccountScreen-iPad-pseudo.1.png
diff --git a/...s/__Snapshots__/PreviewTests/test_deactivateAccountScreen-iPhone-15-en-GB.1.png b/...s/__Snapshots__/PreviewTests/test_deactivateAccountScreen-iPhone-15-en-GB.1.png
diff --git a/.../__Snapshots__/PreviewTests/test_deactivateAccountScreen-iPhone-15-pseudo.1.png b/.../__Snapshots__/PreviewTests/test_deactivateAccountScreen-iPhone-15-pseudo.1.png
diff --git a/UnitTests/Sources/DeactivateAccountScreenViewModelTests.swift b/UnitTests/Sources/DeactivateAccountScreenViewModelTests.swift
@@ -78,14 +78,4 @@ class DeactivateAccountScreenViewModelTests: XCTestCase {
         XCTAssertEqual(clientProxy.deactivateAccountPasswordEraseDataReceivedArguments?.password, enteredPassword)
         XCTAssertEqual(clientProxy.deactivateAccountPasswordEraseDataReceivedArguments?.eraseData, shouldErase)
     }
-
-    func testCancel() async throws {
-        // When cancelling the view.
-        let deferred = deferFulfillment(viewModel.actionsPublisher) { $0 == .cancel }
-        context.send(viewAction: .cancel)
-        try await deferred.fulfill()
-
-        // Then no API call should be made to deactivate the account.
-        XCTAssertFalse(clientProxy.deactivateAccountPasswordEraseDataCalled)
-    }
 }