Merge branch 'release/1.115.0'

duckduckgo · Nov 25, 2024 · 5a5bde3 · 5a5bde3
2 parents c934664 + 815708f
commit 5a5bde3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 313
+CURRENT_PROJECT_VERSION = 314
diff --git a/DuckDuckGo/Application/AppDelegate.swift b/DuckDuckGo/Application/AppDelegate.swift
@@ -403,10 +403,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
 
                 let isEnabled = privacyConfigurationManager.privacyConfig.isSubfeatureEnabled(PrivacyProSubfeature.setAccessTokenCookieForSubscriptionDomains)
 
-                Task { [weak self] in
+                Task { @MainActor [weak self] in
                     if isEnabled {
                         self?.subscriptionCookieManager.enableSettingSubscriptionCookie()
-                        await self?.subscriptionCookieManager.refreshSubscriptionCookie()
                     } else {
                         await self?.subscriptionCookieManager.disableSettingSubscriptionCookie()
                     }

diff --git a/DuckDuckGo/HomePage/Model/NewTabPageSearchBoxExperiment.swift b/DuckDuckGo/HomePage/Model/NewTabPageSearchBoxExperiment.swift
@@ -210,7 +210,7 @@ final class NewTabPageSearchBoxExperiment {
     }
 
     var cohort: Cohort? {
-        isActive ? dataStore.experimentCohort : nil
+        dataStore.experimentCohort
     }
 
     var onboardingCohort: PixelExperiment? {

diff --git a/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift b/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift
@@ -326,6 +326,7 @@ final class AddressBarTextField: NSTextField {
 
     private func navigate(suggestion: Suggestion?) {
         let ntpExperiment = NewTabPageSearchBoxExperiment()
+        let ntpExperimentCohort: NewTabPageSearchBoxExperiment.Cohort? = ntpExperiment.isActive ? ntpExperiment.cohort : nil
         let source: NewTabPageSearchBoxExperiment.SearchSource? = {
             guard ntpExperiment.isActive else {
                 return nil
@@ -349,17 +350,17 @@ final class AddressBarTextField: NSTextField {
         let autocompletePixel: GeneralPixel? = {
             switch suggestion {
             case .phrase:
-                return .autocompleteClickPhrase(from: source, cohort: ntpExperiment.cohort, onboardingCohort: ntpExperiment.onboardingCohort)
+                return .autocompleteClickPhrase(from: source, cohort: ntpExperimentCohort, onboardingCohort: ntpExperiment.onboardingCohort)
             case .website:
-                return .autocompleteClickWebsite(from: source, cohort: ntpExperiment.cohort, onboardingCohort: ntpExperiment.onboardingCohort)
+                return .autocompleteClickWebsite(from: source, cohort: ntpExperimentCohort, onboardingCohort: ntpExperiment.onboardingCohort)
             case .bookmark(_, _, let isFavorite, _):
                 if isFavorite {
-                    return .autocompleteClickFavorite(from: source, cohort: ntpExperiment.cohort, onboardingCohort: ntpExperiment.onboardingCohort)
+                    return .autocompleteClickFavorite(from: source, cohort: ntpExperimentCohort, onboardingCohort: ntpExperiment.onboardingCohort)
                 } else {
-                    return .autocompleteClickBookmark(from: source, cohort: ntpExperiment.cohort, onboardingCohort: ntpExperiment.onboardingCohort)
+                    return .autocompleteClickBookmark(from: source, cohort: ntpExperimentCohort, onboardingCohort: ntpExperiment.onboardingCohort)
                 }
             case .historyEntry:
-                return .autocompleteClickHistory(from: source, cohort: ntpExperiment.cohort, onboardingCohort: ntpExperiment.onboardingCohort)
+                return .autocompleteClickHistory(from: source, cohort: ntpExperimentCohort, onboardingCohort: ntpExperiment.onboardingCohort)
             default:
                 return nil
             }

diff --git a/UnitTests/HomePage/NewTabPageSearchBoxExperimentTests.swift b/UnitTests/HomePage/NewTabPageSearchBoxExperimentTests.swift
@@ -162,12 +162,12 @@ final class NewTabPageSearchBoxExperimentTests: XCTestCase {
         XCTAssertFalse(experiment.isActive)
     }
 
-    func testWhenExperimentIsInactiveThenCohortIsNil() {
+    func testWhenExperimentIsInactiveThenCohortStays() {
         dataStore.didRunEnrollment = true
         dataStore.experimentCohort = .experiment
         dataStore.enrollmentDate = Date.daysAgo(NewTabPageSearchBoxExperiment.Const.experimentDurationInDays)
 
-        XCTAssertNil(experiment.cohort)
+        XCTAssertEqual(experiment.cohort, .experiment)
     }
 
     func testWhenExperimentIsInactiveThenOnboardingExperimentCohortIsNil() {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		CURRENT_PROJECT_VERSION = 313
		CURRENT_PROJECT_VERSION = 314