Merge branch 'release/1.124.0'

duckduckgo · Jan 29, 2025 · db394d8 · db394d8
2 parents 9da2de4 + a849c69
commit db394d8
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 26 deletions.
diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 351
+CURRENT_PROJECT_VERSION = 352
diff --git a/DuckDuckGo/Preferences/Model/SyncPreferences.swift b/DuckDuckGo/Preferences/Model/SyncPreferences.swift
@@ -771,16 +771,16 @@ extension SyncPreferences: ManagementDialogModelDelegate {
     }
 
     private func handleAccountAlreadyExists(_ recoveryKey: SyncCode.RecoveryKey) {
-        if devices.count > 1 {
-            managementDialogModel.shouldShowSwitchAccountsMessage = true
-            PixelKit.fire(SyncSwitchAccountPixelKitEvent.syncAskUserToSwitchAccount.withoutMacPrefix)
-        } else {
-            Task { @MainActor in
+        Task { @MainActor in
+            if devices.count > 1 {
+                managementDialogModel.showSwitchAccountsMessage()
+                PixelKit.fire(SyncSwitchAccountPixelKitEvent.syncAskUserToSwitchAccount.withoutMacPrefix)
+            } else {
                 await switchAccounts(recoveryKey: recoveryKey)
                 managementDialogModel.endFlow()
             }
+            PixelKit.fire(DebugEvent(GeneralPixel.syncLoginExistingAccountError(error: SyncError.accountAlreadyExists)))
         }
-        PixelKit.fire(DebugEvent(GeneralPixel.syncLoginExistingAccountError(error: SyncError.accountAlreadyExists)))
     }
 
     func userConfirmedSwitchAccounts(recoveryCode: String) {

diff --git a/LocalPackages/SyncUI-macOS/Sources/SyncUI-macOS/ViewModels/ManagementDialogModel.swift b/LocalPackages/SyncUI-macOS/Sources/SyncUI-macOS/ViewModels/ManagementDialogModel.swift
@@ -57,6 +57,7 @@ public final class ManagementDialogModel: ObservableObject {
             .sink { [weak self] hasError in
                 self?.shouldShowErrorMessage = hasError
             }
+
     }
 
     @MainActor
@@ -72,6 +73,12 @@ public final class ManagementDialogModel: ObservableObject {
         delegate?.userConfirmedSwitchAccounts(recoveryCode: recoveryCode)
     }
 
+    @MainActor
+    public func showSwitchAccountsMessage() {
+        shouldShowSwitchAccountsMessage = true
+        shouldShowErrorMessage = true
+    }
+
     @MainActor
     private func doEndFlow() {
         syncErrorMessage?.type.onButtonPressed(delegate: delegate)

diff --git a/LocalPackages/SyncUI-macOS/Sources/SyncUI-macOS/Views/ManagementDialog.swift b/LocalPackages/SyncUI-macOS/Sources/SyncUI-macOS/Views/ManagementDialog.swift
@@ -62,25 +62,26 @@ public struct ManagementDialog: View {
     public var body: some View {
         content
             .alert(isPresented: $model.shouldShowErrorMessage) {
-                Alert(
-                    title: Text(errorTitle),
-                    message: Text(errorDescription),
-                    dismissButton: .default(Text(buttonTitle)) {
-                        model.endFlow()
-                    }
-                )
-            }
-            .alert(isPresented: $model.shouldShowSwitchAccountsMessage) {
-                Alert(
-                    title: Text(UserText.syncAlertSwitchAccountTitle),
-                    message: Text(UserText.syncAlertSwitchAccountMessage),
-                    primaryButton: .default(Text(UserText.syncAlertSwitchAccountButton)) {
-                        model.userConfirmedSwitchAccounts(recoveryCode: recoveryCodeModel.recoveryCode)
-                    },
-                    secondaryButton: .cancel {
-                        model.endFlow()
-                    }
-                )
+                if model.shouldShowSwitchAccountsMessage {
+                    Alert(
+                        title: Text(UserText.syncAlertSwitchAccountTitle),
+                        message: Text(UserText.syncAlertSwitchAccountMessage),
+                        primaryButton: .default(Text(UserText.syncAlertSwitchAccountButton)) {
+                            model.userConfirmedSwitchAccounts(recoveryCode: recoveryCodeModel.recoveryCode)
+                        },
+                        secondaryButton: .cancel {
+                            model.endFlow()
+                        }
+                    )
+                } else {
+                    Alert(
+                        title: Text(errorTitle),
+                        message: Text(errorDescription),
+                        dismissButton: .default(Text(buttonTitle)) {
+                            model.endFlow()
+                        }
+                    )
+                }
             }
     }
 

diff --git a/UnitTests/Sync/SyncPreferencesTests.swift b/UnitTests/Sync/SyncPreferencesTests.swift
@@ -346,6 +346,7 @@ final class SyncPreferencesTests: XCTestCase {
 
         await fulfillment(of: [loginCalledExpectation], timeout: 5.0)
 
+        XCTAssert(managementDialogModel.shouldShowErrorMessage)
         XCTAssert(managementDialogModel.shouldShowSwitchAccountsMessage)
     }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		CURRENT_PROJECT_VERSION = 351
		CURRENT_PROJECT_VERSION = 352
-Original file line number
+Diff line change
@@ Expand Up / @@ -346,6 +346,7 @@ final class SyncPreferencesTests: XCTestCase { @@
             await fulfillment(of: [loginCalledExpectation], timeout: 5.0)
+            XCTAssert(managementDialogModel.shouldShowErrorMessage)
             XCTAssert(managementDialogModel.shouldShowSwitchAccountsMessage)
         }
@@ Expand Down @@