Merge branch 'release/1.97.0'

# Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved # DuckDuckGo/YoutubePlayer/YoutubeOverlayUserScript.swift # LocalPackages/DataBrokerProtection/Package.swift # LocalPackages/NetworkProtectionMac/Package.swift # LocalPackages/SubscriptionUI/Package.swift
duckduckgo · Jul 16, 2024 · abb89db · abb89db
2 parents f737ea0 + 9c82266
commit abb89db
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 13 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -13310,7 +13310,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 171.2.0;
+				version = 171.2.1;
 			};
 		};
 		9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,17 +32,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "a3bd039e78e75e0ad36dffbf1874b555738f22af",
-        "version" : "171.2.0"
+        "revision" : "09844ec2d0c9d2312e02c90527e8df063db89318",
+        "version" : "171.2.1"
       }
     },
     {
       "identity" : "content-scope-scripts",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/content-scope-scripts",
       "state" : {
-        "revision" : "d0d4f28bbe2fd44cbc5db5f109bb8453699308a3",
-        "version" : "6.1.0"
+        "revision" : "dc26bfc6e33ad9c79a719b7f21d5ca0564db1859",
+        "version" : "6.3.0"
       }
     },
     {

diff --git a/DuckDuckGo/Statistics/Experiment/PixelExperiment.swift b/DuckDuckGo/Statistics/Experiment/PixelExperiment.swift
@@ -209,9 +209,9 @@ final internal class PixelExperimentLogic {
 
     func fireSerpPixel() {
         if allocatedCohort != nil {
-            PixelKit.fire(GeneralPixel.serp(cohort: cohort?.rawValue), frequency: .standard, includeAppVersionParameter: false)
+            PixelKit.fire(GeneralPixel.serp(cohort: cohort?.rawValue), frequency: .standard)
         } else {
-            PixelKit.fire(GeneralPixel.serp(cohort: nil), frequency: .standard, includeAppVersionParameter: false)
+            PixelKit.fire(GeneralPixel.serp(cohort: nil), frequency: .standard)
         }
     }
 

diff --git a/DuckDuckGo/Windows/View/WindowControllersManager.swift b/DuckDuckGo/Windows/View/WindowControllersManager.swift
@@ -308,9 +308,15 @@ extension WindowControllersManager: OnboardingNavigating {
     @MainActor
     func replaceTabWith(_ tab: Tab) {
         guard let tabToRemove = selectedTab else { return }
-        guard let index = mainWindowController?.mainViewController.tabCollectionViewModel.indexInAllTabs(of: tabToRemove) else { return }
-        mainWindowController?.mainViewController.tabCollectionViewModel.append(tab: tab)
-        mainWindowController?.mainViewController.tabCollectionViewModel.remove(at: index)
+        guard let mainWindowController else { return }
+        guard let index = mainWindowController.mainViewController.tabCollectionViewModel.indexInAllTabs(of: tabToRemove) else { return }
+        var tabToAppend = tab
+        if mainWindowController.mainViewController.isBurner {
+            let burnerMode = mainWindowController.mainViewController.tabCollectionViewModel.burnerMode
+            tabToAppend = Tab(content: tab.content, burnerMode: burnerMode)
+        }
+        mainWindowController.mainViewController.tabCollectionViewModel.append(tab: tabToAppend)
+        mainWindowController.mainViewController.tabCollectionViewModel.remove(at: index)
     }
 
     @MainActor

diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
@@ -29,7 +29,7 @@ let package = Package(
             targets: ["DataBrokerProtection"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "171.2.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "171.2.1"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
     ],

diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -32,7 +32,7 @@ let package = Package(
         .library(name: "VPNAppLauncher", targets: ["VPNAppLauncher"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "171.2.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "171.2.1"),
         .package(url: "https://github.com/airbnb/lottie-spm", exact: "4.4.3"),
         .package(path: "../AppLauncher"),
         .package(path: "../UDSHelper"),

diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
@@ -12,7 +12,7 @@ let package = Package(
             targets: ["SubscriptionUI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "171.2.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "171.2.1"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [