Add a logout button on the identity confirmation screen

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

@@ -441,16 +441,16 @@
 "screen_edit_profile_error_title" = "Unable to update profile";
 "screen_edit_profile_title" = "Edit profile";
 "screen_edit_profile_updating_details" = "Updating profile…";
+"screen_encryption_reset_action_continue_reset" = "Continue reset";
 "screen_encryption_reset_bullet_1" = "Your account details, contacts, preferences, and chat list will be kept";
 "screen_encryption_reset_bullet_2" = "You will lose your existing message history";
 "screen_encryption_reset_bullet_3" = "You will need to verify all your existing devices and contacts again";
 "screen_encryption_reset_footer" = "Only reset your identity if you don’t have access to another signed-in device and you’ve lost your recovery key.";
-"screen_encryption_reset_subtitle" = "If you’re not signed in to any other devices and you’ve lost your recovery key, then you’ll need to reset your identity to continue using the app. ";
-"screen_encryption_reset_title" = "Reset your identity in case you can’t confirm another way";
+"screen_encryption_reset_title" = "Can't confirm? You’ll need to reset your identity.";
 "screen_identity_confirmation_cannot_confirm" = "Can't confirm?";
 "screen_identity_confirmation_create_new_recovery_key" = "Create a new recovery key";
 "screen_identity_confirmation_subtitle" = "Verify this device to set up secure messaging.";
-"screen_identity_confirmation_title" = "Confirm that it's you";
+"screen_identity_confirmation_title" = "Confirm your identity";
 "screen_identity_confirmation_use_another_device" = "Use another device";
 "screen_identity_confirmation_use_recovery_key" = "Use recovery key";
 "screen_identity_confirmed_subtitle" = "Now you can read or send messages securely, and anyone you chat with can also trust this device.";

ElementX/Sources/FlowCoordinators/OnboardingFlowCoordinator.swift

@@ -18,6 +18,10 @@ import Combine
 import Foundation
 import SwiftState
 
+enum OnboardingFlowCoordinatorAction {
+    case logout
+}
+
 class OnboardingFlowCoordinator: FlowCoordinatorProtocol {
     private let userSession: UserSessionProtocol
     private let appLockService: AppLockServiceProtocol
@@ -52,6 +56,11 @@ class OnboardingFlowCoordinator: FlowCoordinatorProtocol {
     // periphery: ignore - used to store the coordinator to avoid deallocation
     private var appLockFlowCoordinator: AppLockSetupFlowCoordinator?
 
+    private let actionsSubject: PassthroughSubject<OnboardingFlowCoordinatorAction, Never> = .init()
+    var actions: AnyPublisher<OnboardingFlowCoordinatorAction, Never> {
+        actionsSubject.eraseToAnyPublisher()
+    }
+
     init(userSession: UserSessionProtocol,
          appLockService: AppLockServiceProtocol,
          analyticsService: AnalyticsService,
@@ -234,6 +243,8 @@ class OnboardingFlowCoordinator: FlowCoordinatorProtocol {
                 stateMachine.tryEvent(.nextSkippingIdentityConfimed)
             case .reset:
                 presentEncryptionResetScreen()
+            case .logout:
+                actionsSubject.send(.logout)
             }
         }
         .store(in: &cancellables)

ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift

@@ -185,6 +185,17 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
                 }
             }
             .store(in: &cancellables)
+
+        onboardingFlowCoordinator.actions
+            .sink { [weak self] action in
+                guard let self else { return }
+
+                switch action {
+                case .logout:
+                    logout()
+                }
+            }
+            .store(in: &cancellables)
     }
 
     func start() {
@@ -429,12 +440,7 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
         }
 
         guard isLastDevice else {
-            ServiceLocator.shared.userIndicatorController.alertInfo = .init(id: .init(),
-                                                                            title: L10n.screenSignoutConfirmationDialogTitle,
-                                                                            message: L10n.screenSignoutConfirmationDialogContent,
-                                                                            primaryButton: .init(title: L10n.screenSignoutConfirmationDialogSubmit, role: .destructive) { [weak self] in
-                                                                                self?.actionsSubject.send(.logout)
-                                                                            })
+            logout()
             return
         }
 
@@ -465,6 +471,15 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
         presentSecureBackupLogoutConfirmationScreen()
     }
 
+    private func logout() {
+        ServiceLocator.shared.userIndicatorController.alertInfo = .init(id: .init(),
+                                                                        title: L10n.screenSignoutConfirmationDialogTitle,
+                                                                        message: L10n.screenSignoutConfirmationDialogContent,
+                                                                        primaryButton: .init(title: L10n.screenSignoutConfirmationDialogSubmit, role: .destructive) { [weak self] in
+                                                                            self?.actionsSubject.send(.logout)
+                                                                        })
+    }
+
     // MARK: Room Flow
 
     private func startRoomFlow(roomID: String,

ElementX/Sources/Generated/Strings.swift

@@ -1057,6 +1057,8 @@ internal enum L10n {
   internal static var screenEditProfileTitle: String { return L10n.tr("Localizable", "screen_edit_profile_title") }
   /// Updating profile…
   internal static var screenEditProfileUpdatingDetails: String { return L10n.tr("Localizable", "screen_edit_profile_updating_details") }
+  /// Continue reset
+  internal static var screenEncryptionResetActionContinueReset: String { return L10n.tr("Localizable", "screen_encryption_reset_action_continue_reset") }
   /// Your account details, contacts, preferences, and chat list will be kept
   internal static var screenEncryptionResetBullet1: String { return L10n.tr("Localizable", "screen_encryption_reset_bullet_1") }
   /// You will lose your existing message history
@@ -1065,17 +1067,15 @@ internal enum L10n {
   internal static var screenEncryptionResetBullet3: String { return L10n.tr("Localizable", "screen_encryption_reset_bullet_3") }
   /// Only reset your identity if you don’t have access to another signed-in device and you’ve lost your recovery key.
   internal static var screenEncryptionResetFooter: String { return L10n.tr("Localizable", "screen_encryption_reset_footer") }
-  /// If you’re not signed in to any other devices and you’ve lost your recovery key, then you’ll need to reset your identity to continue using the app. 
-  internal static var screenEncryptionResetSubtitle: String { return L10n.tr("Localizable", "screen_encryption_reset_subtitle") }
-  /// Reset your identity in case you can’t confirm another way
+  /// Can't confirm? You’ll need to reset your identity.
   internal static var screenEncryptionResetTitle: String { return L10n.tr("Localizable", "screen_encryption_reset_title") }
   /// Can't confirm?
   internal static var screenIdentityConfirmationCannotConfirm: String { return L10n.tr("Localizable", "screen_identity_confirmation_cannot_confirm") }
   /// Create a new recovery key
   internal static var screenIdentityConfirmationCreateNewRecoveryKey: String { return L10n.tr("Localizable", "screen_identity_confirmation_create_new_recovery_key") }
   /// Verify this device to set up secure messaging.
   internal static var screenIdentityConfirmationSubtitle: String { return L10n.tr("Localizable", "screen_identity_confirmation_subtitle") }
-  /// Confirm that it's you
+  /// Confirm your identity
   internal static var screenIdentityConfirmationTitle: String { return L10n.tr("Localizable", "screen_identity_confirmation_title") }
   /// Use another device
   internal static var screenIdentityConfirmationUseAnotherDevice: String { return L10n.tr("Localizable", "screen_identity_confirmation_use_another_device") }

ElementX/Sources/Screens/EncryptionReset/EncryptionResetScreen/View/EncryptionResetScreen.swift

@@ -24,7 +24,7 @@ struct EncryptionResetScreen: View {
         FullscreenDialog {
             mainContent
         } bottomContent: {
-            Button(L10n.actionContinue, role: .destructive) {
+            Button(L10n.screenEncryptionResetActionContinueReset, role: .destructive) {
                 context.send(viewAction: .reset)
             }
             .buttonStyle(.compound(.primary))
@@ -55,11 +55,6 @@ struct EncryptionResetScreen: View {
                 .font(.compound.headingMDBold)
                 .multilineTextAlignment(.center)
                 .foregroundColor(.compound.textPrimary)
-
-            Text(L10n.screenEncryptionResetSubtitle)
-                .font(.compound.bodyMD)
-                .multilineTextAlignment(.center)
-                .foregroundColor(.compound.textSecondary)
         }
     }
 

ElementX/Sources/Screens/Onboarding/IdentityConfirmationScreen/IdentityConfirmationScreenCoordinator.swift

@@ -29,6 +29,7 @@ enum IdentityConfirmationScreenCoordinatorAction {
     /// Only possible in debug builds.
     case skip
     case reset
+    case logout
 }
 
 final class IdentityConfirmationScreenCoordinator: CoordinatorProtocol {
@@ -64,6 +65,8 @@ final class IdentityConfirmationScreenCoordinator: CoordinatorProtocol {
                 actionsSubject.send(.skip)
             case .reset:
                 actionsSubject.send(.reset)
+            case .logout:
+                actionsSubject.send(.logout)
             }
         }
         .store(in: &cancellables)

ElementX/Sources/Screens/Onboarding/IdentityConfirmationScreen/IdentityConfirmationScreenModels.swift

@@ -22,6 +22,7 @@ enum IdentityConfirmationScreenViewModelAction {
     /// Only possible in debug builds.
     case skip
     case reset
+    case logout
 }
 
 struct IdentityConfirmationScreenViewState: BindableState {
@@ -40,4 +41,5 @@ enum IdentityConfirmationScreenViewAction {
     /// Only possible in debug builds.
     case skip
     case reset
+    case logout
 }

ElementX/Sources/Screens/Onboarding/IdentityConfirmationScreen/IdentityConfirmationScreenViewModel.swift

@@ -61,6 +61,8 @@ class IdentityConfirmationScreenViewModel: IdentityConfirmationScreenViewModelTy
             actionsSubject.send(.skip)
         case .reset:
             actionsSubject.send(.reset)
+        case .logout:
+            actionsSubject.send(.logout)
         }
     }
 

ElementX/Sources/Screens/Onboarding/IdentityConfirmationScreen/View/IdentityConfirmationScreen.swift

@@ -34,9 +34,9 @@ struct IdentityConfirmationScreen: View {
         } bottomContent: {
             actionButtons
         }
+        .toolbar { toolbar }
         .background()
         .backgroundStyle(.compound.bgCanvasDefault)
-        .navigationBarHidden(true)
         .navigationBarBackButtonHidden(true)
         .interactiveDismissDisabled()
     }
@@ -104,6 +104,15 @@ struct IdentityConfirmationScreen: View {
             .padding(.vertical, 14)
         }
     }
+
+    @ToolbarContentBuilder
+    var toolbar: some ToolbarContent {
+        ToolbarItem(placement: .destructiveAction) {
+            Button(L10n.actionSignout) {
+                context.send(viewAction: .logout)
+            }
+        }
+    }
 }
 
 // MARK: - Previews