Merge branch 'release/cycle-3.118' into fix/mls-log-out-error

wireapp · Feb 21, 2025 · 896a21e · 896a21e
2 parents 699462d + 8470611
commit 896a21e
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 35 deletions.
diff --git a/...ngsUI/Account/BackupImportExport/Export/SetBackupBasswordView/SetBackupPasswordView.swift b/...ngsUI/Account/BackupImportExport/Export/SetBackupBasswordView/SetBackupPasswordView.swift
@@ -24,6 +24,8 @@ struct SetBackupPasswordView: View {
 
     @StateObject var viewModel: SetBackupPasswordViewModel
 
+    var focusPasswordFieldOnAppear = true
+
     @Environment(\.wireAccentColor) private var wireAccentColor
     @Environment(\.wireAccentColorMapping) private var wireAccentColorMapping
 
@@ -98,7 +100,7 @@ struct SetBackupPasswordView: View {
             password: $viewModel.password,
             placeholder: Strings.ExportBackup.SetBackupPassword.placeholder,
             placeholderColor: passwordFieldPlaceholderColor,
-            focusOnAppear: true
+            focusOnAppear: focusPasswordFieldOnAppear
         )
         .tint(passwordFieldBorderColor)
     }

diff --git a/...ettingsUITests/Account/BackupImportExport/Export/SetBackupPasswordViewSnapshotTests.swift b/...ettingsUITests/Account/BackupImportExport/Export/SetBackupPasswordViewSnapshotTests.swift
@@ -47,7 +47,7 @@ final class SetBackupPasswordViewSnapshotTests: XCTestCase {
             setPasswordAction: { _ in }
         )
         viewModel.password = "invalid"
-        let sut = SetBackupPasswordView(viewModel: viewModel)
+        let sut = SetBackupPasswordView(viewModel: viewModel, focusPasswordFieldOnAppear: false)
             .frame(width: screenBounds.width, height: screenBounds.height)
 
         snapshotHelper
@@ -66,7 +66,7 @@ final class SetBackupPasswordViewSnapshotTests: XCTestCase {
             setPasswordAction: { _ in }
         )
         viewModel.password = "G00dPassword"
-        let sut = SetBackupPasswordView(viewModel: viewModel)
+        let sut = SetBackupPasswordView(viewModel: viewModel, focusPasswordFieldOnAppear: false)
             .frame(width: screenBounds.width, height: screenBounds.height)
 
         snapshotHelper
@@ -84,7 +84,7 @@ final class SetBackupPasswordViewSnapshotTests: XCTestCase {
             cancelAction: {},
             setPasswordAction: { _ in }
         )
-        let sut = SetBackupPasswordView(viewModel: viewModel)
+        let sut = SetBackupPasswordView(viewModel: viewModel, focusPasswordFieldOnAppear: false)
             .frame(width: screenBounds.width, height: screenBounds.height)
 
         snapshotHelper
@@ -99,7 +99,7 @@ final class SetBackupPasswordViewSnapshotTests: XCTestCase {
             cancelAction: {},
             setPasswordAction: { _ in }
         )
-        let sut = SetBackupPasswordView(viewModel: viewModel)
+        let sut = SetBackupPasswordView(viewModel: viewModel, focusPasswordFieldOnAppear: false)
             .frame(width: screenBounds.width, height: screenBounds.height)
 
         for dynamicTypeSize in DynamicTypeSize.allCases {

diff --git a/...renceImages/SetBackupPasswordViewSnapshotTests/testColorSchemeVariants.dark.png b/...renceImages/SetBackupPasswordViewSnapshotTests/testColorSchemeVariants.dark.png
diff --git a/...s/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility1.png b/...s/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility1.png
diff --git a/...s/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility2.png b/...s/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility2.png
diff --git a/...s/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility3.png b/...s/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.accessibility3.png
diff --git a/...enceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.large.png b/...enceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.large.png
diff --git a/...nceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.medium.png b/...nceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.medium.png
diff --git a/...enceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.small.png b/...enceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.small.png
diff --git a/...nceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xLarge.png b/...nceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xLarge.png
diff --git a/...nceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xSmall.png b/...nceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xSmall.png
diff --git a/...ceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xxLarge.png b/...ceImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xxLarge.png
diff --git a/...eImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png b/...eImages/SetBackupPasswordViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png
diff --git a/...ReferenceImages/SetBackupPasswordViewSnapshotTests/testInvalidPassword.dark.png b/...ReferenceImages/SetBackupPasswordViewSnapshotTests/testInvalidPassword.dark.png
diff --git a/...eferenceImages/SetBackupPasswordViewSnapshotTests/testInvalidPassword.light.png b/...eferenceImages/SetBackupPasswordViewSnapshotTests/testInvalidPassword.light.png
diff --git a/...eferenceImages/SetBackupPasswordViewSnapshotTests/testNonEmptyPassword.dark.png b/...eferenceImages/SetBackupPasswordViewSnapshotTests/testNonEmptyPassword.dark.png
diff --git a/...ferenceImages/SetBackupPasswordViewSnapshotTests/testNonEmptyPassword.light.png b/...ferenceImages/SetBackupPasswordViewSnapshotTests/testNonEmptyPassword.light.png