Tweak EncryptionReset, IdentityConfirmation and SecureBackupRecovery screens. (#3391)

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

@@ -477,7 +477,7 @@
 "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 unless it is stored on another device";
+"screen_encryption_reset_bullet_2" = "You will lose any message history that’s stored only on the server";
 "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_title" = "Can't confirm? You’ll need to reset your identity.";

ElementX/Sources/Generated/Strings.swift

@@ -1123,7 +1123,7 @@ internal enum L10n {
   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 unless it is stored on another device
+  /// You will lose any message history that’s stored only on the server
   internal static var screenEncryptionResetBullet2: String { return L10n.tr("Localizable", "screen_encryption_reset_bullet_2") }
   /// You will need to verify all your existing devices and contacts again
   internal static var screenEncryptionResetBullet3: String { return L10n.tr("Localizable", "screen_encryption_reset_bullet_3") }

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

@@ -71,13 +71,9 @@ struct EncryptionResetScreen: View {
     @ViewBuilder
     private func checkMarkItem(title: String, position: ListPosition, positive: Bool) -> some View {
         RoundedLabelItem(title: title, listPosition: position) {
-            if positive {
-                CompoundIcon(\.check)
-                    .foregroundColor(.compound.iconAccentPrimary)
-            } else {
-                CompoundIcon(\.close)
-                    .foregroundColor(.compound.iconCriticalPrimary)
-            }
+            CompoundIcon(positive ? \.check : \.info)
+                .foregroundColor(positive ? .compound.iconAccentPrimary : .compound.iconSecondary)
+                .alignmentGuide(.top) { _ in 2 }
         }
         .backgroundStyle(.compound.bgCanvasDefault)
     }

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

@@ -67,32 +67,27 @@ struct IdentityConfirmationScreen: View {
                     context.send(viewAction: .otherDevice)
                 }
                 .buttonStyle(.compound(.primary))
-                
-                if context.viewState.availableActions.contains(.recovery) {
-                    Button(L10n.screenIdentityConfirmationUseRecoveryKey) {
-                        context.send(viewAction: .recoveryKey)
-                    }
-                    .buttonStyle(.compound(.secondary))
-                }
-            } else if context.viewState.availableActions.contains(.recovery) {
+            }
+            
+            if context.viewState.availableActions.contains(.recovery) {
                 Button(L10n.screenIdentityConfirmationUseRecoveryKey) {
                     context.send(viewAction: .recoveryKey)
                 }
                 .buttonStyle(.compound(.primary))
             }
             
-            if shouldShowSkipButton {
-                Button(L10n.actionSkip) {
-                    context.send(viewAction: .skip)
-                }
-                .buttonStyle(.compound(.plain))
-            }
-            
             Button(L10n.screenIdentityConfirmationCannotConfirm) {
                 context.send(viewAction: .reset)
             }
-            .buttonStyle(.compound(.plain))
-            .padding(.vertical, 14)
+            .buttonStyle(.compound(.secondary))
+            
+            if shouldShowSkipButton {
+                Button("\(L10n.actionSkip) 🙉") {
+                    context.send(viewAction: .skip)
+                }
+                .buttonStyle(.compound(.plain))
+                .padding(.vertical, 14)
+            }
         }
     }
     

ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift

@@ -90,14 +90,6 @@ struct SecureBackupRecoveryKeyScreen: View {
             }
             .buttonStyle(.compound(.primary))
             .disabled(context.confirmationRecoveryKey.isEmpty)
-            
-            Button {
-                context.send(viewAction: .resetEncryption)
-            } label: {
-                Text(L10n.screenIdentityConfirmationCreateNewRecoveryKey)
-                    .padding(.vertical, 14)
-            }
-            .buttonStyle(.compound(.plain))
         }
     }