From 6fc9bf3bd54cd470192424724ae85331c383b917 Mon Sep 17 00:00:00 2001
From: Dominik Kapusta <dkapusta@duckduckgo.com>
Date: Thu, 14 Mar 2024 08:48:04 +0100
Subject: [PATCH 01/30] Improve checking whether a nightly build is due

---
 .github/workflows/bump_internal_release.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/bump_internal_release.yml b/.github/workflows/bump_internal_release.yml
index 624ecf6fb3..8ec3932231 100644
--- a/.github/workflows/bump_internal_release.yml
+++ b/.github/workflows/bump_internal_release.yml
@@ -63,10 +63,10 @@ jobs:
             echo "skip-release=false" >> $GITHUB_OUTPUT
           else
             latest_tag="$(git describe --tags --abbrev=0)"
-            changed_files="$(git diff --name-only "$latest_tag".."origin/${release_branch}" | grep -v -E '.github|scripts')"
+            changed_files="$(git diff --name-only "$latest_tag".."origin/${release_branch}")"
 
-            if [[ ${#changed_files} == 0 ]]; then
-              echo "::warning::No changes to the release branch (or only scripts and workflows). Skipping automatic release."
+            if grep -q -v -e '.github' -e 'scripts' <<< "$changed_files"; then
+              echo "::warning::No changes to the release branch (or only changes to scripts and workflows). Skipping automatic release."
               echo "skip-release=true" >> $GITHUB_OUTPUT
             else
               echo "skip-release=false" >> $GITHUB_OUTPUT

From 8b794b0698b0f00d7da9ff2e93c8df554f9f034d Mon Sep 17 00:00:00 2001
From: Dominik Kapusta <dkapusta@duckduckgo.com>
Date: Thu, 14 Mar 2024 09:05:54 +0100
Subject: [PATCH 02/30] Fix nighly build check

---
 .github/workflows/bump_internal_release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/bump_internal_release.yml b/.github/workflows/bump_internal_release.yml
index 8ec3932231..ba06acdcc6 100644
--- a/.github/workflows/bump_internal_release.yml
+++ b/.github/workflows/bump_internal_release.yml
@@ -66,10 +66,10 @@ jobs:
             changed_files="$(git diff --name-only "$latest_tag".."origin/${release_branch}")"
 
             if grep -q -v -e '.github' -e 'scripts' <<< "$changed_files"; then
+              echo "skip-release=false" >> $GITHUB_OUTPUT
+            else
               echo "::warning::No changes to the release branch (or only changes to scripts and workflows). Skipping automatic release."
               echo "skip-release=true" >> $GITHUB_OUTPUT
-            else
-              echo "skip-release=false" >> $GITHUB_OUTPUT
             fi
           fi
 

From 7830b586a1073377a9748382598a65fb9cf7c7d0 Mon Sep 17 00:00:00 2001
From: Diego Rey Mendez <diegoreymendez@users.noreply.github.com>
Date: Thu, 14 Mar 2024 10:37:16 +0100
Subject: [PATCH 03/30] Renames "Network Protection" to "VPN" in all
 user-facing text (#2392)

Task/Issue URL: https://app.asana.com/0/0/1206800069675133/f

iOS: https://github.com/duckduckgo/iOS/pull/2588
BSK: https://github.com/duckduckgo/BrowserServicesKit/pull/721

## Description

Updates the copy from "Network Protection" to "VPN" or "DuckDuckGo VPN"
---
 .../NetworkProtectionSystemExtension.xcconfig |   2 +-
 Configuration/Global.xcconfig                 |   2 +-
 DuckDuckGo.xcodeproj/project.pbxproj          |  30 +--
 .../xcshareddata/swiftpm/Package.resolved     |   6 +-
 DuckDuckGo/Application/URLEventHandler.swift  |   2 +-
 .../Common/Extensions/NSAlertExtension.swift  |   6 +-
 .../UserText+NetworkProtection.swift          | 172 +++++++++---------
 DuckDuckGo/Common/Logging/Logging.swift       |   2 +-
 .../Utilities/UserDefaultsWrapper.swift       |   4 +-
 DuckDuckGo/Info.plist                         |   2 +-
 DuckDuckGo/LoginItems/LoginItemsManager.swift |   4 +-
 DuckDuckGo/Menus/MainMenu.swift               |   2 +-
 DuckDuckGo/NavigationBar/PinningManager.swift |   2 +-
 .../NavigationBar/View/MoreOptionsMenu.swift  |   2 +-
 .../View/NavigationBar.storyboard             |   2 +-
 .../View/NavigationBarPopovers.swift          |   2 +-
 .../View/NavigationBarViewController.swift    |   8 +-
 .../AppLauncher.swift                         |   5 +-
 .../NetworkProtectionAppEvents.swift          |   8 +-
 .../NetworkProtectionDebugMenu.swift          |   8 +-
 .../NetworkProtectionDebugUtilities.swift     |   2 +-
 .../NetworkProtectionNavBarButtonModel.swift  |   2 +-
 ...etworkProtectionNavBarPopoverManager.swift |   9 +
 .../NetworkProtectionOnboardingMenu.swift     |   2 +-
 ...NetworkProtectionSimulateFailureMenu.swift |   8 +-
 .../NetworkProtectionTunnelController.swift   |   6 +-
 ...tionWaitlistFeatureFlagOverridesMenu.swift |   6 +-
 ...NetworkProtectionIPCTunnelController.swift |   2 +-
 .../NetworkProtectionRemoteMessaging.swift    |   6 +-
 ...rkProtectionUNNotificationsPresenter.swift |   1 +
 ...UserText+NetworkProtectionExtensions.swift |  22 +--
 .../MacPacketTunnelProvider.swift             |   4 -
 DuckDuckGo/Statistics/PixelEvent.swift        |   2 +-
 .../NetworkProtectionFeatureDisabler.swift    |   2 +-
 .../NetworkProtectionFeatureVisibility.swift  |   6 +-
 .../WaitlistTermsAndConditionsView.swift      |   2 +-
 DuckDuckGo/Waitlist/Waitlist.swift            |   2 +-
 .../View/WindowControllersManager.swift       |   2 +-
 DuckDuckGoNotifications/Logging.swift         |   6 +-
 DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift  |   3 +
 .../NetworkExtensionController.swift          |   2 +-
 DuckDuckGoVPN/NetworkProtectionBouncer.swift  |   6 +-
 DuckDuckGoVPN/UserText.swift                  |   1 +
 .../DataBrokerProtection/Package.swift        |   2 +-
 .../NetworkProtectionMac/Package.swift        |   2 +-
 LocalPackages/NetworkProtectionMac/README.md  |   6 +-
 .../AppLaunching/AppLaunching.swift           |  39 ++++
 .../UserText+NetworkProtectionUI.swift        |  14 +-
 .../Menu/NavigationBarIconProvider.swift      |   2 +-
 .../Menu/StatusBarMenu.swift                  |   2 +-
 .../NetworkProtectionStatusViewModel.swift    |   4 +-
 .../TunnelControllerViewModel.swift           |   6 +-
 .../AppLaunching/MockAppLauncher.swift        |  30 +++
 .../TunnelControllerViewModelTests.swift      |   8 +-
 LocalPackages/SubscriptionUI/Package.swift    |   2 +-
 .../DebugMenu/SubscriptionDebugMenu.swift     |   2 +-
 56 files changed, 291 insertions(+), 203 deletions(-)
 create mode 100644 LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/AppLaunching/AppLaunching.swift
 create mode 100644 LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/AppLaunching/MockAppLauncher.swift

diff --git a/Configuration/Extensions/NetworkProtection/NetworkProtectionSystemExtension.xcconfig b/Configuration/Extensions/NetworkProtection/NetworkProtectionSystemExtension.xcconfig
index c6b581e569..9cc1c7ae28 100644
--- a/Configuration/Extensions/NetworkProtection/NetworkProtectionSystemExtension.xcconfig
+++ b/Configuration/Extensions/NetworkProtection/NetworkProtectionSystemExtension.xcconfig
@@ -29,7 +29,7 @@ CODE_SIGN_IDENTITY[config=Debug][sdk=macosx*] = Apple Development
 GENERATE_INFOPLIST_FILE = YES
 INFOPLIST_FILE = NetworkProtectionSystemExtension/Info.plist
 INFOPLIST_KEY_NSHumanReadableCopyright = Copyright © 2023 DuckDuckGo. All rights reserved.
-INFOPLIST_KEY_NSSystemExtensionUsageDescription = Network Protection
+INFOPLIST_KEY_NSSystemExtensionUsageDescription = DuckDuckGo VPN
 
 FEATURE_FLAGS[arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION
 FEATURE_FLAGS[config=CI][arch=*][sdk=*] = NETP_SYSTEM_EXTENSION NETWORK_EXTENSION NETWORK_PROTECTION
diff --git a/Configuration/Global.xcconfig b/Configuration/Global.xcconfig
index 39c875ee65..37ab4747ad 100644
--- a/Configuration/Global.xcconfig
+++ b/Configuration/Global.xcconfig
@@ -91,7 +91,7 @@ SWIFT_COMPILATION_MODE = wholemodule
 SWIFT_COMPILATION_MODE[config=CI][arch=*][sdk=*] =
 SWIFT_COMPILATION_MODE[config=Debug][arch=*][sdk=*] =
 
-// This is temporarily set back to its default value, as a part of merging Network Protection. There are a small number of warnings introduced in
+// This is temporarily set back to its default value, as a part of merging the VPN. There are a small number of warnings introduced in
 // that feature, and more time is needed to address them. To avoid bothering other developers, this is being disabled and a task to fix it will be
 // prioritized.
 SWIFT_STRICT_CONCURRENCY = minimal;
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index ebc0323dd8..1ebb57cfa5 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -2177,6 +2177,8 @@
 		7B1E819E27C8874900FF0E60 /* ContentOverlayPopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1E819B27C8874900FF0E60 /* ContentOverlayPopover.swift */; };
 		7B1E819F27C8874900FF0E60 /* ContentOverlay.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7B1E819C27C8874900FF0E60 /* ContentOverlay.storyboard */; };
 		7B1E81A027C8874900FF0E60 /* ContentOverlayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1E819D27C8874900FF0E60 /* ContentOverlayViewController.swift */; };
+		7B25856C2BA2F2D000D49F79 /* AppLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD7A6E2A1D3E1F002A24E7 /* AppLauncher.swift */; };
+		7B25856E2BA2F2ED00D49F79 /* NetworkProtectionUI in Frameworks */ = {isa = PBXBuildFile; productRef = 7B25856D2BA2F2ED00D49F79 /* NetworkProtectionUI */; };
 		7B2DDCF82A93A8BB0039D884 /* NetworkProtectionAppEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B2DDCF72A93A8BB0039D884 /* NetworkProtectionAppEvents.swift */; };
 		7B2DDCFA2A93B25F0039D884 /* KeychainType+ClientDefault.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD3AF5C2A8E7AF1006F9F56 /* KeychainType+ClientDefault.swift */; };
 		7B2DDCFB2A93B25F0039D884 /* KeychainType+ClientDefault.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BD3AF5C2A8E7AF1006F9F56 /* KeychainType+ClientDefault.swift */; };
@@ -2190,6 +2192,7 @@
 		7B4CE8E726F02135009134B1 /* TabBarTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B4CE8E626F02134009134B1 /* TabBarTests.swift */; };
 		7B5DD69A2AE51FFA001DE99C /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = 7B5DD6992AE51FFA001DE99C /* PixelKit */; };
 		7B5F9A752AE2BE4E002AEBC0 /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = 7B5F9A742AE2BE4E002AEBC0 /* PixelKit */; };
+		7B624F172BA25C1F00A6C544 /* NetworkProtectionUI in Frameworks */ = {isa = PBXBuildFile; productRef = 7B624F162BA25C1F00A6C544 /* NetworkProtectionUI */; };
 		7B7DFB202B7E736B009EA1A3 /* MacPacketTunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEF12E6D2A2111880023E6BF /* MacPacketTunnelProvider.swift */; };
 		7B7DFB222B7E7473009EA1A3 /* Networking in Frameworks */ = {isa = PBXBuildFile; productRef = 7B7DFB212B7E7473009EA1A3 /* Networking */; };
 		7B8C083C2AE1268E00F4C67F /* PixelKit in Frameworks */ = {isa = PBXBuildFile; productRef = 7B8C083B2AE1268E00F4C67F /* PixelKit */; };
@@ -3112,13 +3115,10 @@
 		EE7295E32A545B9A008C0991 /* NetworkProtection in Frameworks */ = {isa = PBXBuildFile; productRef = EE7295E22A545B9A008C0991 /* NetworkProtection */; };
 		EE7295E72A545BBB008C0991 /* NetworkProtection in Frameworks */ = {isa = PBXBuildFile; productRef = EE7295E62A545BBB008C0991 /* NetworkProtection */; };
 		EE7295E92A545BC4008C0991 /* NetworkProtection in Frameworks */ = {isa = PBXBuildFile; productRef = EE7295E82A545BC4008C0991 /* NetworkProtection */; };
-		EE7295EB2A545BFC008C0991 /* NetworkProtection in Frameworks */ = {isa = PBXBuildFile; productRef = EE7295EA2A545BFC008C0991 /* NetworkProtection */; };
 		EE7295ED2A545C0A008C0991 /* NetworkProtection in Frameworks */ = {isa = PBXBuildFile; productRef = EE7295EC2A545C0A008C0991 /* NetworkProtection */; };
 		EE7295EF2A545C12008C0991 /* NetworkProtection in Frameworks */ = {isa = PBXBuildFile; productRef = EE7295EE2A545C12008C0991 /* NetworkProtection */; };
 		EEA3EEB12B24EBD000E8333A /* NetworkProtectionVPNCountryLabelsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEA3EEB02B24EBD000E8333A /* NetworkProtectionVPNCountryLabelsModel.swift */; };
 		EEA3EEB32B24EC0600E8333A /* VPNLocationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEA3EEB22B24EC0600E8333A /* VPNLocationViewModel.swift */; };
-		EEAD7A7A2A1D3E20002A24E7 /* AppLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD7A6E2A1D3E1F002A24E7 /* AppLauncher.swift */; };
-		EEAD7A7B2A1D3E20002A24E7 /* AppLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD7A6E2A1D3E1F002A24E7 /* AppLauncher.swift */; };
 		EEAD7A7C2A1D3E20002A24E7 /* AppLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAD7A6E2A1D3E1F002A24E7 /* AppLauncher.swift */; };
 		EEC111E4294D06020086524F /* JSAlert.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EEC111E3294D06020086524F /* JSAlert.storyboard */; };
 		EEC111E6294D06290086524F /* JSAlertViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC111E5294D06290086524F /* JSAlertViewModel.swift */; };
@@ -4618,7 +4618,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EE7295EB2A545BFC008C0991 /* NetworkProtection in Frameworks */,
+				7B624F172BA25C1F00A6C544 /* NetworkProtectionUI in Frameworks */,
 				37269F052B3332C2005E8E46 /* Common in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4631,6 +4631,7 @@
 				EE7295E72A545BBB008C0991 /* NetworkProtection in Frameworks */,
 				4B4D60982A0B2A5C00BCD287 /* PixelKit in Frameworks */,
 				4B4D60AF2A0C837F00BCD287 /* Networking in Frameworks */,
+				7B25856E2BA2F2ED00D49F79 /* NetworkProtectionUI in Frameworks */,
 				4B4D603F2A0B290200BCD287 /* NetworkExtension.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -8632,8 +8633,8 @@
 			);
 			name = DuckDuckGoNotifications;
 			packageProductDependencies = (
-				EE7295EA2A545BFC008C0991 /* NetworkProtection */,
 				37269F042B3332C2005E8E46 /* Common */,
+				7B624F162BA25C1F00A6C544 /* NetworkProtectionUI */,
 			);
 			productName = DuckDuckGoNotifications;
 			productReference = 4B4BEC202A11B4E2001D9AC5 /* DuckDuckGo Notifications.app */;
@@ -8659,6 +8660,7 @@
 				4B4D60AE2A0C837F00BCD287 /* Networking */,
 				EE7295E62A545BBB008C0991 /* NetworkProtection */,
 				37269EFE2B332FBB005E8E46 /* Common */,
+				7B25856D2BA2F2ED00D49F79 /* NetworkProtectionUI */,
 			);
 			productName = NetworkProtectionAppExtension;
 			productReference = 4B4D603D2A0B290200BCD287 /* NetworkProtectionAppExtension.appex */;
@@ -10770,7 +10772,6 @@
 				4B2D062D2A11C12300DE1F49 /* Logging.swift in Sources */,
 				7B2E52252A5FEC09000C6D39 /* NetworkProtectionAgentNotificationsPresenter.swift in Sources */,
 				B602E8232A1E260E006D261F /* Bundle+NetworkProtectionExtensions.swift in Sources */,
-				EEAD7A7B2A1D3E20002A24E7 /* AppLauncher.swift in Sources */,
 				4B2D062A2A11C0C900DE1F49 /* NetworkProtectionOptionKeyExtension.swift in Sources */,
 				B602E8192A1E2570006D261F /* URL+NetworkProtection.swift in Sources */,
 				4B2D06322A11C1D300DE1F49 /* NSApplicationExtension.swift in Sources */,
@@ -10874,6 +10875,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				4B41EDA02B15437A001EEDF4 /* NetworkProtectionNotificationsPresenterFactory.swift in Sources */,
+				7B25856C2BA2F2D000D49F79 /* AppLauncher.swift in Sources */,
 				4B4D609F2A0B2C7300BCD287 /* Logging.swift in Sources */,
 				7B7DFB202B7E736B009EA1A3 /* MacPacketTunnelProvider.swift in Sources */,
 				4B4D60A12A0B2D6100BCD287 /* NetworkProtectionOptionKeyExtension.swift in Sources */,
@@ -10886,7 +10888,6 @@
 				4BF0E50C2AD2552300FFEC9E /* NetworkProtectionPixelEvent.swift in Sources */,
 				4B4D60AC2A0C804B00BCD287 /* OptionalExtension.swift in Sources */,
 				B65DA5F22A77D3C600CBEE8D /* UserDefaultsWrapper.swift in Sources */,
-				EEAD7A7A2A1D3E20002A24E7 /* AppLauncher.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -13704,7 +13705,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 122.2.0;
+				version = 122.2.1;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
@@ -14130,6 +14131,10 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = NetworkProtectionProxy;
 		};
+		7B25856D2BA2F2ED00D49F79 /* NetworkProtectionUI */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = NetworkProtectionUI;
+		};
 		7B31FD8B2AD125620086AA24 /* NetworkProtectionIPC */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = NetworkProtectionIPC;
@@ -14146,6 +14151,10 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = PixelKit;
 		};
+		7B624F162BA25C1F00A6C544 /* NetworkProtectionUI */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = NetworkProtectionUI;
+		};
 		7B7DFB212B7E7473009EA1A3 /* Networking */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
@@ -14396,11 +14405,6 @@
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
 			productName = NetworkProtection;
 		};
-		EE7295EA2A545BFC008C0991 /* NetworkProtection */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = NetworkProtection;
-		};
 		EE7295EC2A545C0A008C0991 /* NetworkProtection */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 9111ff4055..ff344fde70 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "4e05a46f0a9ce56f6d6379b79a92dc7a0182e027",
-        "version" : "122.2.0"
+        "revision" : "1295a22823157c9b7d11793299cd58b189e87629",
+        "version" : "122.2.1"
       }
     },
     {
@@ -165,7 +165,7 @@
     {
       "identity" : "trackerradarkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/duckduckgo/TrackerRadarKit.git",
+      "location" : "https://github.com/duckduckgo/TrackerRadarKit",
       "state" : {
         "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff",
         "version" : "1.2.2"
diff --git a/DuckDuckGo/Application/URLEventHandler.swift b/DuckDuckGo/Application/URLEventHandler.swift
index 3af3ef418f..d73a1ea414 100644
--- a/DuckDuckGo/Application/URLEventHandler.swift
+++ b/DuckDuckGo/Application/URLEventHandler.swift
@@ -21,7 +21,7 @@ import Foundation
 import AppKit
 
 #if NETWORK_PROTECTION
-import NetworkProtection
+import NetworkProtectionUI
 #endif
 
 #if DBP
diff --git a/DuckDuckGo/Common/Extensions/NSAlertExtension.swift b/DuckDuckGo/Common/Extensions/NSAlertExtension.swift
index 8aa901b548..feafa950f9 100644
--- a/DuckDuckGo/Common/Extensions/NSAlertExtension.swift
+++ b/DuckDuckGo/Common/Extensions/NSAlertExtension.swift
@@ -88,11 +88,11 @@ extension NSAlert {
 
     static func resetNetworkProtectionAlert() -> NSAlert {
         let alert = NSAlert()
-        alert.messageText = "Reset Network Protection?"
+        alert.messageText = "Reset VPN?"
         alert.informativeText = """
         This will remove your stored network configuration (including private key) and disable the VPN.
 
-        You can re-enable the VPN from the Network Protection view.
+        You can re-enable the VPN from the status view.
         """
         alert.alertStyle = .warning
         alert.addButton(withTitle: "Reset")
@@ -108,7 +108,7 @@ extension NSAlert {
         let sysExText = ""
 #endif
         alert.messageText = "Uninstall \(sysExText)Login Items?"
-        alert.informativeText = "This will remove the Network Protection \(sysExText)Status Menu icon and disable the VPN."
+        alert.informativeText = "This will remove the VPN \(sysExText)Status Menu icon and disable the VPN."
         alert.alertStyle = .warning
         alert.addButton(withTitle: "Uninstall")
         alert.addButton(withTitle: UserText.cancel)
diff --git a/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift b/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift
index 8653bba9e2..b77431c7ef 100644
--- a/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift
+++ b/DuckDuckGo/Common/Localizables/UserText+NetworkProtection.swift
@@ -21,37 +21,39 @@ import Foundation
 extension UserText {
 
     // "network.protection.tunnel.name" - The name of the NetP VPN that will be visible in the system to the user
-    static let networkProtectionTunnelName = "DuckDuckGo Network Protection"
-    // "network.protection" - Menu item for opening Network Protection
-    static let networkProtection = "Network Protection"
+    static let networkProtectionTunnelName = "DuckDuckGo VPN"
+    // "network.protection" - Menu item for opening the VPN
+    static let networkProtection = "VPN"
 
     // MARK: - Navigation Bar
     // "network.protection.status.button.tooltip" - The tooltip for NetP's nav bar button
-    static let networkProtectionButtonTooltip = "Network Protection"
+    static let networkProtectionButtonTooltip = "VPN"
 
     // MARK: - Invite Code
-    // "network.protection.invite.dialog.title" - Title for the network protection invite dialog
+    // "network.protection.invite.dialog.title" - Title for the VPN invite dialog
     static let networkProtectionInviteDialogTitle = "Enter your invite code"
-    // "network.protection.invite.dialog.message" - Message for the network protection invite dialog
+    // "network.protection.invite.dialog.message" - Message for the VPN invite dialog
     static let networkProtectionInviteDialogMessage = "Enter your invite code to get started."
-    // "network.protection.invite.field.prompt" - Prompt for the network protection invite code text field
+    // "network.protection.invite.field.prompt" - Prompt for the VPN invite code text field
     static let networkProtectionInviteFieldPrompt = "Code"
-    // "network.protection.invite.success.title" - Title for the network protection invite success view
+    // "network.protection.invite.success.title" - Title for the VPN invite success view
     static let networkProtectionInviteSuccessTitle = "Success! You’re in."
-    // "network.protection.invite.success.title" - Message for the network protection invite success view
+    // "network.protection.invite.success.title" - Message for the VPN invite success view
     static let networkProtectionInviteSuccessMessage = "DuckDuckGo's VPN secures all of your device's Internet traffic anytime, anywhere."
 
     // MARK: - Navigation Bar Status View
-    // "network.protection.navbar.status.view.share.feedback" - Menu item for 'Send VPN Feedback' in the Network Protection status view that's shown in the navigation bar
+    // "network.protection.navbar.status.view.share.feedback" - Menu item for 'Send VPN Feedback' in the VPN status view that's shown in the navigation bar
     static let networkProtectionNavBarStatusViewShareFeedback = "Send VPN Feedback…"
     // "network.protection.status.menu.vpn.settings" - The status menu 'VPN Settings' menu item
     static let networkProtectionNavBarStatusMenuVPNSettings = "VPN Settings…"
+    // "network.protection.status.menu.faq" - The status menu 'FAQ' menu item
+    static let networkProtectionNavBarStatusMenuFAQ = "Frequently Asked Questions…"
 
     // MARK: - System Extension Installation Messages
-    // "network.protection.configuration.system-settings.legacy" - Text for a label in the Network Protection popover, displayed after attempting to enable Network Protection for the first time while using macOS 12 and below
-    private static let networkProtectionSystemSettingsLegacy = "Go to Security & Privacy in System Preferences to allow Network Protection to activate"
-    // "network.protection.configuration.system-settings.modern" - Text for a label in the Network Protection popover, displayed after attempting to enable Network Protection for the first time while using macOS 13 and above
-    private static let networkProtectionSystemSettingsModern = "Go to Privacy & Security in System Settings to allow Network Protection to activate"
+    // "network.protection.configuration.system-settings.legacy" - Text for a label in the VPN popover, displayed after attempting to enable the VPN for the first time while using macOS 12 and below
+    private static let networkProtectionSystemSettingsLegacy = "Go to Security & Privacy in System Preferences to allow DuckDuckGo VPN to activate"
+    // "network.protection.configuration.system-settings.modern" - Text for a label in the VPN popover, displayed after attempting to enable the VPN for the first time while using macOS 13 and above
+    private static let networkProtectionSystemSettingsModern = "Go to Privacy & Security in System Settings to allow DuckDuckGo VPN to activate"
 
     // Dynamically selected based on macOS version, not directly convertible to static string
     static var networkProtectionSystemSettings: String {
@@ -65,161 +67,161 @@ extension UserText {
     // "network.protection.system.extension.unknown.activation.error" - Message shown to users when they try to enable NetP and there is an unexpected activation error.
     static let networkProtectionUnknownActivationError = "There as an unexpected error. Please try again."
     // "network.protection.system.extension.please.reboot" - Message shown to users when they try to enable NetP and they need to reboot the computer to complete the installation
-    static let networkProtectionPleaseReboot = "Please reboot to activate Network Protection"
+    static let networkProtectionPleaseReboot = "Please reboot to activate the VPN"
 }
 
-// MARK: - Network Protection Waitlist
+// MARK: - VPN Waitlist
 
 extension UserText {
 
-    // "network-protection.waitlist.notification.title" - Title for Network Protection waitlist notification
-    static let networkProtectionWaitlistNotificationTitle = "Network Protection beta is ready!"
-    // "network-protection.waitlist.notification.text" - Title for Network Protection waitlist notification
+    // "network-protection.waitlist.notification.title" - Title for VPN waitlist notification
+    static let networkProtectionWaitlistNotificationTitle = "DuckDuckGo VPN beta is ready!"
+    // "network-protection.waitlist.notification.text" - Title for VPN waitlist notification
     static let networkProtectionWaitlistNotificationText = "Open your invite"
 
-    // "network-protection.waitlist.join.title" - Title for Network Protection join waitlist screen
-    static let networkProtectionWaitlistJoinTitle = "Network Protection Beta"
-    // "network-protection.waitlist.join.subtitle.1" - First subtitle for Network Protection join waitlist screen
-    static let networkProtectionWaitlistJoinSubtitle1 = "Secure your connection anytime, anywhere with Network Protection, the VPN from DuckDuckGo."
-    // "network-protection.waitlist.join.subtitle.2" - Second subtitle for Network Protection join waitlist screen
+    // "network-protection.waitlist.join.title" - Title for VPN join waitlist screen
+    static let networkProtectionWaitlistJoinTitle = "DuckDuckGo VPN Beta"
+    // "network-protection.waitlist.join.subtitle.1" - First subtitle for VPN join waitlist screen
+    static let networkProtectionWaitlistJoinSubtitle1 = "Secure your connection anytime, anywhere with DuckDuckGo VPN."
+    // "network-protection.waitlist.join.subtitle.2" - Second subtitle for VPN join waitlist screen
     static let networkProtectionWaitlistJoinSubtitle2 = "Join the waitlist, and we’ll notify you when it’s your turn."
 
-    // "network-protection.waitlist.joined.title" - Title for Network Protection joined waitlist screen
+    // "network-protection.waitlist.joined.title" - Title for VPN joined waitlist screen
     static let networkProtectionWaitlistJoinedTitle = "You’re on the list!"
-    // "network-protection.waitlist.joined.with-notifications.subtitle.1" - Subtitle 1 for Network Protection joined waitlist screen when notifications are enabled
+    // "network-protection.waitlist.joined.with-notifications.subtitle.1" - Subtitle 1 for VPN joined waitlist screen when notifications are enabled
     static let networkProtectionWaitlistJoinedWithNotificationsSubtitle1 = "New invites are sent every few days, on a first come, first served basis."
-    // "network-protection.waitlist.joined.with-notifications.subtitle.2" - Subtitle 2 for Network Protection joined waitlist screen when notifications are enabled
+    // "network-protection.waitlist.joined.with-notifications.subtitle.2" - Subtitle 2 for VPN joined waitlist screen when notifications are enabled
     static let networkProtectionWaitlistJoinedWithNotificationsSubtitle2 = "We’ll notify you when your invite is ready."
-    // "network-protection.waitlist.enable-notifications" - Enable notifications prompt for Network Protection joined waitlist screen
-    static let networkProtectionWaitlistEnableNotifications = "Want to get a notification when your Network Protection invite is ready?"
+    // "network-protection.waitlist.enable-notifications" - Enable notifications prompt for VPN joined waitlist screen
+    static let networkProtectionWaitlistEnableNotifications = "Want to get a notification when your VPN invite is ready?"
 
-    // "network-protection.waitlist.invited.title" - Title for Network Protection invited screen
-    static let networkProtectionWaitlistInvitedTitle = "You’re invited to try\nNetwork Protection beta!"
-    // "network-protection.waitlist.invited.subtitle" - Subtitle for Network Protection invited screen
+    // "network-protection.waitlist.invited.title" - Title for VPN invited screen
+    static let networkProtectionWaitlistInvitedTitle = "You’re invited to try\nDuckDuckGo VPN beta!"
+    // "network-protection.waitlist.invited.subtitle" - Subtitle for VPN invited screen
     static let networkProtectionWaitlistInvitedSubtitle = "Get an extra layer of protection online with the VPN built for speed and simplicity. Encrypt your internet connection across your entire device and hide your location and IP address from sites you visit."
 
-    // "network-protection.waitlist.invited.section-1.title" - Title for section 1 of the Network Protection invited screen
+    // "network-protection.waitlist.invited.section-1.title" - Title for section 1 of the VPN invited screen
     static let networkProtectionWaitlistInvitedSection1Title = "Full-device coverage"
-    // "network-protection.waitlist.invited.section-1.subtitle" - Subtitle for section 1 of the Network Protection invited screen
+    // "network-protection.waitlist.invited.section-1.subtitle" - Subtitle for section 1 of the VPN invited screen
     static let networkProtectionWaitlistInvitedSection1Subtitle = "Encrypt online traffic across your browsers and apps."
 
-    // "network-protection.waitlist.invited.section-2.title" - Title for section 2 of the Network Protection invited screen
+    // "network-protection.waitlist.invited.section-2.title" - Title for section 2 of the VPN invited screen
     static let networkProtectionWaitlistInvitedSection2Title = "Fast, reliable, and easy to use"
-    // "network-protection.waitlist.invited.section-2.subtitle" - Subtitle for section 2 of the Network Protection invited screen
+    // "network-protection.waitlist.invited.section-2.subtitle" - Subtitle for section 2 of the VPN invited screen
     static let networkProtectionWaitlistInvitedSection2Subtitle = "No need for a separate app. Connect in one click and see your connection status at a glance."
 
-    // "network-protection.waitlist.invited.section-3.title" - Title for section 3 of the Network Protection invited screen
+    // "network-protection.waitlist.invited.section-3.title" - Title for section 3 of the VPN invited screen
     static let networkProtectionWaitlistInvitedSection3Title = "Strict no-logging policy"
-    // "network-protection.waitlist.invited.section-3.subtitle" - Subtitle for section 3 of the Network Protection invited screen
+    // "network-protection.waitlist.invited.section-3.subtitle" - Subtitle for section 3 of the VPN invited screen
     static let networkProtectionWaitlistInvitedSection3Subtitle = "We do not log or save any data that can connect you to your online activity."
 
-    // "network-protection.waitlist.enable.title" - Title for Network Protection enable screen
-    static let networkProtectionWaitlistEnableTitle = "Ready to enable Network Protection?"
-    // "network-protection.waitlist.enable.subtitle" - Subtitle for Network Protection enable screen
-    static let networkProtectionWaitlistEnableSubtitle = "Look for the globe icon in the browser toolbar or in the Mac menu bar.\n\nYou'll be asked to Allow a VPN connection once when setting up Network Protection the first time."
+    // "network-protection.waitlist.enable.title" - Title for VPN enable screen
+    static let networkProtectionWaitlistEnableTitle = "Ready to enable DuckDuckGo VPN?"
+    // "network-protection.waitlist.enable.subtitle" - Subtitle for VPN enable screen
+    static let networkProtectionWaitlistEnableSubtitle = "Look for the globe icon in the browser toolbar or in the Mac menu bar.\n\nYou'll be asked to Allow a VPN connection once when setting up DuckDuckGo VPN the first time."
 
-    // "network-protection.waitlist.availability-disclaimer" - Availability disclaimer for Network Protection join waitlist screen
-    static let networkProtectionWaitlistAvailabilityDisclaimer = "Network Protection is free to use during the beta."
+    // "network-protection.waitlist.availability-disclaimer" - Availability disclaimer for VPN join waitlist screen
+    static let networkProtectionWaitlistAvailabilityDisclaimer = "DuckDuckGo VPN is free to use during the beta."
 
-    // "network-protection.waitlist.button.close" - Close button for Network Protection join waitlist screen
+    // "network-protection.waitlist.button.close" - Close button for VPN join waitlist screen
     static let networkProtectionWaitlistButtonClose = "Close"
-    // "network-protection.waitlist.button.done" - Close button for Network Protection joined waitlist screen
+    // "network-protection.waitlist.button.done" - Close button for VPN joined waitlist screen
     static let networkProtectionWaitlistButtonDone = "Done"
-    // "network-protection.waitlist.button.dismiss" - Dismiss button for Network Protection join waitlist screen
+    // "network-protection.waitlist.button.dismiss" - Dismiss button for VPN join waitlist screen
     static let networkProtectionWaitlistButtonDismiss = "Dismiss"
-    // "network-protection.waitlist.button.cancel" - Cancel button for Network Protection join waitlist screen
+    // "network-protection.waitlist.button.cancel" - Cancel button for VPN join waitlist screen
     static let networkProtectionWaitlistButtonCancel = "Cancel"
-    // "network-protection.waitlist.button.no-thanks" - No Thanks button for Network Protection joined waitlist screen
+    // "network-protection.waitlist.button.no-thanks" - No Thanks button for VPN joined waitlist screen
     static let networkProtectionWaitlistButtonNoThanks = "No Thanks"
-    // "network-protection.waitlist.button.get-started" - Get Started button for Network Protection joined waitlist screen
+    // "network-protection.waitlist.button.get-started" - Get Started button for VPN joined waitlist screen
     static let networkProtectionWaitlistButtonGetStarted = "Get Started"
-    // "network-protection.waitlist.button.got-it" - Got It button for Network Protection joined waitlist screen
+    // "network-protection.waitlist.button.got-it" - Got It button for VPN joined waitlist screen
     static let networkProtectionWaitlistButtonGotIt = "Got It"
-    // "network-protection.waitlist.button.enable-notifications" - Enable Notifications button for Network Protection joined waitlist screen
+    // "network-protection.waitlist.button.enable-notifications" - Enable Notifications button for VPN joined waitlist screen
     static let networkProtectionWaitlistButtonEnableNotifications = "Enable Notifications"
-    // "network-protection.waitlist.button.join-waitlist" - Join Waitlist button for Network Protection join waitlist screen
+    // "network-protection.waitlist.button.join-waitlist" - Join Waitlist button for VPN join waitlist screen
     static let networkProtectionWaitlistButtonJoinWaitlist = "Join the Waitlist"
-    // "network-protection.waitlist.button.agree-and-continue" - Agree and Continue button for Network Protection join waitlist screen
+    // "network-protection.waitlist.button.agree-and-continue" - Agree and Continue button for VPN join waitlist screen
     static let networkProtectionWaitlistButtonAgreeAndContinue = "Agree and Continue"
 }
 
-// MARK: - Network Protection Terms of Service
+// MARK: - VPN Terms of Service
 
 extension UserText {
 
-    // "network-protection.privacy-policy.title" - Privacy Policy title for Network Protection
+    // "network-protection.privacy-policy.title" - Privacy Policy title for VPN
     static let networkProtectionPrivacyPolicyTitle = "Privacy Policy"
 
-    // "network-protection.privacy-policy.section.1.title" - Privacy Policy title for Network Protection
+    // "network-protection.privacy-policy.section.1.title" - Privacy Policy title for VPN
     static let networkProtectionPrivacyPolicySection1Title = "We don’t ask for any personal information from you in order to use this beta service."
-    // "network-protection.privacy-policy.section.1.list" - Privacy Policy list for Network Protection (Markdown version)
+    // "network-protection.privacy-policy.section.1.list" - Privacy Policy list for VPN (Markdown version)
     static let networkProtectionPrivacyPolicySection1ListMarkdown = "This Privacy Policy is for our limited waitlist beta VPN product.\n\nOur main [Privacy Policy](https://duckduckgo.com/privacy) also applies here."
-    // "network-protection.privacy-policy.section.1.list" - Privacy Policy list for Network Protection (Non-Markdown version)
+    // "network-protection.privacy-policy.section.1.list" - Privacy Policy list for VPN (Non-Markdown version)
     static let networkProtectionPrivacyPolicySection1ListNonMarkdown = "This Privacy Policy is for our limited waitlist beta VPN product.\n\nOur main Privacy Policy also applies here."
 
-    // "network-protection.privacy-policy.section.2.title" - Privacy Policy title for Network Protection
+    // "network-protection.privacy-policy.section.2.title" - Privacy Policy title for VPN
     static let networkProtectionPrivacyPolicySection2Title = "We don’t keep any logs of your online activity."
-    // "network-protection.privacy-policy.section.2.list" - Privacy Policy list for Network Protection
+    // "network-protection.privacy-policy.section.2.list" - Privacy Policy list for VPN
     static let networkProtectionPrivacyPolicySection2List = "That means we have no way to tie what you do online to you as an individual and we don’t have any record of things like:\n    • Website visits\n    • DNS requests\n    • Connections made\n    • IP addresses used\n    • Session lengths"
 
-    // "network-protection.privacy-policy.section.3.title" - Privacy Policy title for Network Protection
+    // "network-protection.privacy-policy.section.3.title" - Privacy Policy title for VPN
     static let networkProtectionPrivacyPolicySection3Title = "We only keep anonymous performance metrics that we cannot connect to your online activity."
-    // "network-protection.privacy-policy.section.3.list" - Privacy Policy list for Network Protection
+    // "network-protection.privacy-policy.section.3.list" - Privacy Policy list for VPN
     static let networkProtectionPrivacyPolicySection3List = "Our servers store generic usage (for example, CPU load) and diagnostic data (for example, errors), but none of that data is connected to any individual’s activity.\n\nWe use this non-identifying information to monitor and ensure the performance and quality of the service, for example to make sure servers aren’t overloaded."
 
-    // "network-protection.privacy-policy.section.4.title" - Privacy Policy title for Network Protection
+    // "network-protection.privacy-policy.section.4.title" - Privacy Policy title for VPN
     static let networkProtectionPrivacyPolicySection4Title = "We use dedicated servers for all VPN traffic."
-    // "network-protection.privacy-policy.section.4.list" - Privacy Policy list for Network Protection
+    // "network-protection.privacy-policy.section.4.list" - Privacy Policy list for VPN
     static let networkProtectionPrivacyPolicySection4List = "Dedicated servers means they are not shared with anyone else.\n\nWe rent our servers from providers we carefully selected because they meet our privacy requirements.\n\nWe have strict access controls in place so that only limited DuckDuckGo team members have access to our servers."
 
-    // "network-protection.privacy-policy.section.5.title" - Privacy Policy title for Network Protection
+    // "network-protection.privacy-policy.section.5.title" - Privacy Policy title for VPN
     static let networkProtectionPrivacyPolicySection5Title = "We protect and limit use of your data when you communicate directly with DuckDuckGo."
-    // "network-protection.privacy-policy.section.5.list" - Privacy Policy list for Network Protection
+    // "network-protection.privacy-policy.section.5.list" - Privacy Policy list for VPN
     static let networkProtectionPrivacyPolicySection5List = "If you reach out to us for support by submitting a bug report or through email and agree to be contacted to troubleshoot the issue, we’ll contact you using the information you provide.\n\nIf you participate in a voluntary product survey or questionnaire and agree to provide further feedback, we may contact you using the information you provide.\n\nWe will permanently delete all personal information you provided to us (email, contact information), within 30 days after closing a support case or, in the case of follow up feedback, within 60 days after ending this beta service."
 
-    // "network-protection.terms-of-service.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceTitle = "Terms of Service"
 
-    // "network-protection.terms-of-service.section.1.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.section.1.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceSection1Title = "The service is for limited and personal use only."
-    // "network-protection.terms-of-service.section.1.list" - Terms of Service list for Network Protection
+    // "network-protection.terms-of-service.section.1.list" - Terms of Service list for VPN
     static let networkProtectionTermsOfServiceSection1List = "This service is provided for your personal use only.\n\nYou are responsible for all activity in the service that occurs on or through your device.\n\nThis service may only be used through the DuckDuckGo app on the device on which you are given access. If you delete the DuckDuckGo app, you will lose access to the service.\n\nYou may not use this service through a third-party client."
 
-    // "network-protection.terms-of-service.section.2.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.section.2.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceSection2Title = "You agree to comply with all applicable laws, rules, and regulations."
-    // "network-protection.terms-of-service.section.2.list" - Terms of Service list for Network Protection (Markdown version)
+    // "network-protection.terms-of-service.section.2.list" - Terms of Service list for VPN (Markdown version)
     static let networkProtectionTermsOfServiceSection2ListMarkdown = "You agree that you will not use the service for any unlawful, illicit, criminal, or fraudulent purpose, or in any manner that could give rise to civil or criminal liability under applicable law.\n\nYou agree to comply with our [DuckDuckGo Terms of Service](https://duckduckgo.com/terms), which are incorporated by reference."
-    // "network-protection.terms-of-service.section.2.list" - Terms of Service list for Network Protection (Non-Markdown version)
+    // "network-protection.terms-of-service.section.2.list" - Terms of Service list for VPN (Non-Markdown version)
     static let networkProtectionTermsOfServiceSection2ListNonMarkdown = "You agree that you will not use the service for any unlawful, illicit, criminal, or fraudulent purpose, or in any manner that could give rise to civil or criminal liability under applicable law.\n\nYou agree to comply with our DuckDuckGo Terms of Service, which are incorporated by reference."
 
-    // "network-protection.terms-of-service.section.3.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.section.3.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceSection3Title = "You must be eligible to use this service."
-    // "network-protection.terms-of-service.section.3.list" - Terms of Service list for Network Protection
+    // "network-protection.terms-of-service.section.3.list" - Terms of Service list for VPN
     static let networkProtectionTermsOfServiceSection3List = "Access to this beta is randomly awarded. You are responsible for ensuring eligibility.\n\nYou must be at least 18 years old and live in a location where use of a VPN is legal in order to be eligible to use this service."
 
-    // "network-protection.terms-of-service.section.4.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.section.4.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceSection4Title = "We provide this beta service as-is and without warranty."
-    // "network-protection.terms-of-service.section.4.list" - Terms of Service list for Network Protection
+    // "network-protection.terms-of-service.section.4.list" - Terms of Service list for VPN
     static let networkProtectionTermsOfServiceSection4List = "This service is provided as-is and without warranties or guarantees of any kind.\n\nTo the extent possible under applicable law, DuckDuckGo will not be liable for any damage or loss arising from your use of the service. In any event, the total aggregate liability of DuckDuckGo shall not exceed $25 or the equivalent in your local currency.\n\nWe may in the future transfer responsibility for the service to a subsidiary of DuckDuckGo. If that happens, you agree that references to “DuckDuckGo” will refer to our subsidiary, which will then become responsible for providing the service and for any liabilities relating to it."
 
-    // "network-protection.terms-of-service.section.5.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.section.5.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceSection5Title = "We may terminate access at any time."
-    // "network-protection.terms-of-service.section.5.list" - Terms of Service list for Network Protection
+    // "network-protection.terms-of-service.section.5.list" - Terms of Service list for VPN
     static let networkProtectionTermsOfServiceSection5List = "We reserve the right to revoke access to the service at any time in our sole discretion.\n\nWe may also terminate access for violation of these terms, including for repeated infringement of the intellectual property rights of others."
 
-    // "network-protection.terms-of-service.section.6.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.section.6.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceSection6Title = "The service is free during the beta period."
-    // "network-protection.terms-of-service.section.6.list" - Terms of Service list for Network Protection
+    // "network-protection.terms-of-service.section.6.list" - Terms of Service list for VPN
     static let networkProtectionTermsOfServiceSection6List = "Access to this service is currently free of charge, but that is limited to this beta period.\n\nYou understand and agree that this service is provided on a temporary, testing basis only."
 
-    // "network-protection.terms-of-service.section.7.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.section.7.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceSection7Title = "We are continually updating the service."
-    // "network-protection.terms-of-service.section.7.list" - Terms of Service list for Network Protection
+    // "network-protection.terms-of-service.section.7.list" - Terms of Service list for VPN
     static let networkProtectionTermsOfServiceSection7List = "The service is in beta, and we are regularly changing it.\n\nService coverage, speed, server locations, and quality may vary without warning."
 
-    // "network-protection.terms-of-service.section.8.title" - Terms of Service title for Network Protection
+    // "network-protection.terms-of-service.section.8.title" - Terms of Service title for VPN
     static let networkProtectionTermsOfServiceSection8Title = "We need your feedback."
-    // "network-protection.terms-of-service.section.8.list" - Terms of Service list for Network Protection
+    // "network-protection.terms-of-service.section.8.list" - Terms of Service list for VPN
     static let networkProtectionTermsOfServiceSection8List = "You may be asked during the beta period to provide feedback about your experience. Doing so is optional and your feedback may be used to improve the service.\n\nIf you have enabled notifications for the DuckDuckGo app, we may use notifications to ask about your experience. You can disable notifications if you do not want to receive them."
 
     // MARK: - Feedback Form
diff --git a/DuckDuckGo/Common/Logging/Logging.swift b/DuckDuckGo/Common/Logging/Logging.swift
index e6c9d18b36..70b37f76b7 100644
--- a/DuckDuckGo/Common/Logging/Logging.swift
+++ b/DuckDuckGo/Common/Logging/Logging.swift
@@ -41,7 +41,7 @@ extension OSLog {
         case duckPlayer = "Duck Player"
         case tabSnapshots = "Tab Snapshots"
         case sync = "Sync"
-        case networkProtection = "Network Protection"
+        case networkProtection = "VPN"
         case dbp = "dbp"
     }
 
diff --git a/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift b/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift
index 272d63cca0..2539f79a8e 100644
--- a/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift
+++ b/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift
@@ -146,13 +146,13 @@ public struct UserDefaultsWrapper<T> {
         case dataBrokerProtectionTermsAndConditionsAccepted = "data-broker-protection.waitlist-terms-and-conditions.accepted"
         case shouldShowDBPWaitlistInvitedCardUI = "shouldShowDBPWaitlistInvitedCardUI"
 
-        // Network Protection
+        // VPN
 
         case networkProtectionExcludedRoutes = "netp.excluded-routes"
         case networkProtectionTermsAndConditionsAccepted = "network-protection.waitlist-terms-and-conditions.accepted"
         case networkProtectionWaitlistSignUpPromptDismissed = "network-protection.waitlist.sign-up-prompt-dismissed"
 
-        // Network Protection: Shared Defaults
+        // VPN: Shared Defaults
         // ---
         // Please note that shared defaults MUST have a name that matches exactly their value,
         // or else KVO will just not work as of 2023-08-07
diff --git a/DuckDuckGo/Info.plist b/DuckDuckGo/Info.plist
index 8c7dca0e52..bdb809d70e 100644
--- a/DuckDuckGo/Info.plist
+++ b/DuckDuckGo/Info.plist
@@ -60,7 +60,7 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 			<key>CFBundleURLName</key>
-			<string>Network Protection URLs</string>
+			<string>VPN URLs</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>networkprotection</string>
diff --git a/DuckDuckGo/LoginItems/LoginItemsManager.swift b/DuckDuckGo/LoginItems/LoginItemsManager.swift
index d8ab2356db..8fef5f953b 100644
--- a/DuckDuckGo/LoginItems/LoginItemsManager.swift
+++ b/DuckDuckGo/LoginItems/LoginItemsManager.swift
@@ -20,8 +20,8 @@ import Common
 import Foundation
 import LoginItems
 
-/// Class to manage the login items for Network Protection and DBP
-/// 
+/// Class to manage the login items for the VPN and DBP
+///
 final class LoginItemsManager {
     private enum Action: String {
         case enable
diff --git a/DuckDuckGo/Menus/MainMenu.swift b/DuckDuckGo/Menus/MainMenu.swift
index da7c0d9984..dac124ab05 100644
--- a/DuckDuckGo/Menus/MainMenu.swift
+++ b/DuckDuckGo/Menus/MainMenu.swift
@@ -609,7 +609,7 @@ import SubscriptionUI
 #endif
 
 #if NETWORK_PROTECTION
-            NSMenuItem(title: "Network Protection")
+            NSMenuItem(title: "VPN")
                 .submenu(NetworkProtectionDebugMenu())
 #endif
 
diff --git a/DuckDuckGo/NavigationBar/PinningManager.swift b/DuckDuckGo/NavigationBar/PinningManager.swift
index 64d29c104e..8a3e939e7e 100644
--- a/DuckDuckGo/NavigationBar/PinningManager.swift
+++ b/DuckDuckGo/NavigationBar/PinningManager.swift
@@ -133,7 +133,7 @@ final class LocalPinningManager: PinningManager {
     /// This method is useful for knowing if the view was manually toggled.
     /// It's particularly useful for initializing a pin to a certain value at a certain point during the execution of code,
     /// only if the user hasn't explicitly specified a desired state.
-    /// As an example: this is used in Network Protection for pinning the icon to the navigation bar the first time the
+    /// As an example: this is used in the VPN for pinning the icon to the navigation bar the first time the
     /// feature is enabled.
     ///
     func wasManuallyToggled(_ view: PinnableView) -> Bool {
diff --git a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
index 5dd8a9afdd..24ecc77e86 100644
--- a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
+++ b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
@@ -344,7 +344,7 @@ final class MoreOptionsMenu: NSMenu {
 
             let networkProtectionItem: NSMenuItem
 
-            // If the user can see the Network Protection option but they haven't joined the waitlist or don't have an auth token, show the "New"
+            // If the user can see the VPN option but they haven't joined the waitlist or don't have an auth token, show the "New"
             // badge to bring it to their attention.
             if !isWaitlistUser && !hasAuthToken {
                 networkProtectionItem = makeNetworkProtectionItem(showNewLabel: true)
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard b/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
index fe6b3f27ca..357dbe0d25 100644
--- a/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
+++ b/DuckDuckGo/NavigationBar/View/NavigationBar.storyboard
@@ -252,7 +252,7 @@
                                             <action selector="bookmarksButtonAction:" target="o2v-eH-jTI" id="feR-3s-kbn"/>
                                         </connections>
                                     </button>
-                                    <button hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iKf-yR-au9" userLabel="Network Protection Button" customClass="MouseOverButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
+                                    <button hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iKf-yR-au9" userLabel="VPN Button" customClass="MouseOverButton" customModule="DuckDuckGo_Privacy_Browser" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="0.0" width="28" height="28"/>
                                         <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="sRc-lQ-ndi">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift b/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift
index 0d0f567b5c..593fb76fbf 100644
--- a/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift
+++ b/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift
@@ -279,7 +279,7 @@ final class NavigationBarPopovers {
         popover.show(positionedBelow: view.bounds.insetFromLineOfDeath(flipped: view.isFlipped), in: view)
     }
 
-    // MARK: - Network Protection
+    // MARK: - VPN
 
 #if NETWORK_PROTECTION
     func showNetworkProtectionPopover(
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
index 5af04c4065..b45ee536a9 100644
--- a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
+++ b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
@@ -449,7 +449,7 @@ final class NavigationBarViewController: NSViewController {
         guard view.window?.isKeyWindow == true else { return }
 
         DispatchQueue.main.async {
-            let viewController = PopoverMessageViewController(message: "Network Protection was uninstalled")
+            let viewController = PopoverMessageViewController(message: "DuckDuckGo VPN was uninstalled")
             viewController.show(onParent: self, relativeTo: self.optionsButton)
         }
     }
@@ -968,7 +968,7 @@ extension NavigationBarViewController: NSMenuDelegate {
 #endif
     }
 
-    // MARK: - Network Protection
+    // MARK: - VPN
 
 #if NETWORK_PROTECTION
     func showNetworkProtectionStatus() {
@@ -982,7 +982,7 @@ extension NavigationBarViewController: NSMenuDelegate {
         }
     }
 
-    /// Sets up the Network Protection button.
+    /// Sets up the VPN button.
     ///
     /// This method should be run just once during the lifecycle of this view.
     /// .
@@ -1065,7 +1065,7 @@ extension NavigationBarViewController: OptionsButtonMenuDelegate {
 #if NETWORK_PROTECTION
         toggleNetworkProtectionPopover()
 #else
-        fatalError("Tried to open Network Protection when it was disabled")
+        fatalError("Tried to open the VPN when it was disabled")
 #endif
     }
 
diff --git a/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/AppLauncher.swift b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/AppLauncher.swift
index 370813fb40..0ec2416135 100644
--- a/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/AppLauncher.swift
+++ b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/AppLauncher.swift
@@ -21,7 +21,7 @@
 import AppKit
 import Foundation
 import Common
-import NetworkProtection
+import NetworkProtectionUI
 
 extension AppLaunchCommand {
     var rawValue: String {
@@ -30,6 +30,7 @@ extension AppLaunchCommand {
         case .stopVPN: return "stopVPN"
         case .justOpen: return "justOpen"
         case .shareFeedback: return "shareFeedback"
+        case .showFAQ: return "showFAQ"
         case .showStatus: return "showStatus"
         case .showSettings: return "showSettings"
         case .showVPNLocations: return "showVPNLocations"
@@ -86,6 +87,8 @@ extension AppLaunchCommand {
             return "networkprotection://just-open"
         case .shareFeedback:
             return "networkprotection://share-feedback"
+        case .showFAQ:
+            return "https://duckduckgo.com/duckduckgo-help-pages/privacy-pro/vpn/"
         case .showStatus:
             return "networkprotection://show-status"
         case .showSettings:
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionAppEvents.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionAppEvents.swift
index 3e02fb49ed..ce62ed2734 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionAppEvents.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionAppEvents.swift
@@ -25,7 +25,7 @@ import NetworkProtectionUI
 import NetworkProtectionIPC
 import NetworkExtension
 
-/// Implements the sequence of steps that Network Protection needs to execute when the App starts up.
+/// Implements the sequence of steps that the VPN needs to execute when the App starts up.
 ///
 final class NetworkProtectionAppEvents {
 
@@ -94,7 +94,7 @@ final class NetworkProtectionAppEvents {
         loginItemsManager.restartLoginItems(LoginItemsManager.networkProtectionLoginItems, log: .networkProtection)
     }
 
-    /// Fetches a new list of Network Protection servers, and updates the existing set.
+    /// Fetches a new list of VPN servers, and updates the existing set.
     ///
     private func refreshNetworkProtectionServers() {
         Task {
@@ -102,11 +102,11 @@ final class NetworkProtectionAppEvents {
             do {
                 serverCount = try await NetworkProtectionDeviceManager.create().refreshServerList().count
             } catch {
-                os_log("Failed to update Network Protection servers", log: .networkProtection, type: .error)
+                os_log("Failed to update DuckDuckGo VPN servers", log: .networkProtection, type: .error)
                 return
             }
 
-            os_log("Successfully updated Network Protection servers; total server count = %{public}d", log: .networkProtection, serverCount)
+            os_log("Successfully updated DuckDuckGo VPN servers; total server count = %{public}d", log: .networkProtection, serverCount)
         }
     }
 }
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugMenu.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugMenu.swift
index f54236f387..5d1cdf472c 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugMenu.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugMenu.swift
@@ -25,7 +25,7 @@ import NetworkProtection
 import NetworkProtectionProxy
 import SwiftUI
 
-/// Controller for the Network Protection debug menu.
+/// Controller for the VPN debug menu.
 ///
 @MainActor
 final class NetworkProtectionDebugMenu: NSMenu {
@@ -70,7 +70,7 @@ final class NetworkProtectionDebugMenu: NSMenu {
         registrationKeyValidityMenu = NSMenu { [registrationKeyValidityAutomaticItem] in
             registrationKeyValidityAutomaticItem
         }
-        super.init(title: "Network Protection")
+        super.init(title: "VPN")
 
         buildItems {
             NSMenuItem(title: "Reset") {
@@ -227,7 +227,7 @@ final class NetworkProtectionDebugMenu: NSMenu {
         settings.resetToDefaults()
     }
 
-    /// Removes the system extension and agents for Network Protection.
+    /// Removes the system extension and agents for DuckDuckGo VPN.
     ///
     @objc func removeSystemExtensionAndAgents(_ sender: Any?) {
         Task { @MainActor in
@@ -588,7 +588,7 @@ final class NetworkProtectionDebugMenu: NSMenu {
         alert.addButton(withTitle: "Use Invite Code")
         alert.addButton(withTitle: "Cancel")
         alert.messageText = "Enter Invite Code"
-        alert.informativeText = "Please grab a Network Protection invite code from Asana and enter it here."
+        alert.informativeText = "Please grab a VPN invite code from Asana and enter it here."
 
         let textField = NSTextField(frame: NSRect(x: 0, y: 0, width: 200, height: 24))
         alert.accessoryView = textField
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugUtilities.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugUtilities.swift
index 6a07a4d330..8c89f9dc6a 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugUtilities.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionDebugUtilities.swift
@@ -27,7 +27,7 @@ import SystemExtensions
 import LoginItems
 import NetworkProtectionIPC
 
-/// Utility code to help implement our debug menu options for Network Protection.
+/// Utility code to help implement our debug menu options for the VPN.
 ///
 final class NetworkProtectionDebugUtilities {
 
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
index 8812470f5e..32c25df9b5 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
@@ -239,7 +239,7 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
         pinningManager.togglePinning(for: .networkProtection)
     }
 
-    /// We want to pin Network Protection to the navigation bar the first time it's enabled, and only
+    /// We want to pin the VPN to the navigation bar the first time it's enabled, and only
     /// if the user hasn't toggled it manually before.
     /// 
     private func pinNetworkProtectionToNavBarIfNeverPinnedBefore() {
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift
index 37d8daa09e..1d5a18c48c 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift
@@ -47,6 +47,7 @@ final class NetworkProtectionNavBarPopoverManager {
         popover.show(positionedBelow: view.bounds.insetFromLineOfDeath(flipped: view.isFlipped), in: view)
     }
 
+    // swiftlint:disable:next function_body_length
     func show(positionedBelow view: NSView, withDelegate delegate: NSPopoverDelegate) {
 
         let popover = networkProtectionPopover ?? {
@@ -76,6 +77,10 @@ final class NetworkProtectionNavBarPopoverManager {
                             name: UserText.networkProtectionNavBarStatusMenuVPNSettings, action: {
                                 await appLauncher.launchApp(withCommand: .showSettings)
                             }),
+                        NetworkProtectionStatusView.Model.MenuItem(
+                            name: UserText.networkProtectionNavBarStatusMenuFAQ, action: {
+                                await appLauncher.launchApp(withCommand: .showFAQ)
+                            }),
                         NetworkProtectionStatusView.Model.MenuItem(
                             name: UserText.networkProtectionNavBarStatusViewShareFeedback,
                             action: {
@@ -84,6 +89,10 @@ final class NetworkProtectionNavBarPopoverManager {
                     ]
                 } else {
                     return [
+                        NetworkProtectionStatusView.Model.MenuItem(
+                            name: UserText.networkProtectionNavBarStatusMenuFAQ, action: {
+                                await appLauncher.launchApp(withCommand: .showFAQ)
+                            }),
                         NetworkProtectionStatusView.Model.MenuItem(
                             name: UserText.networkProtectionNavBarStatusViewShareFeedback,
                             action: {
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionOnboardingMenu.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionOnboardingMenu.swift
index d3668a838e..d9ca618427 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionOnboardingMenu.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionOnboardingMenu.swift
@@ -24,7 +24,7 @@ import NetworkProtection
 import NetworkProtectionUI
 import SwiftUI
 
-/// Implements the logic for Network Protection's onboarding menu.
+/// Implements the logic for the VPN's onboarding menu.
 ///
 @MainActor
 final class NetworkProtectionOnboardingMenu: NSMenu {
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionSimulateFailureMenu.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionSimulateFailureMenu.swift
index 4d31485c67..fa62d0ae6a 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionSimulateFailureMenu.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionSimulateFailureMenu.swift
@@ -23,7 +23,7 @@ import Foundation
 import NetworkProtection
 import SwiftUI
 
-/// Implements the logic for Network Protection's simulate failures menu.
+/// Implements the logic for the VPN's simulate failures menu.
 ///
 @MainActor
 final class NetworkProtectionSimulateFailureMenu: NSMenu {
@@ -56,20 +56,20 @@ final class NetworkProtectionSimulateFailureMenu: NSMenu {
         NetworkProtectionSimulationOptions()
     }
 
-    /// Simulates a controller failure the next time Network Protection is started.
+    /// Simulates a controller failure the next time the VPN is started.
     ///
     @objc func simulateControllerFailure(_ menuItem: NSMenuItem) {
         simulationOptions.setEnabled(menuItem.state == .off, option: .controllerFailure)
     }
 
-    /// Simulates a tunnel failure the next time Network Protection is started.
+    /// Simulates a tunnel failure the next time the VPN is started.
     ///
     @objc func simulateTunnelFailure(_ menuItem: NSMenuItem) {
         // Temporarily disabled: https://app.asana.com/0/0/1205766100762904/f
         // simulateFailure(NetworkProtectionTunnelController().toggleShouldSimulateTunnelFailure)
     }
 
-    /// Simulates a fatal error on the tunnel the next time Network Protection is started.
+    /// Simulates a fatal error on the tunnel the next time the VPN is started.
     ///
     @objc func simulateTunnelCrash(_ menuItem: NSMenuItem) {
         // Temporarily disabled: https://app.asana.com/0/0/1205766100762904/f
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift
index 6915d6cfba..0ea6d48740 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift
@@ -379,7 +379,7 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
 
     // MARK: - Connection Status Querying
 
-    /// Queries Network Protection to know if its VPN is connected.
+    /// Queries the VPN to know if it's connected.
     ///
     /// - Returns: `true` if the VPN is connected, connecting or reasserting, and `false` otherwise.
     ///
@@ -470,7 +470,7 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
         }
     }
 
-    /// Starts the VPN connection used for Network Protection
+    /// Starts the VPN connection
     ///
     func start() async {
         PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionControllerStartAttempt,
@@ -575,7 +575,7 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
             }
     }
 
-    /// Stops the VPN connection used for Network Protection
+    /// Stops the VPN connection
     ///
     @MainActor
     func stop() async {
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift
index 4893d694fb..dd0783b9c9 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift
@@ -24,7 +24,7 @@ import NetworkProtection
 import NetworkProtectionUI
 import SwiftUI
 
-/// Implements the logic for Network Protection's simulate failures menu.
+/// Implements the logic for the VPN's simulate failures menu.
 ///
 @MainActor
 final class NetworkProtectionWaitlistFeatureFlagOverridesMenu: NSMenu {
@@ -148,9 +148,9 @@ final class NetworkProtectionWaitlistFeatureFlagOverridesMenu: NSMenu {
         let alert = NSAlert()
         alert.messageText = "Override to OFF value?"
         alert.informativeText = """
-        This will potentially disable Network Protection and erase your invitation.
+        This will potentially disable DuckDuckGo VPN and erase your invitation.
 
-        You can re-enable Network Protection after reverting this change.
+        You can re-enable DuckDuckGo VPN after reverting this change.
 
         Please click 'Cancel' if you're unsure.
         """
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
index a7ac07106b..bfe8f7ce36 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
@@ -48,7 +48,7 @@ final class NetworkProtectionIPCTunnelController: TunnelController {
         ipcClient.stop()
     }
 
-    /// Queries Network Protection to know if its VPN is connected.
+    /// Queries VPN to know if it's connected.
     ///
     /// - Returns: `true` if the VPN is connected, connecting or reasserting, and `false` otherwise.
     ///
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionRemoteMessaging/NetworkProtectionRemoteMessaging.swift b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionRemoteMessaging/NetworkProtectionRemoteMessaging.swift
index 781a2ebebc..2a4a2d3f36 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionRemoteMessaging/NetworkProtectionRemoteMessaging.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionRemoteMessaging/NetworkProtectionRemoteMessaging.swift
@@ -107,13 +107,13 @@ final class DefaultNetworkProtectionRemoteMessaging: NetworkProtectionRemoteMess
 
     }
 
-    /// Uses the "days since Network Protection activated" count combined with the set of dismissed messages to determine which messages should be displayed to the user.
+    /// Uses the "days since VPN activated" count combined with the set of dismissed messages to determine which messages should be displayed to the user.
     func presentableRemoteMessages() -> [NetworkProtectionRemoteMessage] {
         let dismissedMessageIDs = messageStorage.dismissedMessageIDs()
         let possibleMessages: [NetworkProtectionRemoteMessage] = messageStorage.storedMessages()
 
-        // Only show messages that haven't been dismissed, and check whether they have a requirement on how long the user
-        // has used Network Protection for.
+        // Only show messages that haven't been dismissed, and check whether they have a
+        // requirement on how long the user has used the VPN for.
         let filteredMessages = possibleMessages.filter { message in
 
             // Don't show messages that have already been dismissed. If you need to show the same message to a user again,
diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/AppExtensionAndNotificationTargets/NetworkProtectionUNNotificationsPresenter.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/AppExtensionAndNotificationTargets/NetworkProtectionUNNotificationsPresenter.swift
index a08386e9c3..eefd12cff5 100644
--- a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/AppExtensionAndNotificationTargets/NetworkProtectionUNNotificationsPresenter.swift
+++ b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/AppExtensionAndNotificationTargets/NetworkProtectionUNNotificationsPresenter.swift
@@ -19,6 +19,7 @@
 import Foundation
 import UserNotifications
 import NetworkProtection
+import NetworkProtectionUI
 
 extension UNNotificationAction {
 
diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionAndNotificationTargets/UserText+NetworkProtectionExtensions.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionAndNotificationTargets/UserText+NetworkProtectionExtensions.swift
index 219b048584..607fb081be 100644
--- a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionAndNotificationTargets/UserText+NetworkProtectionExtensions.swift
+++ b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionAndNotificationTargets/UserText+NetworkProtectionExtensions.swift
@@ -20,27 +20,27 @@ import Foundation
 
 final class UserText {
 
-    // MARK: - Network Protection Notifications
+    // MARK: - VPN Notifications
 
-    static let networkProtectionConnectionSuccessNotificationTitle = NSLocalizedString("network.protection.success.notification.title", value: "Network Protection is On", comment: "The title of the notification shown when Network Protection connects successfully")
-    static let networkProtectionConnectionSuccessNotificationSubtitle = NSLocalizedString("network.protection.success.notification.subtitle", value: "Your location and online activity are protected.", comment: "The subtitle of the notification shown when Network Protection reconnects successfully")
+    static let networkProtectionConnectionSuccessNotificationTitle = NSLocalizedString("network.protection.success.notification.title", value: "DuckDuckGo VPN is ON", comment: "The title of the notification shown when DuckDuckGo VPN connects successfully")
+    static let networkProtectionConnectionSuccessNotificationSubtitle = NSLocalizedString("network.protection.success.notification.subtitle", value: "Your location and online activity are protected.", comment: "The subtitle of the notification shown when the VPN reconnects successfully")
     static func networkProtectionConnectionSuccessNotificationSubtitle(serverLocation: String) -> String {
         let localized = NSLocalizedString(
             "network.protection.success.notification.subtitle.including.serverLocation",
             value: "Routing device traffic through %@.",
-            comment: "The body of the notification shown when Network Protection connects successfully with the city + state/country as formatted parameter"
+            comment: "The body of the notification shown when DuckDuckGo VPN connects successfully with the city + state/country as formatted parameter"
         )
         return String(format: localized, serverLocation)
     }
 
-    static let networkProtectionConnectionInterruptedNotificationTitle = NSLocalizedString("network.protection.interrupted.notification.title", value: "Network Protection was interrupted", comment: "The title of the notification shown when Network Protection's connection is interrupted")
-    static let networkProtectionConnectionInterruptedNotificationSubtitle = NSLocalizedString("network.protection.interrupted.notification.subtitle", value: "Attempting to reconnect now...", comment: "The subtitle of the notification shown when Network Protection's connection is interrupted")
+    static let networkProtectionConnectionInterruptedNotificationTitle = NSLocalizedString("network.protection.interrupted.notification.title", value: "DuckDuckGo VPN was interrupted", comment: "The title of the notification shown when DuckDuckGo VPN's connection is interrupted")
+    static let networkProtectionConnectionInterruptedNotificationSubtitle = NSLocalizedString("network.protection.interrupted.notification.subtitle", value: "Attempting to reconnect now...", comment: "The subtitle of the notification shown when DuckDuckGo VPN's connection is interrupted")
 
-    static let networkProtectionConnectionFailureNotificationTitle = NSLocalizedString("network.protection.failure.notification.title", value: "Network Protection failed to connect", comment: "The title of the notification shown when Network Protection fails to reconnect")
-    static let networkProtectionConnectionFailureNotificationSubtitle = NSLocalizedString("network.protection.failure.notification.subtitle", value: "Unable to connect at this time. Please try again later.", comment: "The subtitle of the notification shown when Network Protection fails to reconnect")
+    static let networkProtectionConnectionFailureNotificationTitle = NSLocalizedString("network.protection.failure.notification.title", value: "DuckDuckGo VPN failed to connect", comment: "The title of the notification shown when DuckDuckGo VPN fails to reconnect")
+    static let networkProtectionConnectionFailureNotificationSubtitle = NSLocalizedString("network.protection.failure.notification.subtitle", value: "Unable to connect at this time. Please try again later.", comment: "The subtitle of the notification shown when DuckDuckGo VPN fails to reconnect")
 
-    static let networkProtectionSupersededNotificationTitle = NSLocalizedString("network.protection.superceded.notification.title", value: "Network Protection is disabled", comment: "The title of the notification shown when VPN connection is replaced by another app VPN connection taking over")
-    static let networkProtectionSupersededNotificationSubtitle = NSLocalizedString("network.protection.superceded.notification.subtitle", value: "A VPN app on your device may have disabled it. Click to re-enable.", comment: "The subtitle of the notification shown when VPN connection is replaced by another app VPN connection taking over")
-    static let networkProtectionSupersededReconnectActionTitle = NSLocalizedString("network.protection.superceded.action.reconnect.title", value: "Re-enable", comment: "The title of the `Reconnect` notification action button shown when VPN connection is replaced by another app VPN connection taking over")
+    static let networkProtectionSupersededNotificationTitle = NSLocalizedString("network.protection.superceded.notification.title", value: "DuckDuckGo VPN disconnected", comment: "The title of the notification shown when VPN connection is replaced by another app VPN connection taking over")
+    static let networkProtectionSupersededNotificationSubtitle = NSLocalizedString("network.protection.superceded.notification.subtitle", value: "Another VPN app on your Mac may have disabled it.", comment: "The subtitle of the notification shown when VPN connection is replaced by another app VPN connection taking over")
+    static let networkProtectionSupersededReconnectActionTitle = NSLocalizedString("network.protection.superceded.action.reconnect.title", value: "Reconnect", comment: "The title of the `Reconnect` notification action button shown when VPN connection is replaced by another app VPN connection taking over")
 
 }
diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
index 8b35cbd540..a0b733539c 100644
--- a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
+++ b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
@@ -37,8 +37,6 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
 
     private var cancellables = Set<AnyCancellable>()
 
-    private let appLauncher: AppLaunching?
-
     // MARK: - Error Reporting
 
     // swiftlint:disable:next cyclomatic_complexity function_body_length
@@ -270,8 +268,6 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
     // MARK: - Initialization
 
     @objc public init() {
-        self.appLauncher = AppLauncher(appBundleURL: .mainAppBundleURL)
-
 #if NETP_SYSTEM_EXTENSION
         let defaults = UserDefaults.standard
 #else
diff --git a/DuckDuckGo/Statistics/PixelEvent.swift b/DuckDuckGo/Statistics/PixelEvent.swift
index 8756dae668..54aed95aef 100644
--- a/DuckDuckGo/Statistics/PixelEvent.swift
+++ b/DuckDuckGo/Statistics/PixelEvent.swift
@@ -164,7 +164,7 @@ extension Pixel {
         // VPN
         case vpnBreakageReport(category: String, description: String, metadata: String)
 
-        // Network Protection
+        // VPN
         case networkProtectionWaitlistUserActive
         case networkProtectionWaitlistEntryPointMenuItemDisplayed
         case networkProtectionWaitlistEntryPointToolbarButtonDisplayed
diff --git a/DuckDuckGo/Waitlist/NetworkProtectionFeatureDisabler.swift b/DuckDuckGo/Waitlist/NetworkProtectionFeatureDisabler.swift
index 738d4fb053..f33b15c8c7 100644
--- a/DuckDuckGo/Waitlist/NetworkProtectionFeatureDisabler.swift
+++ b/DuckDuckGo/Waitlist/NetworkProtectionFeatureDisabler.swift
@@ -57,7 +57,7 @@ final class NetworkProtectionFeatureDisabler: NetworkProtectionFeatureDisabling
         self.ipcClient = ipcClient
     }
 
-    /// This method disables Network Protection and clear all of its state.
+    /// This method disables the VPN and clear all of its state.
     ///
     /// - Parameters:
     ///     - keepAuthToken: If `true`, the auth token will not be removed.
diff --git a/DuckDuckGo/Waitlist/NetworkProtectionFeatureVisibility.swift b/DuckDuckGo/Waitlist/NetworkProtectionFeatureVisibility.swift
index 35dd79662b..6e9386c491 100644
--- a/DuckDuckGo/Waitlist/NetworkProtectionFeatureVisibility.swift
+++ b/DuckDuckGo/Waitlist/NetworkProtectionFeatureVisibility.swift
@@ -58,18 +58,18 @@ struct DefaultNetworkProtectionVisibility: NetworkProtectionFeatureVisibility {
         self.defaults = defaults
     }
 
-    /// Calculates whether Network Protection is visible.
+    /// Calculates whether the VPN is visible.
     /// The following criteria are used:
     ///
     /// 1. If the user has a valid auth token, the feature is visible
     /// 2. If no auth token is found, the feature is visible if the waitlist feature flag is enabled
     ///
-    /// Once the waitlist beta has ended, we can trigger a remote change that removes the user's auth token and turn off the waitlist flag, hiding Network Protection from the user.
+    /// Once the waitlist beta has ended, we can trigger a remote change that removes the user's auth token and turn off the waitlist flag, hiding the VPN from the user.
     func isNetworkProtectionVisible() -> Bool {
         return isEasterEggUser || waitlistIsOngoing
     }
 
-    /// Returns whether Network Protection should be uninstalled automatically.
+    /// Returns whether the VPN should be uninstalled automatically.
     /// This is only true when the user is not an Easter Egg user, the waitlist test has ended, and the user is onboarded.
     func shouldUninstallAutomatically() -> Bool {
         let waitlistAccessEnded = isWaitlistUser && !waitlistIsOngoing
diff --git a/DuckDuckGo/Waitlist/Views/WaitlistSteps/WaitlistTermsAndConditionsView.swift b/DuckDuckGo/Waitlist/Views/WaitlistSteps/WaitlistTermsAndConditionsView.swift
index d6307fbf97..a10b10e34c 100644
--- a/DuckDuckGo/Waitlist/Views/WaitlistSteps/WaitlistTermsAndConditionsView.swift
+++ b/DuckDuckGo/Waitlist/Views/WaitlistSteps/WaitlistTermsAndConditionsView.swift
@@ -153,7 +153,7 @@ struct NetworkProtectionTermsAndConditionsContentView: View {
 }
 
 struct NetworkProtectionWaitlistTermsAndConditionsViewData: WaitlistTermsAndConditionsViewData {
-    let title = "Network Protection Beta\nService Terms and Privacy Policy"
+    let title = "VPN Beta\nService Terms and Privacy Policy"
     let buttonCancelLabel = UserText.networkProtectionWaitlistButtonCancel
     let buttonAgreeAndContinueLabel = UserText.networkProtectionWaitlistButtonAgreeAndContinue
 }
diff --git a/DuckDuckGo/Waitlist/Waitlist.swift b/DuckDuckGo/Waitlist/Waitlist.swift
index cacd783aff..5bfbaf7a9c 100644
--- a/DuckDuckGo/Waitlist/Waitlist.swift
+++ b/DuckDuckGo/Waitlist/Waitlist.swift
@@ -155,7 +155,7 @@ extension ProductWaitlistRequest {
     }
 }
 
-// MARK: - Network Protection Waitlist
+// MARK: - VPN Waitlist
 
 struct NetworkProtectionWaitlist: Waitlist {
 
diff --git a/DuckDuckGo/Windows/View/WindowControllersManager.swift b/DuckDuckGo/Windows/View/WindowControllersManager.swift
index 0aeaeeadd2..92a871a208 100644
--- a/DuckDuckGo/Windows/View/WindowControllersManager.swift
+++ b/DuckDuckGo/Windows/View/WindowControllersManager.swift
@@ -198,7 +198,7 @@ extension WindowControllersManager {
         windowController.window?.orderFront(nil)
     }
 
-    // MARK: - Network Protection
+    // MARK: - VPN
 
 #if NETWORK_PROTECTION
     @MainActor
diff --git a/DuckDuckGoNotifications/Logging.swift b/DuckDuckGoNotifications/Logging.swift
index 1d9b65a58c..1d8516705b 100644
--- a/DuckDuckGoNotifications/Logging.swift
+++ b/DuckDuckGoNotifications/Logging.swift
@@ -39,11 +39,11 @@ struct Logging {
     static let subsystem = Bundle.main.bundleIdentifier ?? "DuckDuckGo"
 
     fileprivate static let networkProtectionLoginItemLoggingEnabled = false
-    fileprivate static let networkProtectionLoginItemLog: OSLog = OSLog(subsystem: subsystem, category: "Network Protection: Login Item")
+    fileprivate static let networkProtectionLoginItemLog: OSLog = OSLog(subsystem: subsystem, category: "VPN: Login Item")
 
     fileprivate static let networkProtectionIPCLoginItemLoggingEnabled = false
-    fileprivate static let networkProtectionIPCLoginItemLog: OSLog = OSLog(subsystem: subsystem, category: "Network Protection: IPC (Login Item)")
+    fileprivate static let networkProtectionIPCLoginItemLog: OSLog = OSLog(subsystem: subsystem, category: "VPN: IPC (Login Item)")
 
     fileprivate static let networkProtectionMemoryLoggingEnabled = false
-    fileprivate static let networkProtectionMemoryLog: OSLog = OSLog(subsystem: subsystem, category: "Network Protection: Memory")
+    fileprivate static let networkProtectionMemoryLog: OSLog = OSLog(subsystem: subsystem, category: "VPN: Memory")
 }
diff --git a/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift b/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift
index 56dfec2033..f5643c3243 100644
--- a/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift
+++ b/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift
@@ -237,6 +237,9 @@ final class DuckDuckGoVPNAppDelegate: NSObject, NSApplicationDelegate {
                     StatusBarMenu.MenuItem(name: UserText.networkProtectionStatusMenuVPNSettings, action: { [weak self] in
                         await self?.appLauncher.launchApp(withCommand: .showSettings)
                     }),
+                    StatusBarMenu.MenuItem(name: UserText.networkProtectionStatusMenuFAQ, action: { [weak self] in
+                        await self?.appLauncher.launchApp(withCommand: .showFAQ)
+                    }),
                     StatusBarMenu.MenuItem(name: UserText.networkProtectionStatusMenuOpenDuckDuckGo, action: { [weak self] in
                         await self?.appLauncher.launchApp(withCommand: .justOpen)
                     }),
diff --git a/DuckDuckGoVPN/NetworkExtensionController.swift b/DuckDuckGoVPN/NetworkExtensionController.swift
index 6c74f850a6..49960fdb8a 100644
--- a/DuckDuckGoVPN/NetworkExtensionController.swift
+++ b/DuckDuckGoVPN/NetworkExtensionController.swift
@@ -24,7 +24,7 @@ import SystemExtensionManager
 import SystemExtensions
 #endif
 
-/// Network Protection's network extension session object.
+/// The VPN's network extension session object.
 ///
 /// Through this class the app that owns the VPN can interact with the network extension.
 ///
diff --git a/DuckDuckGoVPN/NetworkProtectionBouncer.swift b/DuckDuckGoVPN/NetworkProtectionBouncer.swift
index 2f3d8d2bdb..b36585dc0c 100644
--- a/DuckDuckGoVPN/NetworkProtectionBouncer.swift
+++ b/DuckDuckGoVPN/NetworkProtectionBouncer.swift
@@ -22,18 +22,18 @@ import NetworkProtection
 import ServiceManagement
 import AppKit
 
-/// Class that implements the necessary logic to ensure Network Protection is enabled, or prevent the app from running otherwise.
+/// Class that implements the necessary logic to ensure the VPN is enabled, or prevent the app from running otherwise.
 ///
 final class NetworkProtectionBouncer {
 
-    /// Simply verifies that the Network Protection feature is enabled and if not, takes care of killing the
+    /// Simply verifies that the VPN feature is enabled and if not, takes care of killing the
     /// current app.
     ///
     func requireAuthTokenOrKillApp() {
         let keychainStore = NetworkProtectionKeychainTokenStore(keychainType: .default, errorEvents: nil, isSubscriptionEnabled: false)
 
         guard keychainStore.isFeatureActivated else {
-            os_log(.error, log: .networkProtection, "🔴 Stopping: Network Protection not authorized.")
+            os_log(.error, log: .networkProtection, "🔴 Stopping: DuckDuckGo VPN not authorized.")
 
             // EXIT_SUCCESS ensures the login item won't relaunch
             // Ref: https://developer.apple.com/documentation/servicemanagement/smappservice/register()
diff --git a/DuckDuckGoVPN/UserText.swift b/DuckDuckGoVPN/UserText.swift
index ae4b186de1..57ea5e3c3b 100644
--- a/DuckDuckGoVPN/UserText.swift
+++ b/DuckDuckGoVPN/UserText.swift
@@ -22,6 +22,7 @@ final class UserText {
     // MARK: - Status Menu
 
     static let networkProtectionStatusMenuVPNSettings = NSLocalizedString("network.protection.status.menu.vpn.settings", value: "VPN Settings…", comment: "The status menu 'VPN Settings' menu item")
+    static let networkProtectionStatusMenuFAQ = NSLocalizedString("network.protection.status.menu.faq", value: "Frequently Asked Questions…", comment: "The status menu 'FAQ' menu item")
     static let networkProtectionStatusMenuOpenDuckDuckGo = NSLocalizedString("network.protection.status.menu.vpn.open-duckduckgo", value: "Open DuckDuckGo…", comment: "The status menu 'Open DuckDuckGo' menu item")
     static let networkProtectionStatusMenuShareFeedback = NSLocalizedString("network.protection.status.menu.share.feedback", value: "Send VPN Feedback…", comment: "The status menu 'Send VPN Feedback' menu item")
 }
diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
index 3c3138ae1b..16230a9a8e 100644
--- 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: "122.2.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "122.2.1"),
         .package(path: "../PixelKit"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
index f4b8e03b9d..edd448f1f8 100644
--- a/LocalPackages/NetworkProtectionMac/Package.swift
+++ b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -31,7 +31,7 @@ let package = Package(
         .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "122.2.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "122.2.1"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../LoginItems"),
diff --git a/LocalPackages/NetworkProtectionMac/README.md b/LocalPackages/NetworkProtectionMac/README.md
index c9e9b62094..49354a0caa 100644
--- a/LocalPackages/NetworkProtectionMac/README.md
+++ b/LocalPackages/NetworkProtectionMac/README.md
@@ -1,6 +1,6 @@
 # NetworkProtectionMac
 
-This package contains several components of Network Protection that are specific to macOS.
+This package contains several components of VPN that are specific to macOS.
 
-- NetworkProtectionUI: UI elements used in Network Protection that are reusable across build targets.
-- NetworkProtectionIPC: code to support IPC communication between NetworkProtection targets.
+- NetworkProtectionUI: UI elements used in the VPN that are reusable across build targets.
+- NetworkProtectionIPC: code to support IPC communication between VPN targets.
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/AppLaunching/AppLaunching.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/AppLaunching/AppLaunching.swift
new file mode 100644
index 0000000000..2e408557b0
--- /dev/null
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/AppLaunching/AppLaunching.swift
@@ -0,0 +1,39 @@
+//
+//  AppLaunching.swift
+//
+//  Copyright © 2022 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+// SPDX-License-Identifier: MIT
+// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved.
+
+import Foundation
+
+public enum AppLaunchCommand: Codable {
+    case justOpen
+    case shareFeedback
+    case showFAQ
+    case showStatus
+    case showSettings
+    case showVPNLocations
+    case startVPN
+    case stopVPN
+    case enableOnDemand
+    case moveAppToApplications
+}
+
+public protocol AppLaunching {
+    func launchApp(withCommand command: AppLaunchCommand) async
+}
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserText+NetworkProtectionUI.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserText+NetworkProtectionUI.swift
index ccd9a73ef7..1ec0e4d17a 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserText+NetworkProtectionUI.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Extensions/UserText+NetworkProtectionUI.swift
@@ -21,11 +21,11 @@ import Foundation
 final class UserText {
     static let networkProtectionStatusViewFeatureDesc = NSLocalizedString("network.protection.status.view.feature.description", value: "DuckDuckGo's VPN secures all of your device's Internet traffic anytime, anywhere.", comment: "Feature description shown in NetworkProtection's status view.")
     static let networkProtectionStatusViewConnDetails = NSLocalizedString("network.protection.status.view.connection.details", value: "Connection Details", comment: "Connection details label shown in NetworkProtection's status view.")
-    static let networkProtectionStatusViewConnLabel = NSLocalizedString("network.protection.status.view.connection.label", value: "Network Protection", comment: "Connection label shown in NetworkProtection's status view.")
+    static let networkProtectionStatusViewConnLabel = NSLocalizedString("network.protection.status.view.connection.label", value: "VPN", comment: "Connection label shown in NetworkProtection's status view.")
     static let networkProtectionStatusViewLocation = NSLocalizedString("network.protection.status.view.location", value: "Location", comment: "Location label shown in NetworkProtection's status view.")
     static let networkProtectionStatusViewIPAddress = NSLocalizedString("network.protection.status.view.ip.address", value: "IP Address", comment: "IP Address label shown in NetworkProtection's status view.")
-    static let networkProtectionStatusViewFeatureOff = NSLocalizedString("network.protection.status.view.feature.on", value: "Network Protection is OFF", comment: "Text shown in NetworkProtection's status view when NetP is OFF.")
-    static let networkProtectionStatusViewFeatureOn = NSLocalizedString("network.protection.status.view.feature.on", value: "Network Protection is ON", comment: "Text shown in NetworkProtection's status view when NetP is ON.")
+    static let networkProtectionStatusViewFeatureOff = NSLocalizedString("network.protection.status.view.feature.on", value: "DuckDuckGo VPN is OFF", comment: "Text shown in NetworkProtection's status view when NetP is OFF.")
+    static let networkProtectionStatusViewFeatureOn = NSLocalizedString("network.protection.status.view.feature.on", value: "DuckDuckGo VPN is ON", comment: "Text shown in NetworkProtection's status view when NetP is ON.")
     static let networkProtectionStatusViewTimerZero = "00:00:00"
 
     // MARK: - Onboarding
@@ -39,8 +39,8 @@ final class UserText {
     static let networkProtectionOnboardingAllowVPNTitle = NSLocalizedString("network.protection.onboarding.allow.vpn.title", value: "Add VPN Configuration", comment: "Title for the onboarding allow-VPN step")
     static let networkProtectionOnboardingAllowVPNDescPrefix = NSLocalizedString("network.protection.onboarding.allow.vpn.desc.prefix", value: "Select ", comment: "Non-bold prefix for the onboarding allow-VPN description")
     static let networkProtectionOnboardingAllowVPNDescAllow = NSLocalizedString("network.protection.onboarding.allow.vpn.desc.allow", value: "Allow", comment: "'Allow' word between the prefix and suffix for the onboarding allow-VPN description")
-    static let networkProtectionOnboardingAllowVPNDescSuffix = NSLocalizedString("network.protection.onboarding.allow.vpn.desc.suffix", value: " when prompted to finish setting up Network Protection.", comment: "Non-bold suffix for the onboarding allow-VPN description")
-    static let networkProtectionOnboardingAllowVPNDescExpandedSuffix = NSLocalizedString("network.protection.onboarding.allow.vpn.desc.expanded.suffix", value: " when prompted to finish setting up Network Protection.\n\nThis adds a shortcut in the menu bar so you can still access the VPN if the browser isn't running.", comment: "Non-bold suffix for the onboarding allow-VPN description")
+    static let networkProtectionOnboardingAllowVPNDescSuffix = NSLocalizedString("network.protection.onboarding.allow.vpn.desc.suffix", value: " when prompted to finish setting up VPN.", comment: "Non-bold suffix for the onboarding allow-VPN description")
+    static let networkProtectionOnboardingAllowVPNDescExpandedSuffix = NSLocalizedString("network.protection.onboarding.allow.vpn.desc.expanded.suffix", value: " when prompted to finish setting up VPN.\n\nThis adds a shortcut in the menu bar so you can still access the VPN if the browser isn't running.", comment: "Non-bold suffix for the onboarding allow-VPN description")
     static let networkProtectionOnboardingAllowVPNAction = NSLocalizedString("network.protection.onboarding.allow.vpn.action", value: "Add VPN Configuration...", comment: "Action button title for the onboarding allow-VPN view")
 
     static let networkProtectionOnboardingMoveToApplicationsTitle = NSLocalizedString("network.protection.onboarding.move.to.applications.title", value: "Move DuckDuckGo App", comment: "Title for the onboarding move-app-to-applications step")
@@ -56,8 +56,8 @@ final class UserText {
 
     // MARK: - Connection Issues
 
-    static let networkProtectionInterruptedReconnecting = NSLocalizedString("network.protection.interrupted.reconnecting", value: "Your Network Protection connection was interrupted. Attempting to reconnect now...", comment: "The warning message shown in NetP's status view when the connection is interrupted and its attempting to reconnect.")
-    static let networkProtectionInterrupted = NSLocalizedString("network.protection.interrupted", value: "Network Protection was unable to connect at this time. Please try again later.", comment: "The warning message shown in NetP's status view when the connection is interrupted.")
+    static let networkProtectionInterruptedReconnecting = NSLocalizedString("network.protection.interrupted.reconnecting", value: "Your VPN connection was interrupted. Attempting to reconnect now...", comment: "The warning message shown in NetP's status view when the connection is interrupted and its attempting to reconnect.")
+    static let networkProtectionInterrupted = NSLocalizedString("network.protection.interrupted", value: "The VPN was unable to connect at this time. Please try again later.", comment: "The warning message shown in NetP's status view when the connection is interrupted.")
 
     // MARK: - Connection Information
 
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/NavigationBarIconProvider.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/NavigationBarIconProvider.swift
index 657b3f5a8f..c9851d6b90 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/NavigationBarIconProvider.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/NavigationBarIconProvider.swift
@@ -19,7 +19,7 @@
 import AppKit
 import Foundation
 
-/// Network Protection icon shown in the navigation bar.
+/// VPN icon shown in the navigation bar.
 ///
 public final class NavigationBarIconProvider: IconProvider {
 
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/StatusBarMenu.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/StatusBarMenu.swift
index cba2d5573a..488970f7d4 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/StatusBarMenu.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Menu/StatusBarMenu.swift
@@ -23,7 +23,7 @@ import SwiftUI
 import NetworkProtection
 import LoginItems
 
-/// Abstraction of the the Network Protection status bar menu with a simple interface.
+/// Abstraction of the the VPN status bar menu with a simple interface.
 ///
 @objc
 public final class StatusBarMenu: NSObject {
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusViewModel.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusViewModel.swift
index 80ba7a9255..454ec28102 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusViewModel.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/StatusView/NetworkProtectionStatusViewModel.swift
@@ -23,8 +23,8 @@ import NetworkProtection
 import ServiceManagement
 import SwiftUI
 
-/// This view can be shown from any location where we want the user to be able to interact with NetP.
-/// This view shows status information about Network Protection, and offers a chance to toggle it ON and OFF.
+/// This view can be shown from any location where we want the user to be able to interact with VPN.
+/// This view shows status information about the VPN, and offers a chance to toggle it ON and OFF.
 ///
 extension NetworkProtectionStatusView {
 
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/TunnelControllerView/TunnelControllerViewModel.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/TunnelControllerView/TunnelControllerViewModel.swift
index 0ed003c366..ab1443ba8d 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/TunnelControllerView/TunnelControllerViewModel.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionUI/Views/TunnelControllerView/TunnelControllerViewModel.swift
@@ -437,9 +437,9 @@ public final class TunnelControllerViewModel: ObservableObject {
         }
     }
 
-    // MARK: - Toggling Network Protection
+    // MARK: - Toggling VPN
 
-    /// Start network protection.
+    /// Start the VPN.
     ///
     func startNetworkProtection() {
         if shouldFlipToggle {
@@ -454,7 +454,7 @@ public final class TunnelControllerViewModel: ObservableObject {
         }
     }
 
-    /// Stop network protection.
+    /// Stop the VPN.
     ///
     func stopNetworkProtection() {
         toggleTransition = .switchingOff(locallyInitiated: true)
diff --git a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/AppLaunching/MockAppLauncher.swift b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/AppLaunching/MockAppLauncher.swift
new file mode 100644
index 0000000000..07f0d58fd8
--- /dev/null
+++ b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/AppLaunching/MockAppLauncher.swift
@@ -0,0 +1,30 @@
+//
+//  MockAppLauncher.swift
+//
+//  Copyright © 2023 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import NetworkProtectionUI
+
+public final class MockAppLauncher: AppLaunching {
+    public init() {
+    }
+
+    public var spyLaunchAppCommand: AppLaunchCommand?
+    public func launchApp(withCommand command: AppLaunchCommand) async {
+        spyLaunchAppCommand = command
+    }
+}
diff --git a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/TunnelControllerViewModelTests.swift b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/TunnelControllerViewModelTests.swift
index a67d7dfc6a..3e8068b76f 100644
--- a/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/TunnelControllerViewModelTests.swift
+++ b/LocalPackages/NetworkProtectionMac/Tests/NetworkProtectionUITests/TunnelControllerViewModelTests.swift
@@ -182,7 +182,7 @@ final class TunnelControllerViewModelTests: XCTestCase {
         XCTAssertFalse(model.showServerDetails)
     }
 
-    /// We expect that setting the model's `isRunning` to `true`, will start network protection.
+    /// We expect that setting the model's `isRunning` to `true`, will start the VPN.
     ///
     @MainActor
     func testStartsNetworkProtection() async throws {
@@ -193,7 +193,7 @@ final class TunnelControllerViewModelTests: XCTestCase {
             onboardingStatusPublisher: Just(OnboardingStatus.completed).eraseToAnyPublisher(),
             statusReporter: statusReporter,
             appLauncher: MockAppLauncher())
-        let networkProtectionWasStarted = expectation(description: "The model started network protection when appropriate")
+        let networkProtectionWasStarted = expectation(description: "The model started the VPN when appropriate")
 
         controller.startCallback = {
             networkProtectionWasStarted.fulfill()
@@ -206,7 +206,7 @@ final class TunnelControllerViewModelTests: XCTestCase {
         await fulfillment(of: [networkProtectionWasStarted], timeout: 0.1)
     }
 
-    /// We expect that setting the model's `isRunning` to `false`, will stop network protection.
+    /// We expect that setting the model's `isRunning` to `false`, will stop the VPN.
     ///
     @MainActor
     func testStopsNetworkProtection() async throws {
@@ -225,7 +225,7 @@ final class TunnelControllerViewModelTests: XCTestCase {
             statusReporter: statusReporter,
             appLauncher: MockAppLauncher())
 
-        let networkProtectionWasStopped = expectation(description: "The model stopped network protection when appropriate")
+        let networkProtectionWasStopped = expectation(description: "The model stopped the VPN when appropriate")
 
         controller.stopCallback = {
             networkProtectionWasStopped.fulfill()
diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
index 51258b7e71..e3f0621d70 100644
--- 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: "122.2.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "122.2.1"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/DebugMenu/SubscriptionDebugMenu.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/DebugMenu/SubscriptionDebugMenu.swift
index 1012fd4085..bde629f646 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/DebugMenu/SubscriptionDebugMenu.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/DebugMenu/SubscriptionDebugMenu.swift
@@ -271,7 +271,7 @@ public final class SubscriptionDebugMenu: NSMenuItem {
 
     private func askAndUpdateEnvironment(to newEnvironmentString: String) {
         let alert = makeAlert(title: "Are you sure you want to change the environment to \(newEnvironmentString.capitalized)",
-                              message: "Please make sure you have manually removed your current active Subscription and reset all related features. \nYou may also need to change environment of related features e.g. Network Protection's to a matching one.",
+                              message: "Please make sure you have manually removed your current active Subscription and reset all related features. \nYou may also need to change environment of related features e.g. VPN's to a matching one.",
                               buttonNames: ["Yes", "No"])
         let response = alert.runModal()
 

From 675bbb7645570b337566b81cc99e75ac4e801e12 Mon Sep 17 00:00:00 2001
From: Pete Smith <peadar81@gmail.com>
Date: Thu, 14 Mar 2024 11:24:10 +0000
Subject: [PATCH 04/30] Prevent Dismissal of Autofill UI When Window Loses
 Focus  (#2393)

Task/Issue URL: https://app.asana.com/0/276630244458377/1204870766898373/f

Description:
Currently, if we open the Autofill dialog and then tap out of the browser, the autofill window immediately dismisses. This is not a great UX. This change ensures that the Autofill dialog remains open until the user explicitly decides to close it.
Note that the user can close the autofill dialog by selecting anywhere inside the DDG browser, but outside the Autofill dialog.
---
 DuckDuckGo.xcodeproj/project.pbxproj          |  44 ++++++++
 .../MainWindow/MainViewController.swift       |  48 +++++++-
 DuckDuckGo/Menus/MainMenu.swift               |   6 +-
 .../View/NavigationBarPopovers.swift          |  70 +++++++-----
 .../View/NavigationBarViewController.swift    |  32 +++---
 .../View/NetPPopoverManagerMock.swift         |  82 ++++++++++++++
 .../NetworkProtectionNavBarButtonModel.swift  |  25 +----
 ...etworkProtectionNavBarPopoverManager.swift |  27 ++++-
 ...NetworkProtectionIPCTunnelController.swift |   6 +-
 .../View/AutofillPopoverPresenter.swift       |  84 ++++++++++++++
 .../View/PasswordManagementPopover.swift      |  19 ----
 DuckDuckGo/Windows/View/WindowsManager.swift  |  11 +-
 .../Geolocation/CLLocationManagerMock.swift   |  17 +++
 .../Geolocation/GeolocationServiceTests.swift |  14 ++-
 .../Mocks/MockAutofillPopoverPresenter.swift  |  53 +++++++++
 .../View/NavigationBarPopoversTests.swift     | 104 ++++++++++++++++++
 .../AutofillPreferencesModelTests.swift       |  20 +++-
 17 files changed, 555 insertions(+), 107 deletions(-)
 create mode 100644 DuckDuckGo/NavigationBar/View/NetPPopoverManagerMock.swift
 create mode 100644 DuckDuckGo/SecureVault/View/AutofillPopoverPresenter.swift
 create mode 100644 UnitTests/NavigationBar/Mocks/MockAutofillPopoverPresenter.swift
 create mode 100644 UnitTests/NavigationBar/View/NavigationBarPopoversTests.swift

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index 1ebb57cfa5..90fc764ac7 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -2581,6 +2581,9 @@
 		B31055C427A1BA1D001AC618 /* AutoconsentUserScript.swift in Sources */ = {isa = PBXBuildFile; fileRef = B31055BC27A1BA1D001AC618 /* AutoconsentUserScript.swift */; };
 		B31055C627A1BA1D001AC618 /* userscript.js in Resources */ = {isa = PBXBuildFile; fileRef = B31055BE27A1BA1D001AC618 /* userscript.js */; };
 		B31055CB27A1BA1D001AC618 /* autoconsent-bundle.js in Resources */ = {isa = PBXBuildFile; fileRef = B31055C327A1BA1D001AC618 /* autoconsent-bundle.js */; };
+		B60293E62BA19ECD0033186B /* NetPPopoverManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60293E52BA19ECD0033186B /* NetPPopoverManagerMock.swift */; };
+		B60293E72BA19ECD0033186B /* NetPPopoverManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60293E52BA19ECD0033186B /* NetPPopoverManagerMock.swift */; };
+		B60293E82BA19ECD0033186B /* NetPPopoverManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60293E52BA19ECD0033186B /* NetPPopoverManagerMock.swift */; };
 		B602E7CF2A93A5FF00F12201 /* WKBackForwardListExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B602E7CE2A93A5FF00F12201 /* WKBackForwardListExtension.swift */; };
 		B602E7D02A93A5FF00F12201 /* WKBackForwardListExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = B602E7CE2A93A5FF00F12201 /* WKBackForwardListExtension.swift */; };
 		B602E8162A1E2570006D261F /* URL+NetworkProtection.swift in Sources */ = {isa = PBXBuildFile; fileRef = B602E8152A1E2570006D261F /* URL+NetworkProtection.swift */; };
@@ -3075,6 +3078,13 @@
 		C168B9AC2B31DC7E001AFAD9 /* AutofillNeverPromptWebsitesManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C168B9AB2B31DC7E001AFAD9 /* AutofillNeverPromptWebsitesManager.swift */; };
 		C168B9AD2B31DC7F001AFAD9 /* AutofillNeverPromptWebsitesManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C168B9AB2B31DC7E001AFAD9 /* AutofillNeverPromptWebsitesManager.swift */; };
 		C168B9AE2B31DC7F001AFAD9 /* AutofillNeverPromptWebsitesManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = C168B9AB2B31DC7E001AFAD9 /* AutofillNeverPromptWebsitesManager.swift */; };
+		C17CA7AD2B9B52E6008EC3C1 /* NavigationBarPopoversTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17CA7AC2B9B52E6008EC3C1 /* NavigationBarPopoversTests.swift */; };
+		C17CA7AE2B9B52E6008EC3C1 /* NavigationBarPopoversTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17CA7AC2B9B52E6008EC3C1 /* NavigationBarPopoversTests.swift */; };
+		C17CA7B22B9B5317008EC3C1 /* MockAutofillPopoverPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17CA7B12B9B5317008EC3C1 /* MockAutofillPopoverPresenter.swift */; };
+		C17CA7B32B9B5317008EC3C1 /* MockAutofillPopoverPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C17CA7B12B9B5317008EC3C1 /* MockAutofillPopoverPresenter.swift */; };
+		C1DAF3B52B9A44860059244F /* AutofillPopoverPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1DAF3B42B9A44860059244F /* AutofillPopoverPresenter.swift */; };
+		C1DAF3B62B9A44860059244F /* AutofillPopoverPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1DAF3B42B9A44860059244F /* AutofillPopoverPresenter.swift */; };
+		C1DAF3B72B9A44860059244F /* AutofillPopoverPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1DAF3B42B9A44860059244F /* AutofillPopoverPresenter.swift */; };
 		C1E961EB2B879E79001760E1 /* MockAutofillActionPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1E961E72B879E4D001760E1 /* MockAutofillActionPresenter.swift */; };
 		C1E961ED2B879ED9001760E1 /* MockAutofillActionExecutor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1E961EC2B879ED9001760E1 /* MockAutofillActionExecutor.swift */; };
 		C1E961EF2B87AA29001760E1 /* AutofillActionBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1E961EE2B87AA29001760E1 /* AutofillActionBuilder.swift */; };
@@ -4161,6 +4171,7 @@
 		B31055BC27A1BA1D001AC618 /* AutoconsentUserScript.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutoconsentUserScript.swift; sourceTree = "<group>"; };
 		B31055BE27A1BA1D001AC618 /* userscript.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = userscript.js; sourceTree = "<group>"; };
 		B31055C327A1BA1D001AC618 /* autoconsent-bundle.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "autoconsent-bundle.js"; sourceTree = "<group>"; };
+		B60293E52BA19ECD0033186B /* NetPPopoverManagerMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetPPopoverManagerMock.swift; sourceTree = "<group>"; };
 		B602E7CE2A93A5FF00F12201 /* WKBackForwardListExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKBackForwardListExtension.swift; sourceTree = "<group>"; };
 		B602E8152A1E2570006D261F /* URL+NetworkProtection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "URL+NetworkProtection.swift"; sourceTree = "<group>"; };
 		B602E81C2A1E25B0006D261F /* NEOnDemandRuleExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NEOnDemandRuleExtension.swift; sourceTree = "<group>"; };
@@ -4460,6 +4471,9 @@
 		C13909F32B85FD79001626ED /* AutofillDeleteAllPasswordsExecutorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutofillDeleteAllPasswordsExecutorTests.swift; sourceTree = "<group>"; };
 		C13909FA2B861039001626ED /* AutofillActionPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutofillActionPresenter.swift; sourceTree = "<group>"; };
 		C168B9AB2B31DC7E001AFAD9 /* AutofillNeverPromptWebsitesManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutofillNeverPromptWebsitesManager.swift; sourceTree = "<group>"; };
+		C17CA7AC2B9B52E6008EC3C1 /* NavigationBarPopoversTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationBarPopoversTests.swift; sourceTree = "<group>"; };
+		C17CA7B12B9B5317008EC3C1 /* MockAutofillPopoverPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockAutofillPopoverPresenter.swift; sourceTree = "<group>"; };
+		C1DAF3B42B9A44860059244F /* AutofillPopoverPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutofillPopoverPresenter.swift; sourceTree = "<group>"; };
 		C1E961E72B879E4D001760E1 /* MockAutofillActionPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockAutofillActionPresenter.swift; sourceTree = "<group>"; };
 		C1E961EC2B879ED9001760E1 /* MockAutofillActionExecutor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockAutofillActionExecutor.swift; sourceTree = "<group>"; };
 		C1E961EE2B87AA29001760E1 /* AutofillActionBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutofillActionBuilder.swift; sourceTree = "<group>"; };
@@ -6539,6 +6553,7 @@
 				4B8A4DFE27C83B29005F40E8 /* SaveIdentityViewController.swift */,
 				4BE4005227CF3DC3007D3161 /* SavePaymentMethodPopover.swift */,
 				4BE4005427CF3F19007D3161 /* SavePaymentMethodViewController.swift */,
+				C1DAF3B42B9A44860059244F /* AutofillPopoverPresenter.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -7220,6 +7235,7 @@
 				AAA0CC32252F181A0079BC96 /* NavigationButtonMenuDelegate.swift */,
 				85012B0129133F9F003D0DCC /* NavigationBarPopovers.swift */,
 				AA68C3D22490ED62001B8783 /* NavigationBarViewController.swift */,
+				B60293E52BA19ECD0033186B /* NetPPopoverManagerMock.swift */,
 				D64A5FF72AEA5C2B00B6D6E7 /* HomeButtonMenuFactory.swift */,
 			);
 			path = View;
@@ -7292,9 +7308,11 @@
 		AA91F83627076ED100771A0D /* NavigationBar */ = {
 			isa = PBXGroup;
 			children = (
+				C17CA7B02B9B52FF008EC3C1 /* Mocks */,
 				AA91F83727076EEE00771A0D /* ViewModel */,
 				4BF6961F28BEEE8B00D402D4 /* LocalPinningManagerTests.swift */,
 				56B234BE2A84EFD200F2A1CC /* NavigationBarUrlExtensionsTests.swift */,
+				C17CA7AF2B9B52EB008EC3C1 /* View */,
 			);
 			path = NavigationBar;
 			sourceTree = "<group>";
@@ -8300,6 +8318,22 @@
 			path = Tests;
 			sourceTree = "<group>";
 		};
+		C17CA7AF2B9B52EB008EC3C1 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				C17CA7AC2B9B52E6008EC3C1 /* NavigationBarPopoversTests.swift */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		C17CA7B02B9B52FF008EC3C1 /* Mocks */ = {
+			isa = PBXGroup;
+			children = (
+				C17CA7B12B9B5317008EC3C1 /* MockAutofillPopoverPresenter.swift */,
+			);
+			path = Mocks;
+			sourceTree = "<group>";
+		};
 		C1E961E62B879E2A001760E1 /* Mocks */ = {
 			isa = PBXGroup;
 			children = (
@@ -10252,6 +10286,7 @@
 				4B9DB0452A983B24000927DB /* WaitlistModalViewController.swift in Sources */,
 				B66CA41F2AD910B300447CF0 /* DataImportView.swift in Sources */,
 				3706FC0C293F65D500E42796 /* NSAttributedStringExtension.swift in Sources */,
+				C1DAF3B62B9A44860059244F /* AutofillPopoverPresenter.swift in Sources */,
 				3706FC0D293F65D500E42796 /* AnimationView.swift in Sources */,
 				3706FC0E293F65D500E42796 /* NSRectExtension.swift in Sources */,
 				3706FC0F293F65D500E42796 /* YoutubeOverlayUserScript.swift in Sources */,
@@ -10338,6 +10373,7 @@
 				3706FC51293F65D500E42796 /* RecentlyVisitedView.swift in Sources */,
 				B645D8F729FA95440024461F /* WKProcessPoolExtension.swift in Sources */,
 				3706FC52293F65D500E42796 /* MouseOverAnimationButton.swift in Sources */,
+				B60293E72BA19ECD0033186B /* NetPPopoverManagerMock.swift in Sources */,
 				3706FC53293F65D500E42796 /* TabBarScrollView.swift in Sources */,
 				3706FC54293F65D500E42796 /* BookmarkListTreeControllerDataSource.swift in Sources */,
 				3706FC55293F65D500E42796 /* AddressBarViewController.swift in Sources */,
@@ -10541,6 +10577,7 @@
 				B6619EF72B10DFF700CD9186 /* InstructionsFormatParserTests.swift in Sources */,
 				3706FE21293F661700E42796 /* DownloadsPreferencesTests.swift in Sources */,
 				3706FE22293F661700E42796 /* FireproofDomainsTests.swift in Sources */,
+				C17CA7AE2B9B52E6008EC3C1 /* NavigationBarPopoversTests.swift in Sources */,
 				3706FE23293F661700E42796 /* SuggestionLoadingMock.swift in Sources */,
 				3706FE24293F661700E42796 /* PasteboardFolderTests.swift in Sources */,
 				B603971229B9D67E00902A34 /* PublishersExtensions.swift in Sources */,
@@ -10578,6 +10615,7 @@
 				3706FE3C293F661700E42796 /* FireproofDomainsStoreMock.swift in Sources */,
 				3706FE3D293F661700E42796 /* DataEncryptionTests.swift in Sources */,
 				3706FE3E293F661700E42796 /* ClickToLoadModelTests.swift in Sources */,
+				C17CA7B32B9B5317008EC3C1 /* MockAutofillPopoverPresenter.swift in Sources */,
 				3706FE3F293F661700E42796 /* FileStoreMock.swift in Sources */,
 				B6619F042B17123200CD9186 /* DataImportViewModelTests.swift in Sources */,
 				1D8C2FE62B70F4C4005E4BBD /* TabSnapshotExtensionTests.swift in Sources */,
@@ -11169,6 +11207,7 @@
 				4B957A3E2AC7AE700062CA31 /* EnableWaitlistFeatureView.swift in Sources */,
 				4B957A3F2AC7AE700062CA31 /* GrammarFeaturesManager.swift in Sources */,
 				4B957A402AC7AE700062CA31 /* WaitlistModalViewController.swift in Sources */,
+				B60293E82BA19ECD0033186B /* NetPPopoverManagerMock.swift in Sources */,
 				B6BCC53E2AFD15DF002C5499 /* DataImportProfilePicker.swift in Sources */,
 				4B957A412AC7AE700062CA31 /* WKMenuItemIdentifier.swift in Sources */,
 				4B957A422AC7AE700062CA31 /* SafariFaviconsReader.swift in Sources */,
@@ -11523,6 +11562,7 @@
 				4B957B7B2AC7AE700062CA31 /* DeviceAuthenticator.swift in Sources */,
 				4B957B7C2AC7AE700062CA31 /* NetworkProtectionWaitlistFeatureFlagOverridesMenu.swift in Sources */,
 				4B957B7D2AC7AE700062CA31 /* TabBarCollectionView.swift in Sources */,
+				C1DAF3B72B9A44860059244F /* AutofillPopoverPresenter.swift in Sources */,
 				4B957B7E2AC7AE700062CA31 /* NetworkProtection+ConvenienceInitializers.swift in Sources */,
 				7BA7CC502AD11F6F0042E5CE /* NetworkProtectionIPCTunnelController.swift in Sources */,
 				4B957B7F2AC7AE700062CA31 /* NavigationActionExtension.swift in Sources */,
@@ -11955,6 +11995,7 @@
 				4B9DB0442A983B24000927DB /* WaitlistModalViewController.swift in Sources */,
 				B6DA06E8291401D700225DE2 /* WKMenuItemIdentifier.swift in Sources */,
 				4B0AACAE28BC6FD0001038AC /* SafariFaviconsReader.swift in Sources */,
+				B60293E62BA19ECD0033186B /* NetPPopoverManagerMock.swift in Sources */,
 				B6B3E0E12657EA7A0040E0A2 /* NSScreenExtension.swift in Sources */,
 				B65E6BA026D9F10600095F96 /* NSBezierPathExtension.swift in Sources */,
 				4B4D60E02A0C875F00BCD287 /* Bundle+VPN.swift in Sources */,
@@ -12309,6 +12350,7 @@
 				4B9292AF26670F5300AD2C21 /* NSOutlineViewExtensions.swift in Sources */,
 				AA585D82248FD31100E9A3E2 /* AppDelegate.swift in Sources */,
 				7B1E81A027C8874900FF0E60 /* ContentOverlayViewController.swift in Sources */,
+				C1DAF3B52B9A44860059244F /* AutofillPopoverPresenter.swift in Sources */,
 				B687B7CA2947A029001DEA6F /* ContentBlockingTabExtension.swift in Sources */,
 				85B7184C27677C6500B4277F /* OnboardingViewController.swift in Sources */,
 				4B379C1E27BDB7FF008A968E /* DeviceAuthenticator.swift in Sources */,
@@ -12431,6 +12473,7 @@
 				569277C429DEE09D00B633EF /* ContinueSetUpModelTests.swift in Sources */,
 				85F1B0C925EF9759004792B6 /* URLEventHandlerTests.swift in Sources */,
 				4B9292BD2667103100AD2C21 /* BookmarkOutlineViewDataSourceTests.swift in Sources */,
+				C17CA7B22B9B5317008EC3C1 /* MockAutofillPopoverPresenter.swift in Sources */,
 				4BF6961D28BE911100D402D4 /* RecentlyVisitedSiteModelTests.swift in Sources */,
 				B6619F062B17138D00CD9186 /* DataImportSourceViewModelTests.swift in Sources */,
 				4BBF0917282DD6EF00EE1418 /* TemporaryFileHandlerTests.swift in Sources */,
@@ -12642,6 +12685,7 @@
 				B6C2C9EF276081AB005B7F0A /* DeallocationTests.swift in Sources */,
 				B63ED0D826AE729600A9DAD1 /* PermissionModelTests.swift in Sources */,
 				B69B504B2726CA2900758A2B /* MockStatisticsStore.swift in Sources */,
+				C17CA7AD2B9B52E6008EC3C1 /* NavigationBarPopoversTests.swift in Sources */,
 				37CD54BD27F2ECAE00F1F7B9 /* AutofillPreferencesModelTests.swift in Sources */,
 				C1E961ED2B879ED9001760E1 /* MockAutofillActionExecutor.swift in Sources */,
 				37D23789288009CF00BCE03B /* TabCollectionViewModelTests+PinnedTabs.swift in Sources */,
diff --git a/DuckDuckGo/MainWindow/MainViewController.swift b/DuckDuckGo/MainWindow/MainViewController.swift
index 5741f2f55e..5ef25c47e9 100644
--- a/DuckDuckGo/MainWindow/MainViewController.swift
+++ b/DuckDuckGo/MainWindow/MainViewController.swift
@@ -23,6 +23,7 @@ import Common
 
 #if NETWORK_PROTECTION
 import NetworkProtection
+import NetworkProtectionIPC
 #endif
 
 final class MainViewController: NSViewController {
@@ -56,14 +57,53 @@ final class MainViewController: NSViewController {
         fatalError("MainViewController: Bad initializer")
     }
 
-    init(tabCollectionViewModel: TabCollectionViewModel? = nil,
-         bookmarkManager: BookmarkManager = LocalBookmarkManager.shared) {
+    init(tabCollectionViewModel: TabCollectionViewModel? = nil, bookmarkManager: BookmarkManager = LocalBookmarkManager.shared, autofillPopoverPresenter: AutofillPopoverPresenter) {
         let tabCollectionViewModel = tabCollectionViewModel ?? TabCollectionViewModel()
         self.tabCollectionViewModel = tabCollectionViewModel
         self.isBurner = tabCollectionViewModel.isBurner
 
         tabBarViewController = TabBarViewController.create(tabCollectionViewModel: tabCollectionViewModel)
-        navigationBarViewController = NavigationBarViewController.create(tabCollectionViewModel: tabCollectionViewModel, isBurner: isBurner)
+
+#if NETWORK_PROTECTION
+        let networkProtectionPopoverManager: NetPPopoverManager = {
+#if DEBUG
+            guard case .normal = NSApp.runType else {
+                return NetPPopoverManagerMock()
+            }
+#endif
+            let vpnBundleID = Bundle.main.vpnMenuAgentBundleId
+            let ipcClient = TunnelControllerIPCClient(machServiceName: vpnBundleID)
+            ipcClient.register()
+
+            return NetworkProtectionNavBarPopoverManager(ipcClient: ipcClient)
+        }()
+        let networkProtectionStatusReporter: NetworkProtectionStatusReporter = {
+            var connectivityIssuesObserver: ConnectivityIssueObserver!
+            var controllerErrorMessageObserver: ControllerErrorMesssageObserver!
+#if DEBUG
+            if ![.normal, .integrationTests].contains(NSApp.runType) {
+                connectivityIssuesObserver = ConnectivityIssueObserverMock()
+                controllerErrorMessageObserver = ControllerErrorMesssageObserverMock()
+            }
+#endif
+            connectivityIssuesObserver = connectivityIssuesObserver ?? DisabledConnectivityIssueObserver()
+            controllerErrorMessageObserver = controllerErrorMessageObserver ?? ControllerErrorMesssageObserverThroughDistributedNotifications()
+
+            let ipcClient = networkProtectionPopoverManager.ipcClient
+            return DefaultNetworkProtectionStatusReporter(
+                statusObserver: ipcClient.ipcStatusObserver,
+                serverInfoObserver: ipcClient.ipcServerInfoObserver,
+                connectionErrorObserver: ipcClient.ipcConnectionErrorObserver,
+                connectivityIssuesObserver: connectivityIssuesObserver,
+                controllerErrorMessageObserver: controllerErrorMessageObserver
+            )
+        }()
+
+        navigationBarViewController = NavigationBarViewController.create(tabCollectionViewModel: tabCollectionViewModel, isBurner: isBurner, networkProtectionPopoverManager: networkProtectionPopoverManager, networkProtectionStatusReporter: networkProtectionStatusReporter, autofillPopoverPresenter: autofillPopoverPresenter)
+#else
+        navigationBarViewController = NavigationBarViewController.create(tabCollectionViewModel: tabCollectionViewModel, isBurner: isBurner, autofillPopoverPresenter: AutofillPopoverPresenter)
+#endif
+
         browserTabViewController = BrowserTabViewController(tabCollectionViewModel: tabCollectionViewModel, bookmarkManager: bookmarkManager)
         findInPageViewController = FindInPageViewController.create()
         fireViewController = FireViewController.create(tabCollectionViewModel: tabCollectionViewModel)
@@ -560,7 +600,7 @@ extension MainViewController {
     ]))
     bkman.loadBookmarks()
 
-    let vc = MainViewController(bookmarkManager: bkman)
+    let vc = MainViewController(bookmarkManager: bkman, autofillPopoverPresenter: DefaultAutofillPopoverPresenter())
     var c: AnyCancellable!
     c = vc.publisher(for: \.view.window).sink { window in
         window?.titlebarAppearsTransparent = true
diff --git a/DuckDuckGo/Menus/MainMenu.swift b/DuckDuckGo/Menus/MainMenu.swift
index dac124ab05..d6d7ac227a 100644
--- a/DuckDuckGo/Menus/MainMenu.swift
+++ b/DuckDuckGo/Menus/MainMenu.swift
@@ -609,8 +609,10 @@ import SubscriptionUI
 #endif
 
 #if NETWORK_PROTECTION
-            NSMenuItem(title: "VPN")
-                .submenu(NetworkProtectionDebugMenu())
+            if case .normal = NSApp.runType {
+                NSMenuItem(title: "VPN")
+                    .submenu(NetworkProtectionDebugMenu())
+            }
 #endif
 
             NSMenuItem(title: "Trigger Fatal Error", action: #selector(MainViewController.triggerFatalError))
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift b/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift
index 593fb76fbf..b8607c8f85 100644
--- a/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift
+++ b/DuckDuckGo/NavigationBar/View/NavigationBarPopovers.swift
@@ -27,7 +27,30 @@ import NetworkProtectionUI
 import NetworkProtectionIPC
 #endif
 
-final class NavigationBarPopovers {
+protocol PopoverPresenter {
+    func show(_ popover: NSPopover, positionedBelow view: NSView)
+}
+
+#if NETWORK_PROTECTION
+protocol NetPPopoverManager: AnyObject {
+    var ipcClient: NetworkProtectionIPCClient { get }
+    var isShown: Bool { get }
+
+    func show(positionedBelow view: NSView, withDelegate delegate: NSPopoverDelegate)
+    func close()
+
+    func toggle(positionedBelow view: NSView, withDelegate delegate: NSPopoverDelegate)
+}
+#endif
+
+extension PopoverPresenter {
+    func show(_ popover: NSPopover, positionedBelow view: NSView) {
+        view.isHidden = false
+        popover.show(positionedBelow: view.bounds.insetFromLineOfDeath(flipped: view.isFlipped), in: view)
+    }
+}
+
+final class NavigationBarPopovers: PopoverPresenter {
 
     enum Constants {
         static let downloadsPopoverAutoHidingInterval: TimeInterval = 10
@@ -37,20 +60,26 @@ final class NavigationBarPopovers {
     private(set) var saveCredentialsPopover: SaveCredentialsPopover?
     private(set) var saveIdentityPopover: SaveIdentityPopover?
     private(set) var savePaymentMethodPopover: SavePaymentMethodPopover?
-    private(set) var passwordManagementPopover: PasswordManagementPopover?
+    private(set) var autofillPopoverPresenter: AutofillPopoverPresenter
     private(set) var downloadsPopover: DownloadsPopover?
 
 #if NETWORK_PROTECTION
-    private let networkProtectionPopoverManager: NetworkProtectionNavBarPopoverManager
+    private let networkProtectionPopoverManager: NetPPopoverManager
 
-    init(networkProtectionPopoverManager: NetworkProtectionNavBarPopoverManager) {
+    init(networkProtectionPopoverManager: NetPPopoverManager, autofillPopoverPresenter: AutofillPopoverPresenter) {
         self.networkProtectionPopoverManager = networkProtectionPopoverManager
+        self.autofillPopoverPresenter = autofillPopoverPresenter
+    }
+
+#else
+    init(passwordPopoverPresenter: PasswordPopoverPresenter) {
+        self.passwordPopoverPresenter = passwordPopoverPresenter
     }
 #endif
 
     var passwordManagementDomain: String? {
         didSet {
-            passwordManagementPopover?.viewController.domain = passwordManagementDomain
+            autofillPopoverPresenter.passwordDomain = passwordManagementDomain
         }
     }
 
@@ -63,11 +92,11 @@ final class NavigationBarPopovers {
     }
 
     var isPasswordManagementDirty: Bool {
-        passwordManagementPopover?.viewController.isDirty ?? false
+        autofillPopoverPresenter.popoverIsDirty
     }
 
     var isPasswordManagementPopoverShown: Bool {
-        passwordManagementPopover?.isShown ?? false
+        autofillPopoverPresenter.popoverIsShown
     }
 
     @MainActor
@@ -92,8 +121,8 @@ final class NavigationBarPopovers {
     }
 
     func passwordManagementButtonPressed(usingView view: NSView, withDelegate delegate: NSPopoverDelegate) {
-        if passwordManagementPopover?.isShown == true {
-            passwordManagementPopover?.close()
+        if autofillPopoverPresenter.popoverIsShown == true && view.window == autofillPopoverPresenter.popoverPresentingWindow  {
+            autofillPopoverPresenter.dismiss()
         } else {
             showPasswordManagementPopover(selectedCategory: nil, usingView: view, withDelegate: delegate)
         }
@@ -152,8 +181,8 @@ final class NavigationBarPopovers {
             bookmarkListPopover?.close()
         }
 
-        if passwordManagementPopover?.isShown ?? false {
-            passwordManagementPopover?.close()
+        if autofillPopoverPresenter.popoverIsShown {
+            autofillPopoverPresenter.dismiss()
         }
 
         if downloadsPopover?.isShown ?? false {
@@ -187,20 +216,11 @@ final class NavigationBarPopovers {
     func showPasswordManagementPopover(selectedCategory: SecureVaultSorting.Category?, usingView view: NSView, withDelegate delegate: NSPopoverDelegate) {
         guard closeTransientPopovers() else { return }
 
-        let popover = passwordManagementPopover ?? PasswordManagementPopover()
-        passwordManagementPopover = popover
-        popover.viewController.domain = passwordManagementDomain
-        popover.delegate = delegate
-        show(popover, positionedBelow: view)
-        popover.select(category: selectedCategory)
+        autofillPopoverPresenter.show(positionedBelow: view, withDomain: passwordManagementDomain, selectedCategory: selectedCategory)
     }
 
     func showPasswordManagerPopover(selectedWebsiteAccount: SecureVaultModels.WebsiteAccount, usingView view: NSView, withDelegate delegate: NSPopoverDelegate) {
-        let popover = passwordManagementPopover ?? PasswordManagementPopover()
-        passwordManagementPopover = popover
-        popover.delegate = delegate
-        show(popover, positionedBelow: view)
-        popover.select(websiteAccount: selectedWebsiteAccount)
+        autofillPopoverPresenter.show(positionedBelow: view, withSelectedAccount: selectedWebsiteAccount)
     }
 
     func hasAnySavePopoversVisible() -> Bool {
@@ -236,10 +256,6 @@ final class NavigationBarPopovers {
         bookmarkListPopover = nil
     }
 
-    func passwordManagementPopoverClosed() {
-        passwordManagementPopover = nil
-    }
-
     func saveIdentityPopoverClosed() {
         saveIdentityPopover = nil
     }
@@ -273,7 +289,7 @@ final class NavigationBarPopovers {
         show(popover, positionedBelow: view)
     }
 
-    private func show(_ popover: NSPopover, positionedBelow view: NSView) {
+    func show(_ popover: NSPopover, positionedBelow view: NSView) {
         view.isHidden = false
 
         popover.show(positionedBelow: view.bounds.insetFromLineOfDeath(flipped: view.isFlipped), in: view)
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
index b45ee536a9..aa050d3a98 100644
--- a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
+++ b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
@@ -113,23 +113,22 @@ final class NavigationBarViewController: NSViewController {
 #endif
 
 #if NETWORK_PROTECTION
-    static func create(tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool, networkProtectionFeatureActivation: NetworkProtectionFeatureActivation = NetworkProtectionKeychainTokenStore(), downloadListCoordinator: DownloadListCoordinator = .shared) -> NavigationBarViewController {
+    static func create(tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool,
+                       networkProtectionFeatureActivation: NetworkProtectionFeatureActivation = NetworkProtectionKeychainTokenStore(),
+                       downloadListCoordinator: DownloadListCoordinator = .shared,
+                       networkProtectionPopoverManager: NetPPopoverManager,
+                       networkProtectionStatusReporter: NetworkProtectionStatusReporter,
+                       autofillPopoverPresenter: AutofillPopoverPresenter) -> NavigationBarViewController {
         NSStoryboard(name: "NavigationBar", bundle: nil).instantiateInitialController { coder in
-            self.init(coder: coder, tabCollectionViewModel: tabCollectionViewModel, isBurner: isBurner, networkProtectionFeatureActivation: networkProtectionFeatureActivation, downloadListCoordinator: downloadListCoordinator)
+            self.init(coder: coder, tabCollectionViewModel: tabCollectionViewModel, isBurner: isBurner, networkProtectionFeatureActivation: networkProtectionFeatureActivation, downloadListCoordinator: downloadListCoordinator, networkProtectionPopoverManager: networkProtectionPopoverManager, networkProtectionStatusReporter: networkProtectionStatusReporter, autofillPopoverPresenter: autofillPopoverPresenter)
         }!
     }
 
-    init?(coder: NSCoder, tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool, networkProtectionFeatureActivation: NetworkProtectionFeatureActivation, downloadListCoordinator: DownloadListCoordinator) {
+    init?(coder: NSCoder, tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool, networkProtectionFeatureActivation: NetworkProtectionFeatureActivation, downloadListCoordinator: DownloadListCoordinator, networkProtectionPopoverManager: NetPPopoverManager, networkProtectionStatusReporter: NetworkProtectionStatusReporter, autofillPopoverPresenter: AutofillPopoverPresenter) {
 
-        let vpnBundleID = Bundle.main.vpnMenuAgentBundleId
-        let ipcClient = TunnelControllerIPCClient(machServiceName: vpnBundleID)
-        ipcClient.register()
-
-        let networkProtectionPopoverManager = NetworkProtectionNavBarPopoverManager(ipcClient: ipcClient)
-
-        self.popovers = NavigationBarPopovers(networkProtectionPopoverManager: networkProtectionPopoverManager)
+        self.popovers = NavigationBarPopovers(networkProtectionPopoverManager: networkProtectionPopoverManager, autofillPopoverPresenter: autofillPopoverPresenter)
         self.tabCollectionViewModel = tabCollectionViewModel
-        self.networkProtectionButtonModel = NetworkProtectionNavBarButtonModel(popoverManager: networkProtectionPopoverManager)
+        self.networkProtectionButtonModel = NetworkProtectionNavBarButtonModel(popoverManager: networkProtectionPopoverManager, statusReporter: networkProtectionStatusReporter)
         self.isBurner = isBurner
         self.networkProtectionFeatureActivation = networkProtectionFeatureActivation
         self.downloadListCoordinator = downloadListCoordinator
@@ -138,14 +137,15 @@ final class NavigationBarViewController: NSViewController {
         super.init(coder: coder)
     }
 #else
-    static func create(tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool, downloadListCoordinator: DownloadListCoordinator = .shared) -> NavigationBarViewController {
+    static func create(tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool, downloadListCoordinator: DownloadListCoordinator = .shared, autofillPopoverPresenter: AutofillPopoverPresenter) -> NavigationBarViewController {
         NSStoryboard(name: "NavigationBar", bundle: nil).instantiateInitialController { coder in
-            self.init(coder: coder, tabCollectionViewModel: tabCollectionViewModel, isBurner: isBurner, downloadListCoordinator: downloadListCoordinator)
+            self.init(coder: coder, tabCollectionViewModel: tabCollectionViewModel, isBurner: isBurner, downloadListCoordinator: downloadListCoordinator, passwordPopoverPresenter: passwordPopoverPresenter)
         }!
     }
 
-    init?(coder: NSCoder, tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool, downloadListCoordinator: DownloadListCoordinator) {
-        self.popovers = NavigationBarPopovers()
+    init?(coder: NSCoder, tabCollectionViewModel: TabCollectionViewModel, isBurner: Bool, downloadListCoordinator: DownloadListCoordinator,
+          autofillPopoverPresenter: AutofillPopoverPresenter) {
+        self.popovers = NavigationBarPopovers(autofillPopoverPresenter: autofillPopoverPresenter)
         self.tabCollectionViewModel = tabCollectionViewModel
         self.isBurner = isBurner
         self.downloadListCoordinator = downloadListCoordinator
@@ -1109,8 +1109,6 @@ extension NavigationBarViewController: NSPopoverDelegate {
         } else if let popover = popovers.bookmarkListPopover, notification.object as AnyObject? === popover {
             popovers.bookmarkListPopoverClosed()
             updateBookmarksButton()
-        } else if let popover = popovers.passwordManagementPopover, notification.object as AnyObject? === popover {
-            popovers.passwordManagementPopoverClosed()
         } else if let popover = popovers.saveIdentityPopover, notification.object as AnyObject? === popover {
             popovers.saveIdentityPopoverClosed()
             updatePasswordManagementButton()
diff --git a/DuckDuckGo/NavigationBar/View/NetPPopoverManagerMock.swift b/DuckDuckGo/NavigationBar/View/NetPPopoverManagerMock.swift
new file mode 100644
index 0000000000..ef82b84da6
--- /dev/null
+++ b/DuckDuckGo/NavigationBar/View/NetPPopoverManagerMock.swift
@@ -0,0 +1,82 @@
+//
+//  NetPPopoverManagerMock.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#if DEBUG && NETWORK_PROTECTION
+
+import Combine
+import Foundation
+import NetworkProtection
+
+final class NetPPopoverManagerMock: NetPPopoverManager {
+    var isShown: Bool { false }
+    var ipcClient: NetworkProtectionIPCClient = IPCClientMock()
+
+    func toggle(positionedBelow view: NSView, withDelegate delegate: NSPopoverDelegate) {}
+    func show(positionedBelow view: NSView, withDelegate delegate: any NSPopoverDelegate) {}
+    func close() {}
+}
+
+final class IPCClientMock: NetworkProtectionIPCClient {
+
+    final class ConnectionStatusObserverMock: NetworkProtection.ConnectionStatusObserver {
+        var publisher: AnyPublisher<NetworkProtection.ConnectionStatus, Never> = PassthroughSubject().eraseToAnyPublisher()
+        var recentValue: NetworkProtection.ConnectionStatus = .notConfigured
+    }
+    var ipcStatusObserver: any NetworkProtection.ConnectionStatusObserver = ConnectionStatusObserverMock()
+
+    final class ConnectionServerInfoObserverMock: NetworkProtection.ConnectionServerInfoObserver {
+        var publisher: AnyPublisher<NetworkProtection.NetworkProtectionStatusServerInfo, Never> = PassthroughSubject().eraseToAnyPublisher()
+        var recentValue: NetworkProtection.NetworkProtectionStatusServerInfo = .unknown
+    }
+    var ipcServerInfoObserver: any NetworkProtection.ConnectionServerInfoObserver = ConnectionServerInfoObserverMock()
+
+    final class ConnectionErrorObserverMock: NetworkProtection.ConnectionErrorObserver {
+        var publisher: AnyPublisher<String?, Never> = PassthroughSubject().eraseToAnyPublisher()
+        var recentValue: String?
+    }
+    var ipcConnectionErrorObserver: any NetworkProtection.ConnectionErrorObserver = ConnectionErrorObserverMock()
+
+    final class ConnectivityIssueObserverMock: NetworkProtection.ConnectivityIssueObserver {
+        var publisher: AnyPublisher<Bool, Never> = PassthroughSubject().eraseToAnyPublisher()
+        var recentValue: Bool = false
+    }
+    var ipcConnectivityIssuesObserver: any NetworkProtection.ConnectivityIssueObserver = ConnectivityIssueObserverMock()
+
+    final class ControllerErrorMesssageObserverMock: NetworkProtection.ControllerErrorMesssageObserver {
+        var publisher: AnyPublisher<String?, Never> = PassthroughSubject().eraseToAnyPublisher()
+        var recentValue: String?
+    }
+    var ipcControllerErrorMessageObserver: any NetworkProtection.ControllerErrorMesssageObserver = ControllerErrorMesssageObserverMock()
+
+    func start() {}
+
+    func stop() {}
+
+}
+
+final class ConnectivityIssueObserverMock: ConnectivityIssueObserver {
+    var publisher: AnyPublisher<Bool, Never> = PassthroughSubject().eraseToAnyPublisher()
+    var recentValue = false
+}
+
+final class ControllerErrorMesssageObserverMock: ControllerErrorMesssageObserver {
+    var publisher: AnyPublisher<String?, Never> = PassthroughSubject().eraseToAnyPublisher()
+    var recentValue: String?
+}
+
+#endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
index 32c25df9b5..c756d18ac6 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
@@ -31,15 +31,9 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
 
     private let networkProtectionStatusReporter: NetworkProtectionStatusReporter
     private var status: NetworkProtection.ConnectionStatus = .default
-    private let popoverManager: NetworkProtectionNavBarPopoverManager
+    private let popoverManager: NetPPopoverManager
     private let waitlistActivationDateStore: DefaultWaitlistActivationDateStore
 
-    // MARK: - IPC
-
-    public var ipcClient: TunnelControllerIPCClient {
-        popoverManager.ipcClient
-    }
-
     // MARK: - Subscriptions
 
     private var cancellables = Set<AnyCancellable>()
@@ -76,23 +70,13 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
 
     // MARK: - Initialization
 
-    init(popoverManager: NetworkProtectionNavBarPopoverManager,
+    init(popoverManager: NetPPopoverManager,
          pinningManager: PinningManager = LocalPinningManager.shared,
-         statusReporter: NetworkProtectionStatusReporter? = nil,
+         statusReporter: NetworkProtectionStatusReporter,
          iconProvider: IconProvider = NavigationBarIconProvider()) {
 
         self.popoverManager = popoverManager
-
-        let ipcClient = popoverManager.ipcClient
-
         self.networkProtectionStatusReporter = statusReporter
-            ?? DefaultNetworkProtectionStatusReporter(
-                statusObserver: ipcClient.connectionStatusObserver,
-                serverInfoObserver: ipcClient.serverInfoObserver,
-                connectionErrorObserver: ipcClient.connectionErrorObserver,
-                connectivityIssuesObserver: DisabledConnectivityIssueObserver(),
-                controllerErrorMessageObserver: ControllerErrorMesssageObserverThroughDistributedNotifications()
-        )
         self.iconPublisher = NetworkProtectionIconPublisher(statusReporter: networkProtectionStatusReporter, iconProvider: iconProvider)
         self.pinningManager = pinningManager
         self.shortcutTitle = pinningManager.shortcutTitle(for: .networkProtection)
@@ -125,6 +109,9 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
     /// This will be removed once the waitlist beta has ended.
     private func buttonImageFromWaitlistState(icon: NetworkProtectionAsset?) -> NSImage {
         let icon = icon ?? iconPublisher.icon
+#if DEBUG
+        guard [.normal, .integrationTests].contains(NSApp.runType) else { return NSImage() }
+#endif
 
         let isWaitlistUser = NetworkProtectionWaitlist().waitlistStorage.isWaitlistUser
         let hasAuthToken = NetworkProtectionKeychainTokenStore().isFeatureActivated
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift
index 1d5a18c48c..16853163e8 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarPopoverManager.swift
@@ -25,11 +25,26 @@ import NetworkProtectionIPC
 import NetworkProtectionUI
 
 #if NETWORK_PROTECTION
-final class NetworkProtectionNavBarPopoverManager {
+
+protocol NetworkProtectionIPCClient {
+    var ipcStatusObserver: ConnectionStatusObserver { get }
+    var ipcServerInfoObserver: ConnectionServerInfoObserver { get }
+    var ipcConnectionErrorObserver: ConnectionErrorObserver { get }
+
+    func start()
+    func stop()
+}
+extension TunnelControllerIPCClient: NetworkProtectionIPCClient {
+    public var ipcStatusObserver: any NetworkProtection.ConnectionStatusObserver { connectionStatusObserver }
+    public var ipcServerInfoObserver: any NetworkProtection.ConnectionServerInfoObserver { serverInfoObserver }
+    public var ipcConnectionErrorObserver: any NetworkProtection.ConnectionErrorObserver { connectionErrorObserver }
+}
+
+final class NetworkProtectionNavBarPopoverManager: NetPPopoverManager {
     private var networkProtectionPopover: NetworkProtectionPopover?
-    let ipcClient: TunnelControllerIPCClient
+    let ipcClient: NetworkProtectionIPCClient
 
-    init(ipcClient: TunnelControllerIPCClient) {
+    init(ipcClient: NetworkProtectionIPCClient) {
         self.ipcClient = ipcClient
     }
 
@@ -55,9 +70,9 @@ final class NetworkProtectionNavBarPopoverManager {
             let controller = NetworkProtectionIPCTunnelController(ipcClient: ipcClient)
 
             let statusReporter = DefaultNetworkProtectionStatusReporter(
-                statusObserver: ipcClient.connectionStatusObserver,
-                serverInfoObserver: ipcClient.serverInfoObserver,
-                connectionErrorObserver: ipcClient.connectionErrorObserver,
+                statusObserver: ipcClient.ipcStatusObserver,
+                serverInfoObserver: ipcClient.ipcServerInfoObserver,
+                connectionErrorObserver: ipcClient.ipcConnectionErrorObserver,
                 connectivityIssuesObserver: ConnectivityIssueObserverThroughDistributedNotifications(),
                 controllerErrorMessageObserver: ControllerErrorMesssageObserverThroughDistributedNotifications()
             )
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
index bfe8f7ce36..c61b63d7b3 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
@@ -25,10 +25,10 @@ import NetworkProtectionIPC
 final class NetworkProtectionIPCTunnelController: TunnelController {
 
     private let loginItemsManager: LoginItemsManager
-    private let ipcClient: TunnelControllerIPCClient
+    private let ipcClient: NetworkProtectionIPCClient
 
     init(loginItemsManager: LoginItemsManager = LoginItemsManager(),
-         ipcClient: TunnelControllerIPCClient) {
+         ipcClient: NetworkProtectionIPCClient) {
 
         self.loginItemsManager = loginItemsManager
         self.ipcClient = ipcClient
@@ -54,7 +54,7 @@ final class NetworkProtectionIPCTunnelController: TunnelController {
     ///
     var isConnected: Bool {
         get {
-            if case .connected = ipcClient.connectionStatusObserver.recentValue {
+            if case .connected = ipcClient.ipcStatusObserver.recentValue {
                 return true
             }
 
diff --git a/DuckDuckGo/SecureVault/View/AutofillPopoverPresenter.swift b/DuckDuckGo/SecureVault/View/AutofillPopoverPresenter.swift
new file mode 100644
index 0000000000..871641ebb0
--- /dev/null
+++ b/DuckDuckGo/SecureVault/View/AutofillPopoverPresenter.swift
@@ -0,0 +1,84 @@
+//
+//  AutofillPopoverPresenter.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import BrowserServicesKit
+import Foundation
+
+protocol AutofillPopoverPresenter {
+    var passwordDomain: String? { get set }
+    var popoverIsDirty: Bool { get }
+    var popoverIsShown: Bool { get }
+    var popoverPresentingWindow: NSWindow? { get }
+    func show(positionedBelow view: NSView, withDomain domain: String?, selectedCategory category: SecureVaultSorting.Category?)
+    func show(positionedBelow view: NSView, withSelectedAccount: SecureVaultModels.WebsiteAccount)
+    func dismiss()
+}
+
+final class DefaultAutofillPopoverPresenter: AutofillPopoverPresenter, PopoverPresenter {
+
+    private var popover: PasswordManagementPopover?
+
+    var passwordDomain: String? {
+        get {
+            popover?.viewController.domain
+        } set {
+            popover?.viewController.domain = newValue
+        }
+    }
+
+    /// Property indicating whether the popover view controller is "dirty", i.e it's state has been edited but is unsaved
+    var popoverIsDirty: Bool {
+        popover?.viewController.isDirty ?? false
+    }
+
+    var popoverIsShown: Bool {
+        popover?.isShown ?? false
+    }
+
+    var popoverPresentingWindow: NSWindow? {
+        popover?.mainWindow
+    }
+
+    /// Note: Dismisses any previously displayed popover before showing a new one
+    func show(positionedBelow view: NSView, withDomain domain: String?, selectedCategory category: SecureVaultSorting.Category?) {
+        show(under: view, withDomain: domain).select(category: category)
+    }
+
+    func show(positionedBelow view: NSView, withSelectedAccount account: SecureVaultModels.WebsiteAccount) {
+        show(under: view, withDomain: nil).select(websiteAccount: account)
+    }
+
+    func dismiss() {
+        guard popoverIsShown, let popover else { return }
+        popover.close()
+        self.popover = nil
+    }
+}
+
+private extension DefaultAutofillPopoverPresenter {
+
+    func show(under view: NSView, withDomain domain: String?) -> PasswordManagementPopover {
+        dismiss()
+
+        let popover = PasswordManagementPopover()
+        self.popover = popover
+        popover.viewController.domain = domain
+        show(popover, positionedBelow: view)
+        return popover
+    }
+}
diff --git a/DuckDuckGo/SecureVault/View/PasswordManagementPopover.swift b/DuckDuckGo/SecureVault/View/PasswordManagementPopover.swift
index f25f41632e..7e439c1e25 100644
--- a/DuckDuckGo/SecureVault/View/PasswordManagementPopover.swift
+++ b/DuckDuckGo/SecureVault/View/PasswordManagementPopover.swift
@@ -23,8 +23,6 @@ import SwiftUI
 
 final class PasswordManagementPopover: NSPopover {
 
-    private var cancellables = Set<AnyCancellable>()
-
     override init() {
         super.init()
 
@@ -61,23 +59,6 @@ final class PasswordManagementPopover: NSPopover {
 
 extension PasswordManagementPopover: NSPopoverDelegate {
 
-    func popoverDidShow(_ notification: Notification) {
-        NotificationCenter.default.publisher(for: NSWindow.didResignMainNotification)
-            .receive(on: DispatchQueue.main)
-            .sink { [weak self] _ in
-                guard let self = self, self.isShown else { return }
-
-                if !DeviceAuthenticator.shared.isAuthenticating {
-                    self.close()
-                }
-            }
-            .store(in: &cancellables)
-    }
-
-    func popoverShouldClose(_ popover: NSPopover) -> Bool {
-        return !DeviceAuthenticator.shared.isAuthenticating
-    }
-
     func popoverDidClose(_ notification: Notification) {
         if let window = viewController.view.window {
             for sheet in window.sheets {
diff --git a/DuckDuckGo/Windows/View/WindowsManager.swift b/DuckDuckGo/Windows/View/WindowsManager.swift
index bfe93e0329..cb622baed4 100644
--- a/DuckDuckGo/Windows/View/WindowsManager.swift
+++ b/DuckDuckGo/Windows/View/WindowsManager.swift
@@ -30,6 +30,9 @@ final class WindowsManager {
         NSApplication.shared.windows.compactMap { $0 as? MainWindow }
     }
 
+    // Shared type to enable managing `PasswordManagementPopover`s in multiple windows
+    private static let autofillPopoverPresenter: AutofillPopoverPresenter = DefaultAutofillPopoverPresenter()
+
     class func closeWindows(except windows: [NSWindow] = []) {
         for controller in WindowControllersManager.shared.mainWindowControllers {
             guard let window = controller.window, !windows.contains(window) else { continue }
@@ -61,7 +64,8 @@ final class WindowsManager {
                              lazyLoadTabs: Bool = false) -> MainWindow? {
         let mainWindowController = makeNewWindow(tabCollectionViewModel: tabCollectionViewModel,
                                                  popUp: popUp,
-                                                 burnerMode: burnerMode)
+                                                 burnerMode: burnerMode,
+                                                 autofillPopoverPresenter: autofillPopoverPresenter)
 
         if let contentSize {
             mainWindowController.window?.setContentSize(contentSize)
@@ -161,8 +165,9 @@ final class WindowsManager {
     private class func makeNewWindow(tabCollectionViewModel: TabCollectionViewModel? = nil,
                                      contentSize: NSSize? = nil,
                                      popUp: Bool = false,
-                                     burnerMode: BurnerMode) -> MainWindowController {
-        let mainViewController = MainViewController(tabCollectionViewModel: tabCollectionViewModel ?? TabCollectionViewModel(burnerMode: burnerMode))
+                                     burnerMode: BurnerMode,
+                                     autofillPopoverPresenter: AutofillPopoverPresenter) -> MainWindowController {
+        let mainViewController = MainViewController(tabCollectionViewModel: tabCollectionViewModel ?? TabCollectionViewModel(burnerMode: burnerMode), autofillPopoverPresenter: autofillPopoverPresenter)
 
         var contentSize = contentSize ?? NSSize(width: 1024, height: 790)
         contentSize.width = min(NSScreen.main?.frame.size.width ?? 1024, max(contentSize.width, 300))
diff --git a/UnitTests/Geolocation/CLLocationManagerMock.swift b/UnitTests/Geolocation/CLLocationManagerMock.swift
index bf61216d4f..6921d58667 100644
--- a/UnitTests/Geolocation/CLLocationManagerMock.swift
+++ b/UnitTests/Geolocation/CLLocationManagerMock.swift
@@ -103,4 +103,21 @@ final class CLLocationManagerMock: CLLocationManager {
         isUpdatingHeading = true
     }
 
+    override func requestLocation() {
+        fatalError("Unexpected call")
+    }
+
+    var whenInUseAuthorizationRequested: (() -> Void)!
+    override func requestWhenInUseAuthorization() {
+        whenInUseAuthorizationRequested!()
+    }
+
+    override func requestAlwaysAuthorization() {
+        fatalError("Unexpected call")
+    }
+
+    override func requestTemporaryFullAccuracyAuthorization(withPurposeKey purposeKey: String, completion: (((any Error)?) -> Void)? = nil) {
+        fatalError("Unexpected call")
+    }
+
 }
diff --git a/UnitTests/Geolocation/GeolocationServiceTests.swift b/UnitTests/Geolocation/GeolocationServiceTests.swift
index af0e5fe74a..b0547f2a95 100644
--- a/UnitTests/Geolocation/GeolocationServiceTests.swift
+++ b/UnitTests/Geolocation/GeolocationServiceTests.swift
@@ -196,8 +196,13 @@ final class GeolocationServiceTests: XCTestCase {
     }
 
     func testWhenLastSubscriberUnsubscribedThenLocationManagerStopped() {
+        let eAuthRequested = expectation(description: "Authorization requested")
+        locationManagerMock.whenInUseAuthorizationRequested = { eAuthRequested.fulfill() }
+
         let c1 = service.locationPublisher.sink { _ in }
         _=service.locationPublisher.sink { _ in }
+        waitForExpectations(timeout: 0)
+
         let c3 = service.locationPublisher.sink { [locationManagerMock] _ in
             XCTAssertTrue(locationManagerMock!.isUpdatingLocation)
         }
@@ -211,6 +216,8 @@ final class GeolocationServiceTests: XCTestCase {
         let loc1 = CLLocation(latitude: 51.1, longitude: 23.4)
         let loc2 = CLLocation(latitude: 11.1, longitude: -12.2)
 
+        let eAuthRequested = expectation(description: "Authorization requested")
+        locationManagerMock.whenInUseAuthorizationRequested = { eAuthRequested.fulfill() }
         let c1 = service.locationPublisher.sink { _ in }
         var c2: AnyCancellable! = service.locationPublisher.sink { _ in }
         let e = expectation(description: "expect still receiving location")
@@ -235,6 +242,7 @@ final class GeolocationServiceTests: XCTestCase {
 
     func testWhenResubscribedThenLastLocationIsPublished() {
         let location = CLLocation(latitude: 51.1, longitude: 23.4)
+        locationManagerMock.whenInUseAuthorizationRequested = { }
         let c1 = service.locationPublisher.sink { _ in }
         locationManagerMock.currentLocation = location
         c1.cancel()
@@ -248,8 +256,9 @@ final class GeolocationServiceTests: XCTestCase {
         waitForExpectations(timeout: 0)
     }
 
-    func testWhenAtoppedThenNoErrorIsPublished() {
+    func testWhenStoppedThenNoErrorIsPublished() {
         let location = CLLocation(latitude: 51.1, longitude: 23.4)
+        locationManagerMock.whenInUseAuthorizationRequested = { }
         let c1 = service.locationPublisher.sink { _ in }
         locationManagerMock.currentLocation = location
         c1.cancel()
@@ -267,6 +276,8 @@ final class GeolocationServiceTests: XCTestCase {
     }
 
     func testWhenHighAccuracyRequestedThenAccuracyIsSetToBest() {
+        let eAuthRequested = expectation(description: "Authorization requested")
+        locationManagerMock.whenInUseAuthorizationRequested = { eAuthRequested.fulfill() }
         let c1 = service.locationPublisher.sink { _ in }
         XCTAssertEqual(locationManagerMock.desiredAccuracy, kCLLocationAccuracyHundredMeters)
 
@@ -276,6 +287,7 @@ final class GeolocationServiceTests: XCTestCase {
         c2.cancel()
         XCTAssertEqual(locationManagerMock.desiredAccuracy, kCLLocationAccuracyHundredMeters)
         withExtendedLifetime(c1) {}
+        waitForExpectations(timeout: 0)
     }
 
 }
diff --git a/UnitTests/NavigationBar/Mocks/MockAutofillPopoverPresenter.swift b/UnitTests/NavigationBar/Mocks/MockAutofillPopoverPresenter.swift
new file mode 100644
index 0000000000..c25d96950e
--- /dev/null
+++ b/UnitTests/NavigationBar/Mocks/MockAutofillPopoverPresenter.swift
@@ -0,0 +1,53 @@
+//
+//  MockAutofillPopoverPresenter.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import BrowserServicesKit
+@testable import DuckDuckGo_Privacy_Browser
+import Foundation
+
+final class MockAutofillPopoverPresenter: AutofillPopoverPresenter {
+
+    var didShowWithCategory = false
+    var didShowWithSelectedAccount = false
+    var didDismiss = false
+    var isDirty = false
+    var isShown = false
+
+    var passwordDomain: String?
+
+    var popoverIsDirty: Bool {
+        isDirty
+    }
+    var popoverIsShown: Bool {
+        isShown
+    }
+
+    var popoverPresentingWindow: NSWindow?
+
+    func show(positionedBelow view: NSView, withDomain domain: String?, selectedCategory category: DuckDuckGo_Privacy_Browser.SecureVaultSorting.Category?) {
+        didShowWithCategory = true
+    }
+
+    func show(positionedBelow view: NSView, withSelectedAccount: BrowserServicesKit.SecureVaultModels.WebsiteAccount) {
+        didShowWithSelectedAccount = true
+    }
+
+    func dismiss() {
+        didDismiss = true
+    }
+}
diff --git a/UnitTests/NavigationBar/View/NavigationBarPopoversTests.swift b/UnitTests/NavigationBar/View/NavigationBarPopoversTests.swift
new file mode 100644
index 0000000000..461c0109be
--- /dev/null
+++ b/UnitTests/NavigationBar/View/NavigationBarPopoversTests.swift
@@ -0,0 +1,104 @@
+//
+//  NavigationBarPopoversTests.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import BrowserServicesKit
+@testable import DuckDuckGo_Privacy_Browser
+import XCTest
+
+private final class MockNSPopoverDelegate: NSObject, NSPopoverDelegate {}
+
+final class NavigationBarPopoversTests: XCTestCase {
+
+    private var sut: NavigationBarPopovers!
+    private var autofillPopoverPresenter: MockAutofillPopoverPresenter!
+
+    override func setUpWithError() throws {
+        autofillPopoverPresenter = MockAutofillPopoverPresenter()
+
+        #if NETWORK_PROTECTION
+            sut = NavigationBarPopovers(networkProtectionPopoverManager: NetPPopoverManagerMock(), autofillPopoverPresenter: autofillPopoverPresenter)
+        #else
+            sut = NavigationBarPopovers(passwordPopoverPresenter: popoverPresenter)
+        #endif
+    }
+
+    func testSetsPasswordPopoverDomainOnPopover() throws {
+        // Given
+        let domain = "test"
+
+        // When
+        sut.passwordManagementDomain = domain
+
+        // Then
+        XCTAssertEqual(autofillPopoverPresenter.passwordDomain, domain)
+    }
+
+    func testGetsPasswordPopoverDirtyState() throws {
+        // When
+        var dirtyResult = sut.isPasswordManagementDirty
+
+        // Then
+        XCTAssertFalse(dirtyResult)
+
+        // Given
+        autofillPopoverPresenter.isDirty = true
+
+        // When
+        dirtyResult = sut.isPasswordManagementDirty
+
+        // Then
+        XCTAssertTrue(dirtyResult)
+    }
+
+    func testGetsPasswordPopoverShownState() throws {
+        // When
+        var displayedResult = sut.isPasswordManagementPopoverShown
+
+        // Then
+        XCTAssertFalse(displayedResult)
+
+        // Given
+        autofillPopoverPresenter.isShown = true
+
+        // When
+        displayedResult = sut.isPasswordManagementPopoverShown
+
+        // Then
+        XCTAssertTrue(displayedResult)
+    }
+
+    func testShowsPasswordPopoverWithCategory() throws {
+        // When
+        sut.showPasswordManagementPopover(selectedCategory: nil, usingView: NSView(), withDelegate: MockNSPopoverDelegate())
+
+        // Then
+        XCTAssertTrue(autofillPopoverPresenter.didShowWithCategory)
+    }
+
+    func testShowsPasswordPopoverWithSelectedWebsite() throws {
+        // Given
+        let account = SecureVaultModels.WebsiteAccount(id: "")
+
+        // When
+        sut.showPasswordManagerPopover(selectedWebsiteAccount: account, usingView: NSView(), withDelegate: MockNSPopoverDelegate())
+
+        // Then
+        XCTAssertTrue(autofillPopoverPresenter.didShowWithSelectedAccount)
+    }
+
+}
diff --git a/UnitTests/Preferences/AutofillPreferencesModelTests.swift b/UnitTests/Preferences/AutofillPreferencesModelTests.swift
index 044a56b252..79341abe79 100644
--- a/UnitTests/Preferences/AutofillPreferencesModelTests.swift
+++ b/UnitTests/Preferences/AutofillPreferencesModelTests.swift
@@ -46,13 +46,17 @@ final class UserAuthenticatorMock: UserAuthenticating {
     }
 }
 
-@MainActor
 final class AutofillPreferencesModelTests: XCTestCase {
 
+    func neverPromptWebsitesManager() throws -> AutofillNeverPromptWebsitesManager {
+        try AutofillNeverPromptWebsitesManager(secureVault: MockSecureVaultFactory.makeVault(errorReporter: nil))
+    }
+
+    @MainActor
     func testThatPreferencesArePersisted() throws {
         let persistor = AutofillPreferencesPersistorMock()
         let userAuthenticator = UserAuthenticatorMock()
-        let model = AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator)
+        let model = try AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator, neverPromptWebsitesManager: neverPromptWebsitesManager())
 
         model.askToSaveUsernamesAndPasswords.toggle()
         XCTAssertEqual(persistor.askToSaveUsernamesAndPasswords, model.askToSaveUsernamesAndPasswords)
@@ -64,10 +68,11 @@ final class AutofillPreferencesModelTests: XCTestCase {
         XCTAssertEqual(persistor.askToSavePaymentMethods, model.askToSavePaymentMethods)
     }
 
+    @MainActor
     func testWhenUserIsAuthenticatedThenAutoLockCanBeDisabled() throws {
         let persistor = AutofillPreferencesPersistorMock()
         let userAuthenticator = UserAuthenticatorMock()
-        let model = AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator)
+        let model = try AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator, neverPromptWebsitesManager: neverPromptWebsitesManager())
 
         userAuthenticator._authenticateUser = { _ in return .success}
 
@@ -76,10 +81,11 @@ final class AutofillPreferencesModelTests: XCTestCase {
         XCTAssertEqual(persistor.isAutoLockEnabled, model.isAutoLockEnabled)
     }
 
+    @MainActor
     func testWhenUserIsNotAuthenticatedThenAutoLockCannotBeDisabled() throws {
         let persistor = AutofillPreferencesPersistorMock()
         let userAuthenticator = UserAuthenticatorMock()
-        let model = AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator)
+        let model = try AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator, neverPromptWebsitesManager: neverPromptWebsitesManager())
 
         userAuthenticator._authenticateUser = { _ in return .failure}
 
@@ -88,10 +94,11 @@ final class AutofillPreferencesModelTests: XCTestCase {
         XCTAssertEqual(persistor.isAutoLockEnabled, model.isAutoLockEnabled)
     }
 
+    @MainActor
     func testWhenUserIsAuthenticatedThenAutoLockThresholdCanBeChanged() throws {
         let persistor = AutofillPreferencesPersistorMock()
         let userAuthenticator = UserAuthenticatorMock()
-        let model = AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator)
+        let model = try AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator, neverPromptWebsitesManager: neverPromptWebsitesManager())
 
         userAuthenticator._authenticateUser = { _ in return .success}
 
@@ -101,10 +108,11 @@ final class AutofillPreferencesModelTests: XCTestCase {
         XCTAssertEqual(persistor.autoLockThreshold, model.autoLockThreshold)
     }
 
+    @MainActor
     func testWhenUserIsNotAuthenticatedThenAutoLockThresholdCannotBeChanged() throws {
         let persistor = AutofillPreferencesPersistorMock()
         let userAuthenticator = UserAuthenticatorMock()
-        let model = AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator)
+        let model = try AutofillPreferencesModel(persistor: persistor, userAuthenticator: userAuthenticator, neverPromptWebsitesManager: neverPromptWebsitesManager())
 
         userAuthenticator._authenticateUser = { _ in return .failure}
 

From eb5a7598a7504567a12052a83191da69ceba5853 Mon Sep 17 00:00:00 2001
From: Sabrina Tardio <44158575+SabrinaTardio@users.noreply.github.com>
Date: Thu, 14 Mar 2024 12:32:55 +0100
Subject: [PATCH 05/30] Sabrina/surveys (#2380)

Task/Issue URL:
https://app.asana.com/0/1199230911884351/1206807075858541/f

**Description**: We want to invite app users to research interviews
[Invite design](https://app.asana.com/0/72649045549333/1206743222316770)
[Invite copy](https://app.asana.com/0/38424471409662/1206743222316766)
Survey links:
Day0
https://selfserve.decipherinc.com/survey/selfserve/32ab/240300?list=1
Day14
https://selfserve.decipherinc.com/survey/selfserve/32ab/240300?list=2

The invite needs to be shown to a very limited share of users at
different points of their usage journey, 10% of day-0 users, and 10%
day-14 users
Flow:
Users receive an invitation to participate in the survey. This invite
automatically disappears if it is dismissed, after 24 h, or if the user
clicks the participation button
Users who choose to participate are then redirected to our designated
survey platforms,
On the survey platform, committed participants have the option to share
their email addresses for further communication or updates
Users see 1 invite max
---
 .../Images/QandA-128.imageset/Contents.json   |  12 ++
 .../Images/QandA-128.imageset/QandA-128.svg   |   9 ++
 DuckDuckGo/Common/Localizables/UserText.swift |  12 +-
 .../Utilities/UserDefaultsWrapper.swift       |   4 +-
 .../Model/HomePageContinueSetUpModel.swift    | 116 +++++++++-----
 DuckDuckGo/Localizable.xcstrings              | 102 ++++++++----
 DuckDuckGo/Menus/MainMenu.swift               |   9 +-
 DuckDuckGo/Menus/MainMenuActions.swift        |  33 ++--
 .../Model/AppearancePreferences.swift         |   4 +-
 .../HomePage/ContinueSetUpModelTests.swift    | 147 +++++++++++++-----
 10 files changed, 319 insertions(+), 129 deletions(-)
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/QandA-128.imageset/Contents.json
 create mode 100644 DuckDuckGo/Assets.xcassets/Images/QandA-128.imageset/QandA-128.svg

diff --git a/DuckDuckGo/Assets.xcassets/Images/QandA-128.imageset/Contents.json b/DuckDuckGo/Assets.xcassets/Images/QandA-128.imageset/Contents.json
new file mode 100644
index 0000000000..e708cce2ed
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/QandA-128.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "QandA-128.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/Assets.xcassets/Images/QandA-128.imageset/QandA-128.svg b/DuckDuckGo/Assets.xcassets/Images/QandA-128.imageset/QandA-128.svg
new file mode 100644
index 0000000000..4e2ca57aaf
--- /dev/null
+++ b/DuckDuckGo/Assets.xcassets/Images/QandA-128.imageset/QandA-128.svg
@@ -0,0 +1,9 @@
+<svg fill="none" viewBox="0 0 128 96" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#888" d="m105.629 38.2 1.542-.4a.875.875 0 0 0 .629-.629l.4-1.543A.84.84 0 0 1 109 35c.4 0 .743.286.8.628l.4 1.543a.875.875 0 0 0 .629.629l1.542.4c.4.114.629.457.629.8 0 .4-.286.743-.629.8l-1.542.4a.875.875 0 0 0-.629.628l-.4 1.543a.84.84 0 0 1-.8.629c-.4 0-.743-.286-.8-.629l-.4-1.543a.875.875 0 0 0-.629-.628l-1.542-.4A.842.842 0 0 1 105 39c0-.4.286-.743.629-.8Zm-89.686-6.4 2.314-.6c.429-.086.857-.514.943-.943l.6-2.314c.171-.6.686-.943 1.2-.943.6 0 1.114.428 1.2.943l.6 2.314c.086.429.514.857.943.943l2.314.6c.6.171.943.686.943 1.2 0 .6-.429 1.114-.943 1.2l-2.314.6c-.429.086-.857.514-.943.943l-.6 2.314c-.171.6-.686.943-1.2.943-.6 0-1.114-.429-1.2-.943l-.6-2.314c-.086-.429-.514-.857-.943-.943l-2.314-.6c-.6-.172-.943-.686-.943-1.2 0-.6.429-1.114.943-1.2ZM.629 53.2l1.542-.4a.876.876 0 0 0 .629-.629l.4-1.543A.841.841 0 0 1 4 50c.4 0 .743.286.8.628l.4 1.543a.876.876 0 0 0 .629.629l1.542.4c.4.114.629.457.629.8 0 .4-.286.743-.629.8l-1.542.4a.875.875 0 0 0-.629.628l-.4 1.543A.841.841 0 0 1 4 58c-.4 0-.743-.286-.8-.629l-.4-1.543a.875.875 0 0 0-.629-.628L.63 54.8A.841.841 0 0 1 0 54c0-.4.286-.743.629-.8ZM126.5 52c-.825 0-1.5-.675-1.5-1.5s.675-1.5 1.5-1.5 1.5.675 1.5 1.5-.675 1.5-1.5 1.5ZM23 70c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2Z" opacity=".2"/>
+  <path fill="#557FF3" d="M73 35.045c1.641-.099 2.983-1.405 2.682-3.021-1.656-8.896-9.591-15.698-19.237-16.013V16h-4.89v.418c-9.175 1.856-16.063 9.686-16.063 19.063 0 6.221 3.032 11.761 7.751 15.328l-5.067 5.77c-.133.15-.238.308-.32.47H36.19v2.944h3.337a2.18 2.18 0 0 0 .61-.049 338.422 338.422 0 0 0 9.371-2.2c.88-.221 1.486-1.013 1.556-1.918.021-.277.048-.552.08-.826C52.387 44.219 61.588 35.733 73 35.045Z"/>
+  <path fill="#7295F6" d="M72.995 35.045C72.74 24.485 63.662 16 52.5 16 41.178 16 32 24.73 32 35.5c0 5.406 2.313 10.298 6.048 13.83.885.837 1.038 2.237.233 3.152l-3.597 4.097c-1.322 1.505.012 3.795 1.968 3.364 3.828-.845 8.934-2.032 13.678-3.327.416-.113.708-.483.744-.913.917-11.112 10.265-19.952 21.92-20.658Z"/>
+  <path fill="#fff" d="M52.57 49.398a22.174 22.174 0 0 1 2.916-5.123c-.575-1.338-1.93-2.315-3.468-2.315-2.04 0-3.76 1.72-3.76 3.72 0 2.04 1.72 3.76 3.76 3.76.187 0 .371-.014.552-.042ZM48.378 36.76c0 1.52.44 2.76 1.2 3.68l5.32-1.36c-.32-.32-.6-.92-.6-1.6 0-1.26 1.093-2.069 2.362-3.006 1.752-1.295 3.838-2.837 3.838-6.154 0-3.84-3.28-6.4-8.56-6.4-3.28 0-6.6 1.28-8.8 3.76l3.84 4.4c1.12-1.28 2.68-2.08 4.2-2.08 1.72 0 2.36.68 2.36 1.56 0 .799-.824 1.387-1.813 2.094-1.486 1.062-3.347 2.391-3.347 5.106Z"/>
+  <path fill="#4CBA3C" fill-rule="evenodd" d="M86.634 78.794c.823.195 1.476 1.168 2.321 1.205L89 80h2.997a.003.003 0 0 0 .003-.003c0-.002.002-.004.004-.004 1.643.107 2.67-1.861 1.511-3.18l-3.302-3.76c-.767-.873-.622-2.209.22-3.011 3.447-3.29 5.583-7.85 5.583-12.89 0-9.662-7.85-17.56-17.749-18.12a.016.016 0 0 1-.015-.016.016.016 0 0 0-.016-.016h-4.375a.164.164 0 0 0-.165.164c0 .08-.057.148-.135.163-8.71 1.61-15.291 8.979-15.291 17.826 0 7.318 4.502 13.624 10.987 16.497 3.895 1.753 11.198 3.682 17.377 5.144Z" clip-rule="evenodd"/>
+  <path fill="#63C853" fill-rule="evenodd" d="M87.134 70.007c-.856.775-1.016 2.105-.254 2.972l3.328 3.79c1.236 1.406-.012 3.546-1.838 3.13-6.928-1.577-18.269-4.377-22.734-6.732C59.336 70.236 55 64.097 55 57c0-9.941 8.507-18 19-18s19 8.059 19 18c0 5.114-2.251 9.73-5.866 13.007Z" clip-rule="evenodd"/>
+  <path fill="#fff" fill-rule="evenodd" d="M63.928 62.688C67.296 64.827 70.59 66 74 66c3.41 0 6.704-1.173 10.072-3.312l-2.144-3.376C78.997 61.173 76.44 62 74 62c-2.44 0-4.996-.827-7.928-2.688l-2.144 3.376ZM70.4 53.8c-.547-.486-1.419-.8-2.4-.8-.981 0-1.853.314-2.4.8a3 3 0 1 1 4.8 0Zm12 0c-.547-.486-1.419-.8-2.4-.8-.982 0-1.853.314-2.4.8a3 3 0 1 1 4.8 0Z" clip-rule="evenodd"/>
+</svg>
diff --git a/DuckDuckGo/Common/Localizables/UserText.swift b/DuckDuckGo/Common/Localizables/UserText.swift
index 8fad1dff04..a5149fcee7 100644
--- a/DuckDuckGo/Common/Localizables/UserText.swift
+++ b/DuckDuckGo/Common/Localizables/UserText.swift
@@ -974,23 +974,23 @@ struct UserText {
     static let newTabSetUpImportCardTitle = NSLocalizedString("newTab.setup.import.title", value: "Bring Your Stuff", comment: "Title of the Import card of the Set Up section in the home page")
     static let newTabSetUpDuckPlayerCardTitle = NSLocalizedString("newTab.setup.duck.player.title", value: "Clean Up YouTube", comment: "Title of the Duck Player card of the Set Up section in the home page")
     static let newTabSetUpEmailProtectionCardTitle = NSLocalizedString("newTab.setup.email.protection.title", value: "Protect Your Inbox", comment: "Title of the Email Protection card of the Set Up section in the home page")
-    static let newTabSetUpSurveyDay0CardTitle = NSLocalizedString("newTab.setup.survey.day.0.title", value: "Tell Us What Brought You Here", comment: "Title of the Day 0 durvey of the Set Up section in the home page")
-    static let newTabSetUpSurveyDay7CardTitle = NSLocalizedString("newTab.setup.survey.day.7.title", value: "Help Us Improve", comment: "Title of the Day 7 durvey of the Set Up section in the home page")
+    static let newTabSetUpSurveyDay0CardTitle = NSLocalizedString("newTab.setup.survey.day.0.title", value: "Share Your Thoughts With Us", comment: "Title of the Day 0 durvey of the Set Up section in the home page")
+    static let newTabSetUpSurveyDay14CardTitle = NSLocalizedString("newTab.setup.survey.day.14.title", value: "Share Your Thoughts With Us", comment: "Title of the Day 14 durvey of the Set Up section in the home page")
 
     static let newTabSetUpDefaultBrowserAction = NSLocalizedString("newTab.setup.default.browser.action", value: "Make Default Browser", comment: "Action title on the action menu of the Default Browser card")
     static let newTabSetUpImportAction = NSLocalizedString("newTab.setup.Import.action", value: "Import Now", comment: "Action title on the action menu of the Import card of the Set Up section in the home page")
     static let newTabSetUpDuckPlayerAction = NSLocalizedString("newTab.setup.duck.player.action", value: "Try Duck Player", comment: "Action title on the action menu of the Duck Player card of the Set Up section in the home page")
     static let newTabSetUpEmailProtectionAction = NSLocalizedString("newTab.setup.email.protection.action", value: "Get a Duck Address", comment: "Action title on the action menu of the Email Protection card of the Set Up section in the home page")
     static let newTabSetUpRemoveItemAction = NSLocalizedString("newTab.setup.remove.item", value: "Dismiss", comment: "Action title on the action menu of the set up cards card of the SetUp section in the home page to remove the item")
-    static let newTabSetUpSurveyDay0Action = NSLocalizedString("newTab.setup.survey.day.0.action", value: "Share Your Thoughts", comment: "Action title of the Day 0 durvey of the Set Up section in the home page")
-    static let newTabSetUpSurveyDay7Action = NSLocalizedString("newTab.setup.survey.day.7.action", value: "Share Your Thoughts", comment: "Action title of the Day 7 durvey of the Set Up section in the home page")
+    static let newTabSetUpSurveyDay0Action = NSLocalizedString("newTab.setup.survey.day.0.action", value: "Sign Up To Participate", comment: "Action title of the Day 0 survey of the Set Up section in the home page")
+    static let newTabSetUpSurveyDay14Action = NSLocalizedString("newTab.setup.survey.day.14.action", value: "Sign Up To Participate", comment: "Action title of the Day 14 survey of the Set Up section in the home page")
 
     static let newTabSetUpDefaultBrowserSummary = NSLocalizedString("newTab.setup.default.browser.summary", value: "We automatically block trackers as you browse. It's privacy, simplified.", comment: "Summary of the Default Browser card")
     static let newTabSetUpImportSummary = NSLocalizedString("newTab.setup.import.summary", value: "Import bookmarks, favorites, and passwords from your old browser.", comment: "Summary of the Import card of the Set Up section in the home page")
     static let newTabSetUpDuckPlayerSummary = NSLocalizedString("newTab.setup.duck.player.summary", value: "Enjoy a clean viewing experience without personalized ads.", comment: "Summary of the Duck Player card of the Set Up section in the home page")
     static let newTabSetUpEmailProtectionSummary = NSLocalizedString("newTab.setup.email.protection.summary", value: "Generate custom @duck.com addresses that clean trackers from incoming email.", comment: "Summary of the Email Protection card of the Set Up section in the home page")
-    static let newTabSetUpSurveyDay0Summary = NSLocalizedString("newTab.setup.survey.day.0.summary", value: "Take our short survey and help us build the best browser.", comment: "Summary of the Day 0 durvey of the Set Up section in the home page")
-    static let newTabSetUpSurveyDay7Summary = NSLocalizedString("newTab.setup.survey.day.7.summary", value: "Take our short survey and help us build the best browser.", comment: "Summary of the Day 7 durvey of the Set Up section in the home page")
+    static let newTabSetUpSurveyDay0Summary = NSLocalizedString("newTab.setup.survey.day.0.summary", value: "Join an interview with a member of our research team to help us build the best browser.", comment: "Summary of the card on the new tab page that invites users to partecipate to a survey")
+    static let newTabSetUpSurveyDay14Summary = NSLocalizedString("newTab.setup.survey.day.14.summary", value: "Join an interview with a member of our research team to help us build the best browser.", comment: "Summary of the card on the new tab page that invites users to partecipate to a survey")
 
     // Recent Activity
     static let newTabRecentActivitySectionTitle = NSLocalizedString("newTab.recent.activity.section.title", value: "Recent Activity", comment: "Title of the RecentActivity section in the home page")
diff --git a/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift b/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift
index 272d63cca0..66216b4343 100644
--- a/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift
+++ b/DuckDuckGo/Common/Utilities/UserDefaultsWrapper.swift
@@ -111,8 +111,10 @@ public struct UserDefaultsWrapper<T> {
         case homePageShowDuckPlayer = "home.page.show.duck.player"
         case homePageShowEmailProtection = "home.page.show.email.protection"
         case homePageShowSurveyDay0 = "home.page.show.survey.0"
+        case homePageShowSurveyDay0in10Percent = "home.page.show.survey.0.in.10.pervent"
+        case homePageShowSurveyDay14in10Percent = "home.page.show.survey.0.in.14.pervent"
         case homePageUserInteractedWithSurveyDay0 = "home.page.user.interacted.with.survey.0"
-        case homePageShowSurveyDay7 = "home.page.show.survey.7"
+        case homePageShowSurveyDay14 = "home.page.show.survey.14"
         case homePageShowPageTitles = "home.page.show.page.titles"
         case homePageShowRecentlyVisited = "home.page.show.recently.visited"
         case homePageContinueSetUpImport = "home.page.continue.set.up.import"
diff --git a/DuckDuckGo/HomePage/Model/HomePageContinueSetUpModel.swift b/DuckDuckGo/HomePage/Model/HomePageContinueSetUpModel.swift
index 33e2482333..1e7a137548 100644
--- a/DuckDuckGo/HomePage/Model/HomePageContinueSetUpModel.swift
+++ b/DuckDuckGo/HomePage/Model/HomePageContinueSetUpModel.swift
@@ -51,10 +51,10 @@ extension HomePage.Models {
             }
             return false
         }
-        var isDay7SurveyEnabled: Bool {
+        var isDay14SurveyEnabled: Bool {
             let newTabContinueSetUpSettings = privacyConfigurationManager.privacyConfig.settings(for: .newTabContinueSetUp)
-            if let day7SurveyString =  newTabContinueSetUpSettings["surveyCardDay7"] as? String {
-                if day7SurveyString == "enabled" {
+            if let day14SurveyString =  newTabContinueSetUpSettings["surveyCardDay14"] as? String {
+                if day14SurveyString == "enabled" {
                     return true
                 }
             }
@@ -64,8 +64,8 @@ extension HomePage.Models {
             let duckPlayerSettings = privacyConfigurationManager.privacyConfig.settings(for: .duckPlayer)
             return duckPlayerSettings["tryDuckPlayerLink"] as? String ?? "https://www.youtube.com/watch?v=yKWIA-Pys4c"
         }
-        var day0SurveyURL: String = "https://selfserve.decipherinc.com/survey/selfserve/32ab/230701?list=1"
-        var day7SurveyURL: String = "https://selfserve.decipherinc.com/survey/selfserve/32ab/230702?list=1"
+        var day0SurveyURL: String = "https://selfserve.decipherinc.com/survey/selfserve/32ab/240300?list=1"
+        var day14SurveyURL: String = "https://selfserve.decipherinc.com/survey/selfserve/32ab/240300?list=2"
 
         private let defaultBrowserProvider: DefaultBrowserProvider
         private let dataImportProvider: DataImportStatusProviding
@@ -73,6 +73,7 @@ extension HomePage.Models {
         private let emailManager: EmailManager
         private let privacyPreferences: PrivacySecurityPreferences
         private let duckPlayerPreferences: DuckPlayerPreferencesPersistor
+        private let randomNumberGenerator: RandomNumberGenerating
 
         @UserDefaultsWrapper(key: .homePageShowAllFeatures, defaultValue: false)
         var shouldShowAllFeatures: Bool {
@@ -102,12 +103,18 @@ extension HomePage.Models {
         @UserDefaultsWrapper(key: .shouldShowDBPWaitlistInvitedCardUI, defaultValue: false)
         private var shouldShowDBPWaitlistInvitedCardUI: Bool
 
-        @UserDefaultsWrapper(key: .homePageShowSurveyDay7, defaultValue: true)
-        private var shouldShowSurveyDay7: Bool
+        @UserDefaultsWrapper(key: .homePageShowSurveyDay14, defaultValue: true)
+        private var shouldShowSurveyDay14: Bool
 
         @UserDefaultsWrapper(key: .homePageIsFirstSession, defaultValue: true)
         private var isFirstSession: Bool
 
+        @UserDefaultsWrapper(key: .homePageShowSurveyDay0in10Percent, defaultValue: nil)
+        private var isPartOfSurveyDay0On10Percent: Bool?
+
+        @UserDefaultsWrapper(key: .homePageShowSurveyDay14in10Percent, defaultValue: nil)
+        private var isPartOfSurveyDay14On10Percent: Bool?
+
         @UserDefaultsWrapper(key: .firstLaunchDate, defaultValue: Calendar.current.date(byAdding: .month, value: -1, to: Date())!)
         private var firstLaunchDate: Date
 
@@ -138,7 +145,8 @@ extension HomePage.Models {
              privacyPreferences: PrivacySecurityPreferences = PrivacySecurityPreferences.shared,
              duckPlayerPreferences: DuckPlayerPreferencesPersistor,
              homePageRemoteMessaging: HomePageRemoteMessaging,
-             privacyConfigurationManager: PrivacyConfigurationManaging = AppPrivacyFeatures.shared.contentBlocking.privacyConfigurationManager) {
+             privacyConfigurationManager: PrivacyConfigurationManaging = AppPrivacyFeatures.shared.contentBlocking.privacyConfigurationManager,
+             randomNumberGenerator: RandomNumberGenerating = RandomNumberGenerator()) {
             self.defaultBrowserProvider = defaultBrowserProvider
             self.dataImportProvider = dataImportProvider
             self.tabCollectionViewModel = tabCollectionViewModel
@@ -147,6 +155,7 @@ extension HomePage.Models {
             self.duckPlayerPreferences = duckPlayerPreferences
             self.homePageRemoteMessaging = homePageRemoteMessaging
             self.privacyConfigurationManager = privacyConfigurationManager
+            self.randomNumberGenerator = randomNumberGenerator
 
             refreshFeaturesMatrix()
 
@@ -175,8 +184,8 @@ extension HomePage.Models {
                 tabCollectionViewModel.append(tab: tab)
             case .surveyDay0:
                 visitSurvey(day: .day0)
-            case .surveyDay7:
-                visitSurvey(day: .day7)
+            case .surveyDay14:
+                visitSurvey(day: .day14)
             case .networkProtectionRemoteMessage(let message):
                 handle(remoteMessage: message)
             case .dataBrokerProtectionRemoteMessage(let message):
@@ -200,8 +209,8 @@ extension HomePage.Models {
                 shouldShowEmailProtectionSetting = false
             case .surveyDay0:
                 shouldShowSurveyDay0 = false
-            case .surveyDay7:
-                shouldShowSurveyDay7 = false
+            case .surveyDay14:
+                shouldShowSurveyDay14 = false
             case .networkProtectionRemoteMessage(let message):
 #if NETWORK_PROTECTION
                 homePageRemoteMessaging.networkProtectionRemoteMessaging.dismiss(message: message)
@@ -268,9 +277,10 @@ extension HomePage.Models {
                 case .surveyDay0:
                     if shouldSurveyDay0BeVisible {
                         features.append(feature)
+                        userInteractedWithSurveyDay0 = true
                     }
-                case .surveyDay7:
-                    if shouldSurveyDay7BeVisible {
+                case .surveyDay14:
+                    if shouldSurveyDay14BeVisible {
                         features.append(feature)
                     }
                 case .networkProtectionRemoteMessage, .dataBrokerProtectionRemoteMessage, .dataBrokerProtectionWaitlistInvited:
@@ -355,22 +365,39 @@ extension HomePage.Models {
             let oneDayAgo = Calendar.current.date(byAdding: .weekday, value: -1, to: Date())!
             return isDay0SurveyEnabled &&
             shouldShowSurveyDay0 &&
-            !userInteractedWithSurveyDay0 &&
-            firstLaunchDate > oneDayAgo
+            firstLaunchDate >= oneDayAgo &&
+            Bundle.main.preferredLocalizations.first == "en" &&
+            isPartOfSurveyDay0On10Percent ?? calculateIfIn10percent(day: .day0)
         }
 
-        private var shouldSurveyDay7BeVisible: Bool {
-            let oneWeekAgo = Calendar.current.date(byAdding: .weekOfYear, value: -1, to: Date())!
-            return isDay7SurveyEnabled &&
+        private var shouldSurveyDay14BeVisible: Bool {
+            let fourteenDaysAgo = Calendar.current.date(byAdding: .weekday, value: -14, to: Date())!
+            let fifteenDaysAgo = Calendar.current.date(byAdding: .weekday, value: -15, to: Date())!
+            return isDay14SurveyEnabled &&
             shouldShowSurveyDay0 &&
-            shouldShowSurveyDay7 &&
+            shouldShowSurveyDay14 &&
             !userInteractedWithSurveyDay0 &&
-            firstLaunchDate <= oneWeekAgo
+            firstLaunchDate >= fifteenDaysAgo &&
+            firstLaunchDate <= fourteenDaysAgo &&
+            Bundle.main.preferredLocalizations.first == "en" &&
+            isPartOfSurveyDay14On10Percent ?? calculateIfIn10percent(day: .day14)
+        }
+
+        private func calculateIfIn10percent(day: SurveyDay) -> Bool {
+            let randomNumber0To99 = randomNumberGenerator.random(in: 0..<100)
+            let isInSurvey10Percent = randomNumber0To99 < 10
+            switch day {
+            case .day0:
+                isPartOfSurveyDay0On10Percent = isInSurvey10Percent
+            case .day14:
+                isPartOfSurveyDay14On10Percent = isInSurvey10Percent
+            }
+            return isInSurvey10Percent
         }
 
         private enum SurveyDay {
             case day0
-            case day7
+            case day14
         }
 
         @MainActor private func visitSurvey(day: SurveyDay) {
@@ -378,11 +405,8 @@ extension HomePage.Models {
             switch day {
             case .day0:
                 surveyURLString = day0SurveyURL
-            case .day7:
-                surveyURLString = day7SurveyURL
-            }
-            if let atb = statisticsStore.atb {
-                surveyURLString += "&atb=\(atb)"
+            case .day14:
+                surveyURLString = day14SurveyURL
             }
 
             if let url = URL(string: surveyURLString) {
@@ -390,9 +414,9 @@ extension HomePage.Models {
                 tabCollectionViewModel.append(tab: tab)
                 switch day {
                 case .day0:
-                    userInteractedWithSurveyDay0 = true
-                case .day7:
-                    shouldShowSurveyDay7 = false
+                    shouldShowSurveyDay0 = false
+                case .day14:
+                    shouldShowSurveyDay14 = false
                 }
             }
         }
@@ -457,7 +481,7 @@ extension HomePage.Models {
         // We ignore the `networkProtectionRemoteMessage` case here to avoid it getting accidentally included - it has special handling and will get
         // included elsewhere.
         static var allCases: [HomePage.Models.FeatureType] {
-            [.duckplayer, .emailProtection, .defaultBrowser, .importBookmarksAndPasswords, .surveyDay0, .surveyDay7]
+            [.duckplayer, .emailProtection, .defaultBrowser, .importBookmarksAndPasswords, .surveyDay0, .surveyDay14]
         }
 
         case duckplayer
@@ -465,7 +489,7 @@ extension HomePage.Models {
         case defaultBrowser
         case importBookmarksAndPasswords
         case surveyDay0
-        case surveyDay7
+        case surveyDay14
         case networkProtectionRemoteMessage(NetworkProtectionRemoteMessage)
         case dataBrokerProtectionRemoteMessage(DataBrokerProtectionRemoteMessage)
         case dataBrokerProtectionWaitlistInvited
@@ -482,8 +506,8 @@ extension HomePage.Models {
                 return UserText.newTabSetUpEmailProtectionCardTitle
             case .surveyDay0:
                 return UserText.newTabSetUpSurveyDay0CardTitle
-            case .surveyDay7:
-                return UserText.newTabSetUpSurveyDay7CardTitle
+            case .surveyDay14:
+                return UserText.newTabSetUpSurveyDay14CardTitle
             case .networkProtectionRemoteMessage(let message):
                 return message.cardTitle
             case .dataBrokerProtectionRemoteMessage(let message):
@@ -505,8 +529,8 @@ extension HomePage.Models {
                 return UserText.newTabSetUpEmailProtectionSummary
             case .surveyDay0:
                 return UserText.newTabSetUpSurveyDay0Summary
-            case .surveyDay7:
-                return UserText.newTabSetUpSurveyDay7Summary
+            case .surveyDay14:
+                return UserText.newTabSetUpSurveyDay14Summary
             case .networkProtectionRemoteMessage(let message):
                 return message.cardDescription
             case .dataBrokerProtectionRemoteMessage(let message):
@@ -528,8 +552,8 @@ extension HomePage.Models {
                 return UserText.newTabSetUpEmailProtectionAction
             case .surveyDay0:
                 return UserText.newTabSetUpSurveyDay0Action
-            case .surveyDay7:
-                return UserText.newTabSetUpSurveyDay7Action
+            case .surveyDay14:
+                return UserText.newTabSetUpSurveyDay14Action
             case .networkProtectionRemoteMessage(let message):
                 return message.action.actionTitle
             case .dataBrokerProtectionRemoteMessage(let message):
@@ -552,9 +576,9 @@ extension HomePage.Models {
             case .emailProtection:
                 return .inbox128.resized(to: iconSize)!
             case .surveyDay0:
-                return .survey128.resized(to: iconSize)!
-            case .surveyDay7:
-                return .survey128.resized(to: iconSize)!
+                return .qandA128.resized(to: iconSize)!
+            case .surveyDay14:
+                return .qandA128.resized(to: iconSize)!
             case .networkProtectionRemoteMessage:
                 return .vpnEnded.resized(to: iconSize)!
             case .dataBrokerProtectionRemoteMessage:
@@ -617,3 +641,13 @@ struct HomePageRemoteMessaging {
 #endif
 
 }
+
+public protocol RandomNumberGenerating {
+    func random(in range: Range<Int>) -> Int
+}
+
+struct RandomNumberGenerator: RandomNumberGenerating {
+    func random(in range: Range<Int>) -> Int {
+        return Int.random(in: range)
+    }
+}
diff --git a/DuckDuckGo/Localizable.xcstrings b/DuckDuckGo/Localizable.xcstrings
index 9347c6977d..a00894c192 100644
--- a/DuckDuckGo/Localizable.xcstrings
+++ b/DuckDuckGo/Localizable.xcstrings
@@ -29509,120 +29509,120 @@
       }
     },
     "newTab.setup.survey.day.0.action" : {
-      "comment" : "Action title of the Day 0 durvey of the Set Up section in the home page",
+      "comment" : "Action title of the Day 0 survey of the Set Up section in the home page",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Teile deine Gedanken"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Share Your Thoughts"
+            "value" : "Sign Up To Participate"
           }
         },
         "es" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Comparte tus ideas"
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Partagez votre avis"
           }
         },
         "it" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Comunicaci la tua opinione"
           }
         },
         "nl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Deel je gedachten"
           }
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Podziel się przemyśleniami"
           }
         },
         "pt" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Partilha as tuas opiniões"
           }
         },
         "ru" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Поделиться соображениями"
           }
         }
       }
     },
     "newTab.setup.survey.day.0.summary" : {
-      "comment" : "Summary of the Day 0 durvey of the Set Up section in the home page",
+      "comment" : "Summary of the card on the new tab page that invites users to partecipate to a survey",
       "extractionState" : "extracted_with_value",
       "localizations" : {
         "de" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Nimm an unserer kurzen Umfrage teil und hilf uns, den besten Browser zu entwickeln."
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Take our short survey and help us build the best browser."
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
           }
         },
         "es" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Responde a nuestra breve encuesta y ayúdanos a crear el mejor navegador."
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Répondez à notre courte enquête et aidez-nous à créer le meilleur navigateur."
           }
         },
         "it" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Rispondi al nostro breve sondaggio e aiutaci a creare il browser migliore."
           }
         },
         "nl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Vul onze korte enquête in en help ons de beste browser te bouwen."
           }
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Weź udział w krótkiej ankiecie i pomóż nam opracować najlepszą przeglądarkę."
           }
         },
         "pt" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Responde ao nosso curto inquérito e ajuda-nos a criar o melhor navegador."
           }
         },
         "ru" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Пройдите короткий опрос и помогите DuckDuckGo стать лучшим из браузеров."
           }
         }
@@ -29634,55 +29634,55 @@
       "localizations" : {
         "de" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Sag uns, was dich hierher gebracht hat"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Tell Us What Brought You Here"
+            "value" : "Share Your Thoughts With Us"
           }
         },
         "es" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Cuéntanos qué te ha traído hasta aquí"
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Dites-nous ce qui vous amène ici"
           }
         },
         "it" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Raccontaci cosa ti ha portato qui"
           }
         },
         "nl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Vertel ons wat je hier heeft gebracht"
           }
         },
         "pl" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Powiedz nam, co Cię tu sprowadziło"
           }
         },
         "pt" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Diz-nos o que te trouxe aqui"
           }
         },
         "ru" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Что привело вас к нам"
           }
         }
@@ -29690,7 +29690,7 @@
     },
     "newTab.setup.survey.day.7.action" : {
       "comment" : "Action title of the Day 7 durvey of the Set Up section in the home page",
-      "extractionState" : "extracted_with_value",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -29750,7 +29750,7 @@
     },
     "newTab.setup.survey.day.7.summary" : {
       "comment" : "Summary of the Day 7 durvey of the Set Up section in the home page",
-      "extractionState" : "extracted_with_value",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -29810,7 +29810,7 @@
     },
     "newTab.setup.survey.day.7.title" : {
       "comment" : "Title of the Day 7 durvey of the Set Up section in the home page",
-      "extractionState" : "extracted_with_value",
+      "extractionState" : "stale",
       "localizations" : {
         "de" : {
           "stringUnit" : {
@@ -29868,6 +29868,42 @@
         }
       }
     },
+    "newTab.setup.survey.day.14.action" : {
+      "comment" : "Action title of the Day 14 survey of the Set Up section in the home page",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Sign Up To Participate"
+          }
+        }
+      }
+    },
+    "newTab.setup.survey.day.14.summary" : {
+      "comment" : "Summary of the card on the new tab page that invites users to partecipate to a survey",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Join an interview with a member of our research team to help us build the best browser."
+          }
+        }
+      }
+    },
+    "newTab.setup.survey.day.14.title" : {
+      "comment" : "Title of the Day 14 durvey of the Set Up section in the home page",
+      "extractionState" : "extracted_with_value",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "Share Your Thoughts With Us"
+          }
+        }
+      }
+    },
     "next" : {
       "comment" : "Next button",
       "extractionState" : "extracted_with_value",
@@ -50524,4 +50560,4 @@
     }
   },
   "version" : "1.0"
-}
+}
\ No newline at end of file
diff --git a/DuckDuckGo/Menus/MainMenu.swift b/DuckDuckGo/Menus/MainMenu.swift
index da7c0d9984..6c881a0dad 100644
--- a/DuckDuckGo/Menus/MainMenu.swift
+++ b/DuckDuckGo/Menus/MainMenu.swift
@@ -575,11 +575,14 @@ import SubscriptionUI
                 NSMenuItem(title: "Reset Pinned Tabs", action: #selector(MainViewController.resetPinnedTabs))
                 NSMenuItem(title: "Reset YouTube Overlay Interactions", action: #selector(MainViewController.resetDuckPlayerOverlayInteractions))
                 NSMenuItem(title: "Reset MakeDuckDuckYours user settings", action: #selector(MainViewController.resetMakeDuckDuckGoYoursUserSettings))
+                NSMenuItem(title: "Survey 10% on", action: #selector(MainViewController.in10PercentSurveyOn))
+                NSMenuItem(title: "Survey 10% off", action: #selector(MainViewController.in10PercentSurveyOff))
                 NSMenuItem(title: "Change Activation Date") {
                     NSMenuItem(title: "Today", action: #selector(MainViewController.changeInstallDateToToday), keyEquivalent: "N")
-                    NSMenuItem(title: "Less Than a 21 days Ago", action: #selector(MainViewController.changeInstallDateToLessThan21DaysAgo))
-                    NSMenuItem(title: "More Than 21 Days Ago", action: #selector(MainViewController.changeInstallDateToMoreThan21DaysAgoButLessThan27))
-                    NSMenuItem(title: "More Than 27 Days Ago", action: #selector(MainViewController.changeInstallDateToMoreThan27DaysAgo))
+                    NSMenuItem(title: "Less Than a 1 days Ago", action: #selector(MainViewController.changeInstallDateToLessThan1DayAgo(_:)))
+                    NSMenuItem(title: "More Than 1 Days Ago", action: #selector(MainViewController.changeInstallDateToMoreThan1DayAgoButLessThan14(_:)))
+                    NSMenuItem(title: "More Than 14 Days Ago", action: #selector(MainViewController.changeInstallDateToMoreThan14DaysAgoButLessThan15(_:)))
+                    NSMenuItem(title: "More Than 15 Days Ago", action: #selector(MainViewController.changeInstallDateToMoreThan15DaysAgo(_:)))
                 }
                 NSMenuItem(title: "Reset Email Protection InContext Signup Prompt", action: #selector(MainViewController.resetEmailProtectionInContextPrompt))
                 NSMenuItem(title: "Reset Daily Pixels", action: #selector(MainViewController.resetDailyPixels))
diff --git a/DuckDuckGo/Menus/MainMenuActions.swift b/DuckDuckGo/Menus/MainMenuActions.swift
index 2f4c286472..f3f9c43c19 100644
--- a/DuckDuckGo/Menus/MainMenuActions.swift
+++ b/DuckDuckGo/Menus/MainMenuActions.swift
@@ -708,7 +708,7 @@ extension MainViewController {
         UserDefaults.standard.set(true, forKey: UserDefaultsWrapper<Bool>.Key.homePageShowDuckPlayer.rawValue)
         UserDefaults.standard.set(true, forKey: UserDefaultsWrapper<Bool>.Key.homePageShowEmailProtection.rawValue)
         UserDefaults.standard.set(true, forKey: UserDefaultsWrapper<Bool>.Key.homePageShowSurveyDay0.rawValue)
-        UserDefaults.standard.set(true, forKey: UserDefaultsWrapper<Bool>.Key.homePageShowSurveyDay7.rawValue)
+        UserDefaults.standard.set(true, forKey: UserDefaultsWrapper<Bool>.Key.homePageShowSurveyDay14.rawValue)
         UserDefaults.standard.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
     }
 
@@ -722,22 +722,37 @@ extension MainViewController {
         UserDefaults.standard.removePersistentDomain(forName: DailyPixel.Constant.dailyPixelStorageIdentifier)
     }
 
+    @objc func in10PercentSurveyOn(_ sender: Any?) {
+        UserDefaults.standard.set(true, forKey: UserDefaultsWrapper<Bool?>.Key.homePageShowSurveyDay14in10Percent.rawValue)
+        UserDefaults.standard.set(true, forKey: UserDefaultsWrapper<Bool?>.Key.homePageShowSurveyDay0in10Percent.rawValue)
+    }
+
+    @objc func in10PercentSurveyOff(_ sender: Any?) {
+        UserDefaults.standard.set(false, forKey: UserDefaultsWrapper<Bool?>.Key.homePageShowSurveyDay14in10Percent.rawValue)
+        UserDefaults.standard.set(false, forKey: UserDefaultsWrapper<Bool?>.Key.homePageShowSurveyDay0in10Percent.rawValue)
+    }
+
     @objc func changeInstallDateToToday(_ sender: Any?) {
         UserDefaults.standard.set(Date(), forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
     }
 
-    @objc func changeInstallDateToLessThan21DaysAgo(_ sender: Any?) {
-        let lessThanTwentyOneDaysAgo = Calendar.current.date(byAdding: .day, value: -20, to: Date())
-        UserDefaults.standard.set(lessThanTwentyOneDaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+    @objc func changeInstallDateToLessThan1DayAgo(_ sender: Any?) {
+        let lessThanOneDaysAgo = Calendar.current.date(byAdding: .hour, value: -23, to: Date())
+        UserDefaults.standard.set(lessThanOneDaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
     }
 
-    @objc func changeInstallDateToMoreThan21DaysAgoButLessThan27(_ sender: Any?) {
-        let twentyOneDaysAgo = Calendar.current.date(byAdding: .day, value: -21, to: Date())
-        UserDefaults.standard.set(twentyOneDaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+    @objc func changeInstallDateToMoreThan1DayAgoButLessThan14(_ sender: Any?) {
+        let between1And4DaysAgo = Calendar.current.date(byAdding: .day, value: -13, to: Date())
+        UserDefaults.standard.set(between1And4DaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+    }
+
+    @objc func changeInstallDateToMoreThan14DaysAgoButLessThan15(_ sender: Any?) {
+        let twentyEightDaysAgo = Calendar.current.date(byAdding: .day, value: -14, to: Date())
+        UserDefaults.standard.set(twentyEightDaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
     }
 
-    @objc func changeInstallDateToMoreThan27DaysAgo(_ sender: Any?) {
-        let twentyEightDaysAgo = Calendar.current.date(byAdding: .day, value: -28, to: Date())
+    @objc func changeInstallDateToMoreThan15DaysAgo(_ sender: Any?) {
+        let twentyEightDaysAgo = Calendar.current.date(byAdding: .day, value: -16, to: Date())
         UserDefaults.standard.set(twentyEightDaysAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
     }
 
diff --git a/DuckDuckGo/Preferences/Model/AppearancePreferences.swift b/DuckDuckGo/Preferences/Model/AppearancePreferences.swift
index 28b4c55576..ab73548d08 100644
--- a/DuckDuckGo/Preferences/Model/AppearancePreferences.swift
+++ b/DuckDuckGo/Preferences/Model/AppearancePreferences.swift
@@ -248,8 +248,10 @@ final class AppearancePreferences: ObservableObject {
     }
 
     var isContinueSetUpAvailable: Bool {
+        let osVersion = ProcessInfo.processInfo.operatingSystemVersion
+
         let privacyConfig = AppPrivacyFeatures.shared.contentBlocking.privacyConfigurationManager.privacyConfig
-        return privacyConfig.isEnabled(featureKey: .newTabContinueSetUp)
+        return privacyConfig.isEnabled(featureKey: .newTabContinueSetUp) && osVersion.majorVersion >= 12
     }
 
     func updateUserInterfaceStyle() {
diff --git a/UnitTests/HomePage/ContinueSetUpModelTests.swift b/UnitTests/HomePage/ContinueSetUpModelTests.swift
index e9411db6e1..817fc5bfb0 100644
--- a/UnitTests/HomePage/ContinueSetUpModelTests.swift
+++ b/UnitTests/HomePage/ContinueSetUpModelTests.swift
@@ -71,12 +71,16 @@ final class ContinueSetUpModelTests: XCTestCase {
     var privacyPreferences: PrivacySecurityPreferences!
     var duckPlayerPreferences: DuckPlayerPreferencesPersistor!
     var privacyConfigManager: MockPrivacyConfigurationManager!
+    var randomNumberGenerator: MockRandomNumberGenerator!
     let userDefaults = UserDefaults(suiteName: "\(Bundle.main.bundleIdentifier!).\(NSApplication.runType)")!
 
     @MainActor override func setUp() {
         UserDefaultsWrapper<Any>.clearAll()
         userDefaults.set(Date(), forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
         userDefaults.set(false, forKey: UserDefaultsWrapper<Date>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
+        userDefaults.set(nil, forKey: UserDefaultsWrapper<Bool?>.Key.homePageShowSurveyDay0in10Percent.rawValue)
+        userDefaults.set(nil, forKey: UserDefaultsWrapper<Bool?>.Key.homePageShowSurveyDay14in10Percent.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
         capturingDefaultBrowserProvider = CapturingDefaultBrowserProvider()
         capturingDataImportProvider = CapturingDataImportProvider()
         tabCollectionVM = TabCollectionViewModel()
@@ -88,9 +92,10 @@ final class ContinueSetUpModelTests: XCTestCase {
         let config = MockPrivacyConfiguration()
         config.featureSettings = [
             "surveyCardDay0": "enabled",
-            "surveyCardDay7": "enabled"
+            "surveyCardDay14": "enabled"
         ] as! [String: String]
         privacyConfigManager.privacyConfig = config
+        randomNumberGenerator = MockRandomNumberGenerator()
 
 #if NETWORK_PROTECTION && DBP
         let messaging = HomePageRemoteMessaging(
@@ -121,7 +126,8 @@ final class ContinueSetUpModelTests: XCTestCase {
             privacyPreferences: privacyPreferences,
             duckPlayerPreferences: duckPlayerPreferences,
             homePageRemoteMessaging: messaging,
-            privacyConfigurationManager: privacyConfigManager
+            privacyConfigurationManager: privacyConfigManager,
+            randomNumberGenerator: randomNumberGenerator
         )
     }
 
@@ -178,11 +184,42 @@ final class ContinueSetUpModelTests: XCTestCase {
 
         vm.shouldShowAllFeatures = true
 
-        expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7])
+        expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14])
 
         XCTAssertEqual(vm.visibleFeaturesMatrix, expectedMatrix)
     }
 
+    @MainActor func testWhenInstallDateIsLessThanADayAgoThenRandomGeneratorIsRequestARandomNumberInTheCorrectRange() {
+        XCTAssertEqual(randomNumberGenerator.capturedRange, 0..<100)
+    }
+
+    @MainActor func WhenInstallDateIsMoreThan14daysAgoDay14ThenRandomGeneratorIsRequestARandomNumberInTheCorrectRange() {
+        let twoWeeksAgo = Calendar.current.date(byAdding: .day, value: -16, to: Date())!
+        userDefaults.set(twoWeeksAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
+        vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults)
+
+        XCTAssertEqual(randomNumberGenerator.capturedRange, 0..<100)
+    }
+
+    @MainActor func testWhenInstallDateIsLessThanADayAgoButUserNotIn10PercentNoSurveyCardIsShown() {
+        let aDayAgo = Calendar.current.date(byAdding: .day, value: -1, to: Date())!
+        userDefaults.set(aDayAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        var randomGenerator = MockRandomNumberGenerator()
+        randomGenerator.numberToReturn = 10
+        vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults, randomNumberGenerator: randomGenerator)
+        vm.shouldShowAllFeatures = true
+
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
+
+        userDefaults.set(aDayAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults)
+
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
+    }
+
     @MainActor func testWhenInstallDateIsMoreThanADayAgoButLessThanAWeekAgoNoSurveyCardIsShown() {
         let aDayAgo = Calendar.current.date(byAdding: .day, value: -1, to: Date())!
         userDefaults.set(aDayAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
@@ -190,49 +227,78 @@ final class ContinueSetUpModelTests: XCTestCase {
         vm.shouldShowAllFeatures = true
 
         XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
-        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay7))
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
 
         userDefaults.set(aDayAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
         vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults)
 
         XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
-        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay7))
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
     }
 
-    @MainActor func testWhenInstallDateIsMoreThanAWeekAgoDay7SurveyCardIsShown() {
-        let aDayAgo = Calendar.current.date(byAdding: .day, value: -7, to: Date())!
-        userDefaults.set(aDayAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+    @MainActor func testWhenInstallDateIsMoreThan14daysAgoDay14SurveyCardIsShown() {
+        let twoWeeksAgo = Calendar.current.date(byAdding: .day, value: -14, to: Date())!
+        userDefaults.set(twoWeeksAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
         vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults)
         vm.shouldShowAllFeatures = true
 
         XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
-        XCTAssertTrue(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay7))
+        XCTAssertTrue(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
     }
 
-    @MainActor func testWhenInstallDateIsMoreThanAWeekAgoAndUserInteractedWithDay0SurveyDay7SurveyCardIsNotShown() {
+    @MainActor func testWhenInstallDateIsMoreThan14daysAgoDay14ButUserNotIn10percentSurveyCardIsNotShown() {
+        let twoWeeksAgo = Calendar.current.date(byAdding: .day, value: -14, to: Date())!
+        userDefaults.set(twoWeeksAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(nil, forKey: UserDefaultsWrapper<Bool?>.Key.homePageShowSurveyDay14in10Percent.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
+
+        let randomGenerator = MockRandomNumberGenerator()
+        randomGenerator.numberToReturn = 10
+        vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults, randomNumberGenerator: randomGenerator)
+        vm.shouldShowAllFeatures = true
+
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
+    }
+
+    @MainActor func testWhenInstallDateIsMoreThan15daysAgoDay14SurveyCardIsShown() {
+        let twoWeeksAgo = Calendar.current.date(byAdding: .day, value: -16, to: Date())!
+        userDefaults.set(twoWeeksAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
+        vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults)
+        vm.shouldShowAllFeatures = true
+
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
+    }
+
+    @MainActor func testWhenInstallDateIsMoreThan14daysAgoAndUserInteractedWithDay0SurveyDay14SurveyCardIsNotShown() {
         let statisticStore = MockStatisticsStore()
         vm.statisticsStore = statisticStore
         vm.performAction(for: .surveyDay0)
-        let aDayAgo = Calendar.current.date(byAdding: .day, value: -7, to: Date())!
+        let aDayAgo = Calendar.current.date(byAdding: .day, value: -14, to: Date())!
         userDefaults.set(aDayAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
         vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults)
         vm.shouldShowAllFeatures = true
 
         XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
-        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay7))
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
     }
 
-    @MainActor func testWhenInstallDateIsMoreThanAWeekAgoAndUserDismissedDay0SurveyDay7SurveyCardIsNotShown() {
+    @MainActor func testWhenInstallDateIsMoreThanAWeekAgoAndUserDismissedDay0SurveyDay14SurveyCardIsNotShown() {
         let statisticStore = MockStatisticsStore()
         vm.statisticsStore = statisticStore
         vm.removeItem(for: .surveyDay0)
-        let aDayAgo = Calendar.current.date(byAdding: .day, value: -7, to: Date())!
+        let aDayAgo = Calendar.current.date(byAdding: .day, value: -14, to: Date())!
         userDefaults.set(aDayAgo, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Bool>.Key.homePageUserInteractedWithSurveyDay0.rawValue)
         vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults)
         vm.shouldShowAllFeatures = true
 
         XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay0))
-        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay7))
+        XCTAssertFalse(vm.visibleFeaturesMatrix.reduce([], +).contains(HomePage.Models.FeatureType.surveyDay14))
     }
 
     @MainActor func testWhenInitializedNotForTheFirstTimeTheMatrixHasAllElementsInTheRightOrder() {
@@ -247,7 +313,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     func testWhenTogglingShowAllFeatureThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14])
 
         vm.shouldShowAllFeatures = true
 
@@ -275,7 +341,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenIsDefaultBrowserAndTogglingShowAllFeatureThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.defaultBrowser, .surveyDay7])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.defaultBrowser, .surveyDay14])
 
         capturingDefaultBrowserProvider.isDefault = true
         vm = HomePage.Models.ContinueSetUpModel.fixture(defaultBrowserProvider: capturingDefaultBrowserProvider, appGroupUserDefaults: userDefaults)
@@ -303,7 +369,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasUsedImportAndTogglingShowAllFeatureThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7, .importBookmarksAndPasswords])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14, .importBookmarksAndPasswords])
 
         capturingDataImportProvider.didImport = true
         vm = HomePage.Models.ContinueSetUpModel.fixture(dataImportProvider: capturingDataImportProvider, appGroupUserDefaults: userDefaults)
@@ -325,7 +391,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasEmailProtectionEnabledThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7, .emailProtection])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14, .emailProtection])
 
         emailStorage.isEmailProtectionEnabled = true
         vm = HomePage.Models.ContinueSetUpModel.fixture(emailManager: emailManager, appGroupUserDefaults: userDefaults)
@@ -341,7 +407,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasCookieConsentEnabledThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14])
 
         privacyPreferences.autoconsentEnabled = true
         vm = HomePage.Models.ContinueSetUpModel.fixture(privacyPreferences: privacyPreferences, appGroupUserDefaults: userDefaults)
@@ -363,7 +429,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasDuckPlayerEnabledAndOverlayButtonNotPressedThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7, .duckplayer])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14, .duckplayer])
 
         duckPlayerPreferences.youtubeOverlayAnyButtonPressed = false
         duckPlayerPreferences.duckPlayerModeBool = true
@@ -380,7 +446,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasDuckPlayerDisabledAndOverlayButtonNotPressedThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7, .duckplayer])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14, .duckplayer])
 
         duckPlayerPreferences.youtubeOverlayAnyButtonPressed = false
         duckPlayerPreferences.duckPlayerModeBool = false
@@ -397,7 +463,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasDuckPlayerOnAlwaysAskAndOverlayButtonNotPressedThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14])
 
         duckPlayerPreferences.youtubeOverlayAnyButtonPressed = false
         duckPlayerPreferences.duckPlayerModeBool = nil
@@ -414,7 +480,7 @@ final class ContinueSetUpModelTests: XCTestCase {
     }
 
     @MainActor func testWhenUserHasDuckPlayerOnAlwaysAskAndOverlayButtonIsPressedThenCorrectElementsAreVisible() {
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7, .duckplayer])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14, .duckplayer])
 
         duckPlayerPreferences.youtubeOverlayAnyButtonPressed = true
         duckPlayerPreferences.duckPlayerModeBool = nil
@@ -437,17 +503,17 @@ final class ContinueSetUpModelTests: XCTestCase {
         vm.statisticsStore = statisticStore
 
         vm.performAction(for: .surveyDay0)
-        XCTAssertEqual(tabCollectionVM.tabs[1].url, URL(string: vm.day0SurveyURL + "&atb=" + atb))
+        XCTAssertEqual(tabCollectionVM.tabs[1].url, URL(string: vm.day0SurveyURL))
     }
 
-    @MainActor func testWhenAskedToPerformActionForSurveyDay7ShowsTheSurveySite() {
+    @MainActor func testWhenAskedToPerformActionForSurveyDay14ShowsTheSurveySite() {
         let atb = "someAtb"
         let statisticStore = MockStatisticsStore()
         statisticStore.atb = atb
         vm.statisticsStore = statisticStore
 
-        vm.performAction(for: .surveyDay7)
-        XCTAssertEqual(tabCollectionVM.tabs[1].url, URL(string: vm.day7SurveyURL + "&atb=" + atb))
+        vm.performAction(for: .surveyDay14)
+        XCTAssertEqual(tabCollectionVM.tabs[1].url, URL(string: vm.day14SurveyURL))
     }
 
     @MainActor func testThatWhenIfAllFeatureActiveThenVisibleMatrixIsEmpty() {
@@ -457,7 +523,7 @@ final class ContinueSetUpModelTests: XCTestCase {
         duckPlayerPreferences.youtubeOverlayAnyButtonPressed = true
         capturingDataImportProvider.didImport = true
         userDefaults.set(false, forKey: UserDefaultsWrapper<Date>.Key.homePageShowSurveyDay0.rawValue)
-        userDefaults.set(false, forKey: UserDefaultsWrapper<Date>.Key.homePageShowSurveyDay7.rawValue)
+        userDefaults.set(false, forKey: UserDefaultsWrapper<Date>.Key.homePageShowSurveyDay14.rawValue)
 
         vm = HomePage.Models.ContinueSetUpModel(
             defaultBrowserProvider: capturingDefaultBrowserProvider,
@@ -474,7 +540,7 @@ final class ContinueSetUpModelTests: XCTestCase {
 
     @MainActor func testDismissedItemsAreRemovedFromVisibleMatrixAndChoicesArePersisted() {
         vm.shouldShowAllFeatures = true
-        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay7])
+        let expectedMatrix = expectedFeatureMatrixWithout(types: [.surveyDay14])
         XCTAssertEqual(expectedMatrix, vm.visibleFeaturesMatrix)
 
         vm.removeItem(for: .surveyDay0)
@@ -483,8 +549,8 @@ final class ContinueSetUpModelTests: XCTestCase {
         userDefaults.set(Calendar.current.date(byAdding: .month, value: -1, to: Date())!, forKey: UserDefaultsWrapper<Date>.Key.firstLaunchDate.rawValue)
         vm = HomePage.Models.ContinueSetUpModel.fixture(appGroupUserDefaults: userDefaults)
 
-        vm.removeItem(for: .surveyDay7)
-        XCTAssertFalse(vm.visibleFeaturesMatrix.flatMap { $0 }.contains(.surveyDay7))
+        vm.removeItem(for: .surveyDay14)
+        XCTAssertFalse(vm.visibleFeaturesMatrix.flatMap { $0 }.contains(.surveyDay14))
 
         vm.removeItem(for: .defaultBrowser)
         XCTAssertFalse(vm.visibleFeaturesMatrix.flatMap { $0 }.contains(.defaultBrowser))
@@ -564,11 +630,12 @@ extension HomePage.Models.ContinueSetUpModel {
         privacyPreferences: PrivacySecurityPreferences = PrivacySecurityPreferences.shared,
         duckPlayerPreferences: DuckPlayerPreferencesPersistor = DuckPlayerPreferencesPersistorMock(),
         privacyConfig: MockPrivacyConfiguration = MockPrivacyConfiguration(),
-        appGroupUserDefaults: UserDefaults
+        appGroupUserDefaults: UserDefaults,
+        randomNumberGenerator: RandomNumberGenerating = MockRandomNumberGenerator()
     ) -> HomePage.Models.ContinueSetUpModel {
         privacyConfig.featureSettings = [
             "surveyCardDay0": "enabled",
-            "surveyCardDay7": "enabled",
+            "surveyCardDay14": "enabled",
             "networkProtection": "disabled"
         ] as! [String: String]
         let manager = MockPrivacyConfigurationManager()
@@ -603,6 +670,16 @@ extension HomePage.Models.ContinueSetUpModel {
             privacyPreferences: privacyPreferences,
             duckPlayerPreferences: duckPlayerPreferences,
             homePageRemoteMessaging: messaging,
-            privacyConfigurationManager: manager)
+            privacyConfigurationManager: manager,
+            randomNumberGenerator: randomNumberGenerator)
+    }
+}
+
+class MockRandomNumberGenerator: RandomNumberGenerating {
+    var numberToReturn = 0
+    var capturedRange: Range<Int>?
+    func random(in range: Range<Int>) -> Int {
+        capturedRange = range
+        return numberToReturn
     }
 }

From b4b968d94d3d3b9f555e959e46e883c84cc11004 Mon Sep 17 00:00:00 2001
From: Anh Do <18567+quanganhdo@users.noreply.github.com>
Date: Thu, 14 Mar 2024 10:42:31 -0400
Subject: [PATCH 06/30] NetP x Subscription Clean-up (#2363)

Task/Issue URL: https://app.asana.com/0/0/1206470585910126/f
Tech Design URL:
CC:
---
 DuckDuckGo.xcodeproj/project.pbxproj                         | 2 +-
 .../xcshareddata/swiftpm/Package.resolved                    | 4 ++--
 .../NetworkProtection+ConvenienceInitializers.swift          | 3 ++-
 .../NetworkExtensionTargets/MacPacketTunnelProvider.swift    | 3 ++-
 DuckDuckGoVPN/NetworkProtectionBouncer.swift                 | 5 ++++-
 LocalPackages/DataBrokerProtection/Package.swift             | 2 +-
 LocalPackages/NetworkProtectionMac/Package.swift             | 2 +-
 LocalPackages/SubscriptionUI/Package.swift                   | 2 +-
 8 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index 90fc764ac7..79f1871b76 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -13749,7 +13749,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 122.2.1;
+				version = 123.0.0;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index ff344fde70..17ffe51f48 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "1295a22823157c9b7d11793299cd58b189e87629",
-        "version" : "122.2.1"
+        "revision" : "d110859c6100daa59bcbc200dd8565975faf2151",
+        "version" : "123.0.0"
       }
     },
     {
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtection+ConvenienceInitializers.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtection+ConvenienceInitializers.swift
index a32ca7ee85..fcdb50ff75 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtection+ConvenienceInitializers.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtection+ConvenienceInitializers.swift
@@ -50,7 +50,8 @@ extension NetworkProtectionKeychainTokenStore {
     convenience init() {
         self.init(keychainType: .default,
                   errorEvents: .networkProtectionAppDebugEvents,
-                  isSubscriptionEnabled: false)
+                  isSubscriptionEnabled: false,
+                  accessTokenProvider: { nil })
     }
 }
 
diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
index a0b733539c..d7d6de4627 100644
--- a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
+++ b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
@@ -280,7 +280,8 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
         let tokenStore = NetworkProtectionKeychainTokenStore(keychainType: Bundle.keychainType,
                                                              serviceName: Self.tokenServiceName,
                                                              errorEvents: debugEvents,
-                                                             isSubscriptionEnabled: false)
+                                                             isSubscriptionEnabled: false,
+                                                             accessTokenProvider: { nil })
         let notificationsPresenter = NetworkProtectionNotificationsPresenterFactory().make(settings: settings, defaults: defaults)
 
         super.init(notificationsPresenter: notificationsPresenter,
diff --git a/DuckDuckGoVPN/NetworkProtectionBouncer.swift b/DuckDuckGoVPN/NetworkProtectionBouncer.swift
index b36585dc0c..6b64523c3e 100644
--- a/DuckDuckGoVPN/NetworkProtectionBouncer.swift
+++ b/DuckDuckGoVPN/NetworkProtectionBouncer.swift
@@ -30,7 +30,10 @@ final class NetworkProtectionBouncer {
     /// current app.
     ///
     func requireAuthTokenOrKillApp() {
-        let keychainStore = NetworkProtectionKeychainTokenStore(keychainType: .default, errorEvents: nil, isSubscriptionEnabled: false)
+        let keychainStore = NetworkProtectionKeychainTokenStore(keychainType: .default,
+                                                                errorEvents: nil,
+                                                                isSubscriptionEnabled: false,
+                                                                accessTokenProvider: { nil })
 
         guard keychainStore.isFeatureActivated else {
             os_log(.error, log: .networkProtection, "🔴 Stopping: DuckDuckGo VPN not authorized.")
diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
index 16230a9a8e..4be565fe0e 100644
--- 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: "122.2.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "123.0.0"),
         .package(path: "../PixelKit"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
index edd448f1f8..8899b18238 100644
--- a/LocalPackages/NetworkProtectionMac/Package.swift
+++ b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -31,7 +31,7 @@ let package = Package(
         .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "122.2.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "123.0.0"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../LoginItems"),
diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
index e3f0621d70..df6fe2d263 100644
--- 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: "122.2.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "123.0.0"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [

From ddf8b045556034ee91105af309a4f3016b268bd6 Mon Sep 17 00:00:00 2001
From: Diego Rey Mendez <diegoreymendez@users.noreply.github.com>
Date: Thu, 14 Mar 2024 16:49:54 +0100
Subject: [PATCH 07/30] Removing some waitlist code (#2406)

Task/Issue URL: https://app.asana.com/0/0/1206800069675135/f

## Description

Removing some of our waitlist code so that nothing screams "new" for the
VPN.
---
 .../NavigationBar/View/MoreOptionsMenu.swift  | 28 ++-----------------
 .../NetworkProtectionNavBarButtonModel.swift  | 21 --------------
 2 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
index 24ecc77e86..6ff8bfea32 100644
--- a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
+++ b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
@@ -339,18 +339,9 @@ final class MoreOptionsMenu: NSMenu {
 
 #if NETWORK_PROTECTION
         if networkProtectionFeatureVisibility.isNetworkProtectionVisible() {
-            let isWaitlistUser = NetworkProtectionWaitlist().waitlistStorage.isWaitlistUser
-            let hasAuthToken = NetworkProtectionKeychainTokenStore().isFeatureActivated
-
             let networkProtectionItem: NSMenuItem
 
-            // If the user can see the VPN option but they haven't joined the waitlist or don't have an auth token, show the "New"
-            // badge to bring it to their attention.
-            if !isWaitlistUser && !hasAuthToken {
-                networkProtectionItem = makeNetworkProtectionItem(showNewLabel: true)
-            } else {
-                networkProtectionItem = makeNetworkProtectionItem(showNewLabel: false)
-            }
+            networkProtectionItem = makeNetworkProtectionItem()
 
             items.append(networkProtectionItem)
 
@@ -490,25 +481,12 @@ final class MoreOptionsMenu: NSMenu {
     }
 
 #if NETWORK_PROTECTION
-    private func makeNetworkProtectionItem(showNewLabel: Bool) -> NSMenuItem {
+    private func makeNetworkProtectionItem() -> NSMenuItem {
         let networkProtectionItem = NSMenuItem(title: "", action: #selector(showNetworkProtectionStatus(_:)), keyEquivalent: "")
             .targetting(self)
             .withImage(.image(for: .vpnIcon))
 
-        if showNewLabel {
-            let attributedText = NSMutableAttributedString(string: UserText.networkProtection)
-            attributedText.append(NSAttributedString(string: "  "))
-
-            let imageAttachment = NSTextAttachment()
-            imageAttachment.image = .newLabel
-            imageAttachment.setImageHeight(height: 16, offset: .init(x: 0, y: -4))
-
-            attributedText.append(NSAttributedString(attachment: imageAttachment))
-
-            networkProtectionItem.attributedTitle = attributedText
-        } else {
-            networkProtectionItem.title = UserText.networkProtection
-        }
+        networkProtectionItem.title = UserText.networkProtection
 
         return networkProtectionItem
     }
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
index c756d18ac6..057f5b622c 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
@@ -113,13 +113,6 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
         guard [.normal, .integrationTests].contains(NSApp.runType) else { return NSImage() }
 #endif
 
-        let isWaitlistUser = NetworkProtectionWaitlist().waitlistStorage.isWaitlistUser
-        let hasAuthToken = NetworkProtectionKeychainTokenStore().isFeatureActivated
-
-        if !isWaitlistUser && !hasAuthToken {
-            return .networkProtectionAvailableButton
-        }
-
         if NetworkProtectionWaitlist().readyToAcceptTermsAndConditions {
             return .networkProtectionAvailableButton
         }
@@ -191,20 +184,6 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
                 showButton = true
                 return
             }
-
-            let waitlist = NetworkProtectionWaitlist()
-            let isWaitlistUser = waitlist.waitlistStorage.isWaitlistUser
-            let hasAuthToken = NetworkProtectionKeychainTokenStore().isFeatureActivated
-
-#if !APPSTORE
-            // If the user hasn't signed up to the waitlist or doesn't have an auth token through some other method, then show them the badged icon
-            // to get their attention and encourage them to sign up. Also avoid showing the button is the user has opened the waitlist UI but
-            // dismissed it.
-            if !isWaitlistUser && !hasAuthToken && !waitlist.waitlistSignUpPromptDismissed {
-                showButton = true
-                return
-            }
-#endif
         }
 
         guard !isPinned,

From 208d549c63c35f2201fcb4190d46c158e3161222 Mon Sep 17 00:00:00 2001
From: Juan Manuel Pereira <juanmanuel.pereira1@gmail.com>
Date: Thu, 14 Mar 2024 14:22:25 -0300
Subject: [PATCH 08/30] DBP: Add stage granularity to Pixels (#2365)

---
 DuckDuckGo/DBP/DBPHomeViewController.swift    |  1 +
 .../DataBrokerRunCustomJSONViewModel.swift    |  6 ++
 .../Operations/DataBrokerOperation.swift      | 21 ++++-
 .../Operations/OptOutOperation.swift          |  1 +
 .../Pixels/DataBrokerProtectionPixels.swift   | 15 +++-
 ...kerProtectionStageDurationCalculator.swift | 16 +++-
 .../DataBrokerOperationActionTests.swift      | 80 +++++++++++++++++++
 ...kerProfileQueryOperationManagerTests.swift |  2 +-
 .../DataBrokerProtectionTests/Mocks.swift     | 71 ++++++++++++++++
 9 files changed, 205 insertions(+), 8 deletions(-)

diff --git a/DuckDuckGo/DBP/DBPHomeViewController.swift b/DuckDuckGo/DBP/DBPHomeViewController.swift
index e590867c10..b64fc689e8 100644
--- a/DuckDuckGo/DBP/DBPHomeViewController.swift
+++ b/DuckDuckGo/DBP/DBPHomeViewController.swift
@@ -163,6 +163,7 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .optOutValidate,
                     .optOutFinish,
                     .optOutSubmitSuccess,
+                    .optOutFillForm,
                     .optOutSuccess,
                     .optOutFailure,
                     .backgroundAgentStarted,
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
index 50208b2899..e0241d5542 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
@@ -219,6 +219,9 @@ final class FakeStageDurationCalculator: StageDurationCalculator {
     func fireOptOutEmailConfirm() {
     }
 
+    func fireOptOutFillForm() {
+    }
+
     func fireOptOutValidate() {
     }
 
@@ -239,6 +242,9 @@ final class FakeStageDurationCalculator: StageDurationCalculator {
 
     func setStage(_ stage: Stage) {
     }
+
+    func setLastActionId(_ actionID: String) {
+    }
 }
 
 /*
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperation.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperation.swift
index d421924f93..dd34f6c0c6 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperation.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerOperation.swift
@@ -69,7 +69,20 @@ extension DataBrokerOperation {
 
     // MARK: - Shared functions
 
+    // swiftlint:disable:next cyclomatic_complexity
     func runNextAction(_ action: Action) async {
+        switch action {
+        case is GetCaptchaInfoAction:
+            stageCalculator?.setStage(.captchaParse)
+        case is ClickAction:
+            stageCalculator?.setStage(.fillForm)
+        case is FillFormAction:
+            stageCalculator?.setStage(.fillForm)
+        case is ExpectationAction:
+            stageCalculator?.setStage(.submit)
+        default: ()
+        }
+
         if let emailConfirmationAction = action as? EmailConfirmationAction {
             do {
                 stageCalculator?.fireOptOutSubmit()
@@ -109,10 +122,6 @@ extension DataBrokerOperation {
             }
         }
 
-        if action as? GetCaptchaInfoAction != nil {
-            stageCalculator?.setStage(.captchaParse)
-        }
-
         await webViewHandler?.execute(action: action, data: .userData(query.profileQuery, self.extractedProfile))
     }
 
@@ -176,8 +185,12 @@ extension DataBrokerOperation {
     func success(actionId: String, actionType: ActionType) async {
         switch actionType {
         case .click:
+            stageCalculator?.fireOptOutFillForm()
             try? await webViewHandler?.waitForWebViewLoad(timeoutInSeconds: 30)
             await executeNextStep()
+        case .fillForm:
+            stageCalculator?.fireOptOutFillForm()
+            await executeNextStep()
         default: await executeNextStep()
         }
     }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OptOutOperation.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OptOutOperation.swift
index 4bc7420f91..ba59229aeb 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OptOutOperation.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OptOutOperation.swift
@@ -109,6 +109,7 @@ final class OptOutOperation: DataBrokerOperation {
         try? await Task.sleep(nanoseconds: UInt64(operationAwaitTime) * 1_000_000_000)
 
         if let action = actionsHandler?.nextAction(), self.shouldRunNextStep() {
+            stageCalculator?.setLastActionId(action.id)
             await runNextAction(action)
         } else {
             await webViewHandler?.finish() // If we executed all steps we release the web view
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
index eaf0c687c4..e7198fe713 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
@@ -53,6 +53,7 @@ public enum DataBrokerProtectionPixels {
         static let errorDetailsKey = "error_details"
         static let pattern = "pattern"
         static let isParent = "is_parent"
+        static let actionIDKey = "action_id"
     }
 
     case error(error: DataBrokerProtectionError, dataBroker: String)
@@ -69,11 +70,12 @@ public enum DataBrokerProtectionPixels {
     case optOutEmailConfirm(dataBroker: String, attemptId: UUID, duration: Double)
     case optOutValidate(dataBroker: String, attemptId: UUID, duration: Double)
     case optOutFinish(dataBroker: String, attemptId: UUID, duration: Double)
+    case optOutFillForm(dataBroker: String, attemptId: UUID, duration: Double)
 
     // Process Pixels
     case optOutSubmitSuccess(dataBroker: String, attemptId: UUID, duration: Double, tries: Int, emailPattern: String?)
     case optOutSuccess(dataBroker: String, attemptId: UUID, duration: Double, brokerType: DataBrokerHierarchy)
-    case optOutFailure(dataBroker: String, attemptId: UUID, duration: Double, stage: String, tries: Int, emailPattern: String?)
+    case optOutFailure(dataBroker: String, attemptId: UUID, duration: Double, stage: String, tries: Int, emailPattern: String?, actionID: String?)
 
     // Backgrond Agent events
     case backgroundAgentStarted
@@ -133,6 +135,7 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
         case .optOutEmailConfirm: return "m_mac_dbp_macos_optout_stage_email-confirm"
         case .optOutValidate: return "m_mac_dbp_macos_optout_stage_validate"
         case .optOutFinish: return "m_mac_dbp_macos_optout_stage_finish"
+        case .optOutFillForm: return "m_mac_dbp_macos_optout_stage_fill-form"
 
             // Process Pixels
         case .optOutSubmitSuccess: return "m_mac_dbp_macos_optout_process_submit-success"
@@ -227,6 +230,8 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
             return [Consts.dataBrokerParamKey: dataBroker, Consts.attemptIdParamKey: attemptId.uuidString, Consts.durationParamKey: String(duration)]
         case .optOutFinish(let dataBroker, let attemptId, let duration):
             return [Consts.dataBrokerParamKey: dataBroker, Consts.attemptIdParamKey: attemptId.uuidString, Consts.durationParamKey: String(duration)]
+        case .optOutFillForm(let dataBroker, let attemptId, let duration):
+            return [Consts.dataBrokerParamKey: dataBroker, Consts.attemptIdParamKey: attemptId.uuidString, Consts.durationParamKey: String(duration)]
         case .optOutSubmitSuccess(let dataBroker, let attemptId, let duration, let tries, let pattern):
             var params = [Consts.dataBrokerParamKey: dataBroker, Consts.attemptIdParamKey: attemptId.uuidString, Consts.durationParamKey: String(duration), Consts.triesKey: String(tries)]
             if let pattern = pattern {
@@ -235,11 +240,16 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
             return params
         case .optOutSuccess(let dataBroker, let attemptId, let duration, let type):
             return [Consts.dataBrokerParamKey: dataBroker, Consts.attemptIdParamKey: attemptId.uuidString, Consts.durationParamKey: String(duration), Consts.isParent: String(type.rawValue)]
-        case .optOutFailure(let dataBroker, let attemptId, let duration, let stage, let tries, let pattern):
+        case .optOutFailure(let dataBroker, let attemptId, let duration, let stage, let tries, let pattern, let actionID):
             var params = [Consts.dataBrokerParamKey: dataBroker, Consts.attemptIdParamKey: attemptId.uuidString, Consts.durationParamKey: String(duration), Consts.stageKey: stage, Consts.triesKey: String(tries)]
             if let pattern = pattern {
                 params[Consts.pattern] = pattern
             }
+
+            if let actionID = actionID {
+                params[Consts.actionIDKey] = actionID
+            }
+
             return params
         case .backgroundAgentStarted,
                 .backgroundAgentRunOperationsAndStartSchedulerIfPossible,
@@ -303,6 +313,7 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .optOutValidate,
                     .optOutFinish,
                     .optOutSubmitSuccess,
+                    .optOutFillForm,
                     .optOutSuccess,
                     .optOutFailure,
                     .backgroundAgentStarted,
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift
index ef5879d122..7de439e30b 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift
@@ -32,6 +32,7 @@ enum Stage: String {
     case emailConfirm = "email-confirm"
     case validate
     case other
+    case fillForm = "fill-form"
 }
 
 protocol StageDurationCalculator {
@@ -43,6 +44,7 @@ protocol StageDurationCalculator {
     func fireOptOutCaptchaSend()
     func fireOptOutCaptchaSolve()
     func fireOptOutSubmit()
+    func fireOptOutFillForm()
     func fireOptOutEmailReceive()
     func fireOptOutEmailConfirm()
     func fireOptOutValidate()
@@ -53,6 +55,7 @@ protocol StageDurationCalculator {
     func fireScanError(error: Error)
     func setStage(_ stage: Stage)
     func setEmailPattern(_ emailPattern: String?)
+    func setLastActionId(_ actionID: String)
 }
 
 final class DataBrokerProtectionStageDurationCalculator: StageDurationCalculator {
@@ -61,6 +64,7 @@ final class DataBrokerProtectionStageDurationCalculator: StageDurationCalculator
     let dataBroker: String
     let startTime: Date
     var lastStateTime: Date
+    private (set) var actionID: String?
     private (set) var stage: Stage = .other
     private (set) var emailPattern: String?
 
@@ -137,13 +141,18 @@ final class DataBrokerProtectionStageDurationCalculator: StageDurationCalculator
                                           emailPattern: emailPattern))
     }
 
+    func fireOptOutFillForm() {
+        handler.fire(.optOutFillForm(dataBroker: dataBroker, attemptId: attemptId, duration: durationSinceLastStage()))
+    }
+
     func fireOptOutFailure(tries: Int) {
         handler.fire(.optOutFailure(dataBroker: dataBroker,
                                     attemptId: attemptId,
                                     duration: durationSinceStartTime(),
                                     stage: stage.rawValue,
                                     tries: tries,
-                                    emailPattern: emailPattern))
+                                    emailPattern: emailPattern,
+                                    actionID: actionID))
     }
 
     func fireScanSuccess(matchesFound: Int) {
@@ -190,10 +199,15 @@ final class DataBrokerProtectionStageDurationCalculator: StageDurationCalculator
     // identifying the stage so we can know which one was the one that failed.
 
     func setStage(_ stage: Stage) {
+        lastStateTime = Date() // When we set a new stage we need to reset the lastStateTime so we count from there
         self.stage = stage
     }
 
     func setEmailPattern(_ emailPattern: String?) {
         self.emailPattern = emailPattern
     }
+
+    func setLastActionId(_ actionID: String) {
+        self.actionID = actionID
+    }
 }
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerOperationActionTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerOperationActionTests.swift
index c751a35976..ecf3919f36 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerOperationActionTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerOperationActionTests.swift
@@ -329,4 +329,84 @@ final class DataBrokerOperationActionTests: XCTestCase {
 
         XCTAssertEqual(webViewHandler.wasLoadCalledWithURL?.absoluteString, "https://www.duckduckgo.com")
     }
+
+    func testWhenGetCaptchaActionRuns_thenStageIsSetToCaptchaParse() async {
+        let mockStageCalculator = MockStageDurationCalculator()
+        let captchaAction = GetCaptchaInfoAction(id: "1", actionType: .getCaptchaInfo, selector: "captcha", dataSource: nil)
+        let sut = OptOutOperation(
+            privacyConfig: PrivacyConfigurationManagingMock(),
+            prefs: ContentScopeProperties.mock,
+            query: BrokerProfileQueryData.mock(),
+            emailService: emailService,
+            captchaService: captchaService,
+            operationAwaitTime: 0,
+            shouldRunNextStep: { true }
+        )
+
+        sut.stageCalculator = mockStageCalculator
+
+        await sut.runNextAction(captchaAction)
+
+        XCTAssertEqual(mockStageCalculator.stage, .captchaParse)
+    }
+
+    func testWhenClickActionRuns_thenStageIsSetToSubmit() async {
+        let mockStageCalculator = MockStageDurationCalculator()
+        let clickAction = ClickAction(id: "1", actionType: .click, elements: [PageElement](), dataSource: nil)
+        let sut = OptOutOperation(
+            privacyConfig: PrivacyConfigurationManagingMock(),
+            prefs: ContentScopeProperties.mock,
+            query: BrokerProfileQueryData.mock(),
+            emailService: emailService,
+            captchaService: captchaService,
+            operationAwaitTime: 0,
+            shouldRunNextStep: { true }
+        )
+
+        sut.stageCalculator = mockStageCalculator
+
+        await sut.runNextAction(clickAction)
+
+        XCTAssertEqual(mockStageCalculator.stage, .fillForm)
+    }
+
+    func testWhenExpectationActionRuns_thenStageIsSetToSubmit() async {
+        let mockStageCalculator = MockStageDurationCalculator()
+        let expectationAction = ExpectationAction(id: "1", actionType: .expectation, expectations: [Item](), dataSource: nil)
+        let sut = OptOutOperation(
+            privacyConfig: PrivacyConfigurationManagingMock(),
+            prefs: ContentScopeProperties.mock,
+            query: BrokerProfileQueryData.mock(),
+            emailService: emailService,
+            captchaService: captchaService,
+            operationAwaitTime: 0,
+            shouldRunNextStep: { true }
+        )
+
+        sut.stageCalculator = mockStageCalculator
+
+        await sut.runNextAction(expectationAction)
+
+        XCTAssertEqual(mockStageCalculator.stage, .submit)
+    }
+
+    func testWhenFillFormActionRuns_thenStageIsSetToFillForm() async {
+        let mockStageCalculator = MockStageDurationCalculator()
+        let fillFormAction = FillFormAction(id: "1", actionType: .fillForm, selector: "", elements: [PageElement](), dataSource: nil)
+        let sut = OptOutOperation(
+            privacyConfig: PrivacyConfigurationManagingMock(),
+            prefs: ContentScopeProperties.mock,
+            query: BrokerProfileQueryData.mock(),
+            emailService: emailService,
+            captchaService: captchaService,
+            operationAwaitTime: 0,
+            shouldRunNextStep: { true }
+        )
+
+        sut.stageCalculator = mockStageCalculator
+
+        await sut.runNextAction(fillFormAction)
+
+        XCTAssertEqual(mockStageCalculator.stage, .fillForm)
+    }
 }
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProfileQueryOperationManagerTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProfileQueryOperationManagerTests.swift
index a61ef2a968..08796454c7 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProfileQueryOperationManagerTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProfileQueryOperationManagerTests.swift
@@ -774,7 +774,7 @@ final class DataBrokerProfileQueryOperationManagerTests: XCTestCase {
         } catch {
             if let lastPixelFired = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last {
                 switch lastPixelFired {
-                case .optOutFailure(_, _, _, _, let tries, _):
+                case .optOutFailure(_, _, _, _, let tries, _, _):
                     XCTAssertEqual(tries, 3)
                 default: XCTFail("We should be firing the opt-out submit-success pixel last")
                 }
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift
index 9f5db28f72..24a55ee92d 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift
@@ -826,3 +826,74 @@ final class MockAppVersion: AppVersionNumberProvider {
         self.versionNumber = versionNumber
     }
 }
+
+final class MockStageDurationCalculator: StageDurationCalculator {
+    var stage: Stage?
+
+    func durationSinceLastStage() -> Double {
+        return 0.0
+    }
+
+    func durationSinceStartTime() -> Double {
+        return 0.0
+    }
+
+    func fireOptOutStart() {
+    }
+
+    func fireOptOutEmailGenerate() {
+    }
+
+    func fireOptOutCaptchaParse() {
+    }
+
+    func fireOptOutCaptchaSend() {
+    }
+
+    func fireOptOutCaptchaSolve() {
+    }
+
+    func fireOptOutSubmit() {
+    }
+
+    func fireOptOutEmailReceive() {
+    }
+
+    func fireOptOutEmailConfirm() {
+    }
+
+    func fireOptOutValidate() {
+    }
+
+    func fireOptOutSubmitSuccess(tries: Int) {
+    }
+
+    func fireOptOutFillForm() {
+    }
+
+    func fireOptOutFailure(tries: Int) {
+    }
+
+    func fireScanSuccess(matchesFound: Int) {
+    }
+
+    func fireScanFailed() {
+    }
+
+    func fireScanError(error: any Error) {
+    }
+
+    func setStage(_ stage: DataBrokerProtection.Stage) {
+        self.stage = stage
+    }
+
+    func setEmailPattern(_ emailPattern: String?) {
+    }
+
+    func setLastActionId(_ actionID: String) {
+    }
+
+    func clear() {
+        self.stage = nil
+    }
+}

From adfa4d9cae2640772c4161db8c829443cea91ae5 Mon Sep 17 00:00:00 2001
From: Christopher Brind <brindy@duckduckgo.com>
Date: Thu, 14 Mar 2024 18:14:43 +0000
Subject: [PATCH 09/30] bump bsk to fix retain cycle (#2422)

Task/Issue URL:
https://app.asana.com/0/414235014887631/1206840485929811/f
Tech Design URL:
CC:

**Description**:
Bumps BSK to fix retain cycle

**Steps to test this PR**:
1. Launch macOS app
---
 DuckDuckGo.xcodeproj/project.pbxproj                          | 2 +-
 .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++--
 LocalPackages/DataBrokerProtection/Package.swift              | 2 +-
 LocalPackages/NetworkProtectionMac/Package.swift              | 2 +-
 LocalPackages/SubscriptionUI/Package.swift                    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index 373021ff66..e2d8d1c9d2 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -13770,7 +13770,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = "121.0.0-1";
+				version = "121.0.0-2";
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 3f56380165..550a377509 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "592242549bc2258d5ebeb3224029267915bcca52",
-        "version" : "121.0.0-1"
+        "revision" : "d64db9f34a00f54b2a6b518ddd461ad5b28321d9",
+        "version" : "121.0.0-2"
       }
     },
     {
diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
index e773b78b41..656e91c4e4 100644
--- 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: "121.0.0-1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "121.0.0-2"),
         .package(path: "../PixelKit"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
index 8d5e069afb..34c210e4d3 100644
--- a/LocalPackages/NetworkProtectionMac/Package.swift
+++ b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -31,7 +31,7 @@ let package = Package(
         .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "121.0.0-1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "121.0.0-2"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../LoginItems"),
diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
index 91bad2741b..66efa5c9f6 100644
--- 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: "121.0.0-1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "121.0.0-2"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [

From c3e59d621c58705a9dee9c236271236c0c6e3ff9 Mon Sep 17 00:00:00 2001
From: Dax the Duck <dax@duckduckgo.com>
Date: Thu, 14 Mar 2024 18:29:18 +0000
Subject: [PATCH 10/30] Bump version to 1.79.0 (143)

---
 Configuration/BuildNumber.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
index 73bf1efab5..9a14499d7a 100644
--- a/Configuration/BuildNumber.xcconfig
+++ b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 142
+CURRENT_PROJECT_VERSION = 143

From 6a7015e221413ad0756908a5f2a303668cb428d8 Mon Sep 17 00:00:00 2001
From: Christopher Brind <brindy@duckduckgo.com>
Date: Thu, 14 Mar 2024 20:04:42 +0000
Subject: [PATCH 11/30] bump bsk to fix retain cycle (#2425)

Task/Issue URL:
https://app.asana.com/0/414235014887631/1206840485929811/f
Tech Design URL:
CC:

**Description**:
Bump BSK to fix retain cycle

**Steps to test this PR**:
1. Launch the app
---
 DuckDuckGo.xcodeproj/project.pbxproj                          | 2 +-
 .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++--
 LocalPackages/DataBrokerProtection/Package.swift              | 2 +-
 LocalPackages/NetworkProtectionMac/Package.swift              | 2 +-
 LocalPackages/SubscriptionUI/Package.swift                    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index 79f1871b76..a809af52f6 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -13749,7 +13749,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 123.0.0;
+				version = 123.0.1;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 17ffe51f48..7f8548488a 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "d110859c6100daa59bcbc200dd8565975faf2151",
-        "version" : "123.0.0"
+        "revision" : "838cb53a8f7050d87ae6931b45ce126ece994359",
+        "version" : "123.0.1"
       }
     },
     {
diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
index 4be565fe0e..8e88a31067 100644
--- 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: "123.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "123.0.1"),
         .package(path: "../PixelKit"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
index 8899b18238..a5aa5f7c63 100644
--- a/LocalPackages/NetworkProtectionMac/Package.swift
+++ b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -31,7 +31,7 @@ let package = Package(
         .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "123.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "123.0.1"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../LoginItems"),
diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
index df6fe2d263..fb17968848 100644
--- 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: "123.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "123.0.1"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [

From e1f7ab0ac5ec1380d671663d9d2917a41216fb0c Mon Sep 17 00:00:00 2001
From: Fernando Bunn <bunn@idevzilla.com>
Date: Thu, 14 Mar 2024 20:15:43 +0000
Subject: [PATCH 12/30] Update broker json (#2407)

Task/Issue URL:
https://app.asana.com/0/1199230911884351/1206835317209633/f

**Description**:
Add unique name for PeopleWhiz child sites
---
 .../Resources/JSON/people-wizard.com.json     | 51 +++++++++++++++++++
 .../Resources/JSON/peopleswhizr.com.json      | 51 +++++++++++++++++++
 .../Resources/JSON/peopleswiz.com.json        | 51 +++++++++++++++++++
 .../Resources/JSON/peopleswizard.com.json     | 51 +++++++++++++++++++
 .../Resources/JSON/peoplewhiz.com.json        | 32 ++++++------
 .../Resources/JSON/peoplewhiz.net.json        | 51 +++++++++++++++++++
 .../Resources/JSON/peoplewhized.com.json      | 51 +++++++++++++++++++
 .../Resources/JSON/peoplewhized.net.json      | 51 +++++++++++++++++++
 .../Resources/JSON/peoplewhizr.com.json       | 51 +++++++++++++++++++
 .../Resources/JSON/peoplewhizr.net.json       | 51 +++++++++++++++++++
 .../Resources/JSON/peoplewiz.com.json         | 51 +++++++++++++++++++
 .../Resources/JSON/peoplewizard.net.json      | 51 +++++++++++++++++++
 .../Resources/JSON/peoplewizr.com.json        | 51 +++++++++++++++++++
 13 files changed, 628 insertions(+), 16 deletions(-)
 create mode 100644 LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/people-wizard.com.json
 create mode 100644 LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswhizr.com.json
 create mode 100644 LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswiz.com.json
 create mode 100644 LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswizard.com.json
 create mode 100644 LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.net.json
 create mode 100644 LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.com.json
 create mode 100644 LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.net.json
 create mode 100644 LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.com.json
 create mode 100644 LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.net.json
 create mode 100644 LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewiz.com.json
 create mode 100644 LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizard.net.json
 create mode 100644 LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizr.com.json

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/people-wizard.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/people-wizard.com.json
new file mode 100644
index 0000000000..33b35506fb
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/people-wizard.com.json
@@ -0,0 +1,51 @@
+{
+  "name": "People-Wizard.com",
+  "url": "people-wizard.com",
+  "version": "0.1.6",
+  "parent": "peoplewhiz.com",
+  "addedDatetime": 1709445600000,
+  "steps": [
+    {
+      "stepType": "scan",
+      "scanType": "templatedUrl",
+      "actions": [
+        {
+          "actionType": "navigate",
+          "id": "19d2fe20-8de2-4719-b6af-d6e405544697",
+          "url": "https://www.people-wizard.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+        },
+        {
+          "actionType": "extract",
+          "id": "1344b079-bb6b-417b-9c4d-eec858914b13",
+          "selector": "[class^='ResultsTable__Record-sc']",
+          "profile": {
+            "name": {
+              "selector": "[class^='ResultsTable__Name-sc']"
+            },
+            "age": {
+              "selector": "[class^='ResultsTable__Age-sc']"
+            },
+            "addressCityState": {
+              "selector": ".MuiGrid-item:nth-child(3) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            },
+            "relativesList": {
+              "selector": ".MuiGrid-item:nth-child(4) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "stepType": "optOut",
+      "optOutType": "parentSiteOptOut",
+      "actions": []
+    }
+  ],
+  "schedulingConfig": {
+    "retryError": 48,
+    "confirmOptOutScan": 72,
+    "maintenanceScan": 240
+  }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswhizr.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswhizr.com.json
new file mode 100644
index 0000000000..c51c669302
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswhizr.com.json
@@ -0,0 +1,51 @@
+{
+  "name": "PeoplesWhizr",
+  "url": "peopleswhizr.com",
+  "version": "0.1.6",
+  "parent": "peoplewhiz.com",
+  "addedDatetime": 1709445600000,
+  "steps": [
+    {
+      "stepType": "scan",
+      "scanType": "templatedUrl",
+      "actions": [
+        {
+          "actionType": "navigate",
+          "id": "e1142da5-5cc5-4038-b23a-c6f13182caf0",
+          "url": "https://www.peopleswhizr.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+        },
+        {
+          "actionType": "extract",
+          "id": "bc952139-373b-4461-8e24-83661038f657",
+          "selector": "[class^='ResultsTable__Record-sc']",
+          "profile": {
+            "name": {
+              "selector": "[class^='ResultsTable__Name-sc']"
+            },
+            "age": {
+              "selector": "[class^='ResultsTable__Age-sc']"
+            },
+            "addressCityState": {
+              "selector": ".MuiGrid-item:nth-child(3) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            },
+            "relativesList": {
+              "selector": ".MuiGrid-item:nth-child(4) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "stepType": "optOut",
+      "optOutType": "parentSiteOptOut",
+      "actions": []
+    }
+  ],
+  "schedulingConfig": {
+    "retryError": 48,
+    "confirmOptOutScan": 72,
+    "maintenanceScan": 240
+  }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswiz.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswiz.com.json
new file mode 100644
index 0000000000..7c3aa7d2c8
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswiz.com.json
@@ -0,0 +1,51 @@
+{
+  "name": "PeoplesWiz",
+  "url": "peopleswiz.com",
+  "version": "0.1.6",
+  "parent": "peoplewhiz.com",
+  "addedDatetime": 1709445600000,
+  "steps": [
+    {
+      "stepType": "scan",
+      "scanType": "templatedUrl",
+      "actions": [
+        {
+          "actionType": "navigate",
+          "id": "48419647-ba1f-4625-8f9b-6531718c5c12",
+          "url": "https://www.peopleswiz.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+        },
+        {
+          "actionType": "extract",
+          "id": "9e1e6ff5-cb99-49aa-a37c-b3dc80012f19",
+          "selector": "[class^='ResultsTable__Record-sc']",
+          "profile": {
+            "name": {
+              "selector": "[class^='ResultsTable__Name-sc']"
+            },
+            "age": {
+              "selector": "[class^='ResultsTable__Age-sc']"
+            },
+            "addressCityState": {
+              "selector": ".MuiGrid-item:nth-child(3) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            },
+            "relativesList": {
+              "selector": ".MuiGrid-item:nth-child(4) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "stepType": "optOut",
+      "optOutType": "parentSiteOptOut",
+      "actions": []
+    }
+  ],
+  "schedulingConfig": {
+    "retryError": 48,
+    "confirmOptOutScan": 72,
+    "maintenanceScan": 240
+  }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswizard.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswizard.com.json
new file mode 100644
index 0000000000..9d288252ab
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peopleswizard.com.json
@@ -0,0 +1,51 @@
+{
+  "name": "PeoplesWizard",
+  "url": "peopleswizard.com",
+  "version": "0.1.6",
+  "parent": "peoplewhiz.com",
+  "addedDatetime": 1709445600000,
+  "steps": [
+    {
+      "stepType": "scan",
+      "scanType": "templatedUrl",
+      "actions": [
+        {
+          "actionType": "navigate",
+          "id": "b92d9477-3e4a-4022-be5d-3a5d02a84c90",
+          "url": "https://www.peopleswizard.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+        },
+        {
+          "actionType": "extract",
+          "id": "c538d04e-85ce-46a5-bbbd-3f9bd0fae078",
+          "selector": "[class^='ResultsTable__Record-sc']",
+          "profile": {
+            "name": {
+              "selector": "[class^='ResultsTable__Name-sc']"
+            },
+            "age": {
+              "selector": "[class^='ResultsTable__Age-sc']"
+            },
+            "addressCityState": {
+              "selector": ".MuiGrid-item:nth-child(3) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            },
+            "relativesList": {
+              "selector": ".MuiGrid-item:nth-child(4) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "stepType": "optOut",
+      "optOutType": "parentSiteOptOut",
+      "actions": []
+    }
+  ],
+  "schedulingConfig": {
+    "retryError": 48,
+    "confirmOptOutScan": 72,
+    "maintenanceScan": 240
+  }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.com.json
index 4266d710f9..861ede1a91 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.com.json
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.com.json
@@ -1,8 +1,8 @@
 {
-  "name": "PeopleWhiz",
+  "name": "PeopleWhiz.com",
   "url": "peoplewhiz.com",
   "version": "0.1.6",
-  "addedDatetime": 1676181600000,
+  "addedDatetime": 1676160000000,
   "steps": [
     {
       "stepType": "scan",
@@ -10,12 +10,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "25f11594-f04a-4d46-a7ef-9fb3ed237c2d",
+          "id": "581295d7-1fd9-4039-a207-e9b8216b3d0f",
           "url": "https://www.peoplewhiz.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
         },
         {
           "actionType": "extract",
-          "id": "eb93e81d-36d1-4a8a-ad3d-a87ae2018e74",
+          "id": "efa321f2-f214-411f-a87b-bc42feff7931",
           "selector": "[class^='ResultsTable__Record-sc']",
           "profile": {
             "name": {
@@ -42,12 +42,12 @@
       "actions": [
         {
           "actionType": "navigate",
-          "id": "ffb90236-10e7-4969-a305-1eb729a1177d",
+          "id": "2d9dd816-ec21-4210-91d1-3725837a11b1",
           "url": "https://www.peoplewhiz.com/optout/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
         },
         {
           "actionType": "click",
-          "id": "4ee5b821-8b26-4a16-928b-5dd20a7292a2",
+          "id": "327e4f66-a554-4aaa-9a99-f789740112a8",
           "elements": [
             {
               "selector": "button",
@@ -74,7 +74,7 @@
         },
         {
           "actionType": "fillForm",
-          "id": "64f99a6d-f4bb-425e-a430-dded77ed24d0",
+          "id": "4c088375-cd04-4ce3-ab05-0833b55b82b4",
           "selector": "form",
           "elements": [
             {
@@ -85,7 +85,7 @@
         },
         {
           "actionType": "click",
-          "id": "c39d5b51-794a-4c2f-8acc-ed999b5b2245",
+          "id": "0d61b830-c740-4d55-a32e-dcc370ff0cdc",
           "elements": [
             {
               "type": "button",
@@ -95,7 +95,7 @@
         },
         {
           "actionType": "click",
-          "id": "9dec9932-00ba-4a7d-85b3-d3d5e5ee7bcc",
+          "id": "617dd625-36bb-4111-83f2-9e2a94beed7d",
           "elements": [
             {
               "type": "button",
@@ -105,7 +105,7 @@
         },
         {
           "actionType": "fillForm",
-          "id": "00405f21-3fcf-4114-9d56-233abceff54a",
+          "id": "271cfc3e-deb7-4da5-8e2a-c866d28cde02",
           "selector": "form",
           "elements": [
             {
@@ -116,17 +116,17 @@
         },
         {
           "actionType": "getCaptchaInfo",
-          "id": "4e2b5224-9293-45d0-98fa-2b088079ff83",
+          "id": "d5316049-1a13-4a51-b5fc-bf1607c0d6e9",
           "selector": "[class^='Confirm__ReCaptchaContainer-sc']"
         },
         {
           "actionType": "solveCaptcha",
-          "id": "006b796c-cf4e-4a7e-a10c-f5c202dfa52e",
+          "id": "a93d0de2-fc52-4c32-8b7e-74b7a5dc078e",
           "selector": "[class^='Confirm__ReCaptchaContainer-sc']"
         },
         {
           "actionType": "click",
-          "id": "003e51ee-6ccb-49eb-b820-e1af2e6fc407",
+          "id": "e0b1077d-4a8b-4d30-ba21-550367363d00",
           "elements": [
             {
               "type": "button",
@@ -136,7 +136,7 @@
         },
         {
           "actionType": "expectation",
-          "id": "9866e653-d719-4796-8153-4fa89f673d70",
+          "id": "5b261491-18ce-476d-9990-4afe2cbadfb3",
           "expectations": [
             {
               "type": "text",
@@ -147,12 +147,12 @@
         },
         {
           "actionType": "emailConfirmation",
-          "id": "efa0d7c1-2081-4bb5-bff9-5d60eef4e8c8",
+          "id": "86420965-0bd7-49ee-8034-bbea1d34c3d6",
           "pollingTime": 30
         },
         {
           "actionType": "expectation",
-          "id": "71781ca0-881f-4cc3-b918-0112f952a05e",
+          "id": "0884ae5d-b57b-4e62-92f5-01f4adf06005",
           "expectations": [
             {
               "type": "text",
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.net.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.net.json
new file mode 100644
index 0000000000..697a7a94e1
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhiz.net.json
@@ -0,0 +1,51 @@
+{
+  "name": "PeopleWhiz.net",
+  "url": "peoplewhiz.net",
+  "version": "0.1.6",
+  "parent": "peoplewhiz.com",
+  "addedDatetime": 1709424000000,
+  "steps": [
+    {
+      "stepType": "scan",
+      "scanType": "templatedUrl",
+      "actions": [
+        {
+          "actionType": "navigate",
+          "id": "72348ba6-cfe1-493e-a6bf-a7b15eefe688",
+          "url": "https://www.peoplewhiz.net/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+        },
+        {
+          "actionType": "extract",
+          "id": "9e0d566b-dd31-40a7-9315-ec6fba8d6233",
+          "selector": "[class^='ResultsTable__Record-sc']",
+          "profile": {
+            "name": {
+              "selector": "[class^='ResultsTable__Name-sc']"
+            },
+            "age": {
+              "selector": "[class^='ResultsTable__Age-sc']"
+            },
+            "addressCityState": {
+              "selector": ".MuiGrid-item:nth-child(3) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            },
+            "relativesList": {
+              "selector": ".MuiGrid-item:nth-child(4) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "stepType": "optOut",
+      "optOutType": "parentSiteOptOut",
+      "actions": []
+    }
+  ],
+  "schedulingConfig": {
+    "retryError": 48,
+    "confirmOptOutScan": 72,
+    "maintenanceScan": 240
+  }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.com.json
new file mode 100644
index 0000000000..03a649fb82
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.com.json
@@ -0,0 +1,51 @@
+{
+  "name": "PeopleWhized.com",
+  "url": "peoplewhized.com",
+  "version": "0.1.6",
+  "parent": "peoplewhiz.com",
+  "addedDatetime": 1709424000000,
+  "steps": [
+    {
+      "stepType": "scan",
+      "scanType": "templatedUrl",
+      "actions": [
+        {
+          "actionType": "navigate",
+          "id": "d4cae653-4d48-425b-abe1-27c2c36a2503",
+          "url": "https://www.peoplewhized.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+        },
+        {
+          "actionType": "extract",
+          "id": "77517554-f1e7-4e73-b0d1-92f56a0f247c",
+          "selector": "[class^='ResultsTable__Record-sc']",
+          "profile": {
+            "name": {
+              "selector": "[class^='ResultsTable__Name-sc']"
+            },
+            "age": {
+              "selector": "[class^='ResultsTable__Age-sc']"
+            },
+            "addressCityState": {
+              "selector": ".MuiGrid-item:nth-child(3) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            },
+            "relativesList": {
+              "selector": ".MuiGrid-item:nth-child(4) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "stepType": "optOut",
+      "optOutType": "parentSiteOptOut",
+      "actions": []
+    }
+  ],
+  "schedulingConfig": {
+    "retryError": 48,
+    "confirmOptOutScan": 72,
+    "maintenanceScan": 240
+  }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.net.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.net.json
new file mode 100644
index 0000000000..7ff6ee6216
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhized.net.json
@@ -0,0 +1,51 @@
+{
+  "name": "PeopleWhized.net",
+  "url": "peoplewhized.net",
+  "version": "0.1.6",
+  "parent": "peoplewhiz.com",
+  "addedDatetime": 1709445600000,
+  "steps": [
+    {
+      "stepType": "scan",
+      "scanType": "templatedUrl",
+      "actions": [
+        {
+          "actionType": "navigate",
+          "id": "3fc4b8b9-b6d0-4700-8855-e3d3a8ee562c",
+          "url": "https://www.peoplewhized.net/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+        },
+        {
+          "actionType": "extract",
+          "id": "440406f6-bd8a-4af7-b509-43eb24c79e4c",
+          "selector": "[class^='ResultsTable__Record-sc']",
+          "profile": {
+            "name": {
+              "selector": "[class^='ResultsTable__Name-sc']"
+            },
+            "age": {
+              "selector": "[class^='ResultsTable__Age-sc']"
+            },
+            "addressCityState": {
+              "selector": ".MuiGrid-item:nth-child(3) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            },
+            "relativesList": {
+              "selector": ".MuiGrid-item:nth-child(4) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "stepType": "optOut",
+      "optOutType": "parentSiteOptOut",
+      "actions": []
+    }
+  ],
+  "schedulingConfig": {
+    "retryError": 48,
+    "confirmOptOutScan": 72,
+    "maintenanceScan": 240
+  }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.com.json
new file mode 100644
index 0000000000..ff7542026a
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.com.json
@@ -0,0 +1,51 @@
+{
+  "name": "PeopleWhizr.com",
+  "url": "peoplewhizr.com",
+  "version": "0.1.6",
+  "parent": "peoplewhiz.com",
+  "addedDatetime": 1709445600000,
+  "steps": [
+    {
+      "stepType": "scan",
+      "scanType": "templatedUrl",
+      "actions": [
+        {
+          "actionType": "navigate",
+          "id": "846e2915-d3bb-4db2-b212-992063c48254",
+          "url": "https://www.peoplewhizr.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+        },
+        {
+          "actionType": "extract",
+          "id": "21a783ce-7a7e-4a97-8dc2-ee4c2f3dc63a",
+          "selector": "[class^='ResultsTable__Record-sc']",
+          "profile": {
+            "name": {
+              "selector": "[class^='ResultsTable__Name-sc']"
+            },
+            "age": {
+              "selector": "[class^='ResultsTable__Age-sc']"
+            },
+            "addressCityState": {
+              "selector": ".MuiGrid-item:nth-child(3) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            },
+            "relativesList": {
+              "selector": ".MuiGrid-item:nth-child(4) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "stepType": "optOut",
+      "optOutType": "parentSiteOptOut",
+      "actions": []
+    }
+  ],
+  "schedulingConfig": {
+    "retryError": 48,
+    "confirmOptOutScan": 72,
+    "maintenanceScan": 240
+  }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.net.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.net.json
new file mode 100644
index 0000000000..a4c3be5697
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewhizr.net.json
@@ -0,0 +1,51 @@
+{
+  "name": "PeopleWhizr.net",
+  "url": "peoplewhizr.net",
+  "version": "0.1.6",
+  "parent": "peoplewhiz.com",
+  "addedDatetime": 1709445600000,
+  "steps": [
+    {
+      "stepType": "scan",
+      "scanType": "templatedUrl",
+      "actions": [
+        {
+          "actionType": "navigate",
+          "id": "8cbdebad-158e-43ee-90f1-4f555feeef03",
+          "url": "https://www.peoplewhizr.net/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+        },
+        {
+          "actionType": "extract",
+          "id": "2955fb45-374e-42f2-a72a-f7a2ffe4ebe5",
+          "selector": "[class^='ResultsTable__Record-sc']",
+          "profile": {
+            "name": {
+              "selector": "[class^='ResultsTable__Name-sc']"
+            },
+            "age": {
+              "selector": "[class^='ResultsTable__Age-sc']"
+            },
+            "addressCityState": {
+              "selector": ".MuiGrid-item:nth-child(3) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            },
+            "relativesList": {
+              "selector": ".MuiGrid-item:nth-child(4) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "stepType": "optOut",
+      "optOutType": "parentSiteOptOut",
+      "actions": []
+    }
+  ],
+  "schedulingConfig": {
+    "retryError": 48,
+    "confirmOptOutScan": 72,
+    "maintenanceScan": 240
+  }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewiz.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewiz.com.json
new file mode 100644
index 0000000000..3c4309d416
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewiz.com.json
@@ -0,0 +1,51 @@
+{
+  "name": "PeopleWiz",
+  "url": "peoplewiz.com",
+  "version": "0.1.6",
+  "parent": "peoplewhiz.com",
+  "addedDatetime": 1709445600000,
+  "steps": [
+    {
+      "stepType": "scan",
+      "scanType": "templatedUrl",
+      "actions": [
+        {
+          "actionType": "navigate",
+          "id": "723b8b9e-6f6d-4180-aaab-639682113875",
+          "url": "https://www.peoplewiz.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+        },
+        {
+          "actionType": "extract",
+          "id": "36ba376d-03c1-4ecc-92ed-2fe12bd79d6f",
+          "selector": "[class^='ResultsTable__Record-sc']",
+          "profile": {
+            "name": {
+              "selector": "[class^='ResultsTable__Name-sc']"
+            },
+            "age": {
+              "selector": "[class^='ResultsTable__Age-sc']"
+            },
+            "addressCityState": {
+              "selector": ".MuiGrid-item:nth-child(3) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            },
+            "relativesList": {
+              "selector": ".MuiGrid-item:nth-child(4) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "stepType": "optOut",
+      "optOutType": "parentSiteOptOut",
+      "actions": []
+    }
+  ],
+  "schedulingConfig": {
+    "retryError": 48,
+    "confirmOptOutScan": 72,
+    "maintenanceScan": 240
+  }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizard.net.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizard.net.json
new file mode 100644
index 0000000000..7715592055
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizard.net.json
@@ -0,0 +1,51 @@
+{
+  "name": "PeopleWizard.net",
+  "url": "peoplewizard.net",
+  "version": "0.1.6",
+  "parent": "peoplewhiz.com",
+  "addedDatetime": 1709445600000,
+  "steps": [
+    {
+      "stepType": "scan",
+      "scanType": "templatedUrl",
+      "actions": [
+        {
+          "actionType": "navigate",
+          "id": "177e5220-d31b-4405-8331-fe34fdb86266",
+          "url": "https://www.peoplewizard.net/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+        },
+        {
+          "actionType": "extract",
+          "id": "f6d41239-9208-419e-b101-c58e52a71d42",
+          "selector": "[class^='ResultsTable__Record-sc']",
+          "profile": {
+            "name": {
+              "selector": "[class^='ResultsTable__Name-sc']"
+            },
+            "age": {
+              "selector": "[class^='ResultsTable__Age-sc']"
+            },
+            "addressCityState": {
+              "selector": ".MuiGrid-item:nth-child(3) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            },
+            "relativesList": {
+              "selector": ".MuiGrid-item:nth-child(4) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "stepType": "optOut",
+      "optOutType": "parentSiteOptOut",
+      "actions": []
+    }
+  ],
+  "schedulingConfig": {
+    "retryError": 48,
+    "confirmOptOutScan": 72,
+    "maintenanceScan": 240
+  }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizr.com.json b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizr.com.json
new file mode 100644
index 0000000000..db79a59baf
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Resources/JSON/peoplewizr.com.json
@@ -0,0 +1,51 @@
+{
+  "name": "PeopleWizr",
+  "url": "peoplewizr.com",
+  "version": "0.1.6",
+  "parent": "peoplewhiz.com",
+  "addedDatetime": 1709445600000,
+  "steps": [
+    {
+      "stepType": "scan",
+      "scanType": "templatedUrl",
+      "actions": [
+        {
+          "actionType": "navigate",
+          "id": "20d29fc7-9def-4d28-b457-1784d705ae31",
+          "url": "https://www.peoplewizr.com/flow/results/${firstName}/${middleName|defaultIfEmpty:~}/${lastName}/${city}/${state}/${age}"
+        },
+        {
+          "actionType": "extract",
+          "id": "53c86c5d-3960-44a9-91a3-143b71d1e07f",
+          "selector": "[class^='ResultsTable__Record-sc']",
+          "profile": {
+            "name": {
+              "selector": "[class^='ResultsTable__Name-sc']"
+            },
+            "age": {
+              "selector": "[class^='ResultsTable__Age-sc']"
+            },
+            "addressCityState": {
+              "selector": ".MuiGrid-item:nth-child(3) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            },
+            "relativesList": {
+              "selector": ".MuiGrid-item:nth-child(4) [class^='ResultsTable__AddressAndLocation-sc']",
+              "findElements": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "stepType": "optOut",
+      "optOutType": "parentSiteOptOut",
+      "actions": []
+    }
+  ],
+  "schedulingConfig": {
+    "retryError": 48,
+    "confirmOptOutScan": 72,
+    "maintenanceScan": 240
+  }
+}

From 664f5d8f84bbfc947fd295d7f57fbb096cbd07e3 Mon Sep 17 00:00:00 2001
From: Diego Rey Mendez <diegoreymendez@users.noreply.github.com>
Date: Fri, 15 Mar 2024 03:49:17 +0100
Subject: [PATCH 13/30] Renamed some pixel parameters to be more clear (#2402)

Task/Issue URL:
https://app.asana.com/0/1199230911884351/1206830283741167/f

## Description

I'm standardizing pixel parameters because it seems we were using some
parameters incorrectly in PixelKit, or at least not how they're used in
the main app or in iOS.
- The error localized description is no longer passed as a default error
parameter in pixels because it's dangerous for privacy reasons.
- `errorDesc` and `underlyingErrorDesc` have been renamed to more
accurately describe what they should be used for.
---
 DuckDuckGo/Statistics/PixelParameters.swift            |  4 ++--
 .../Pixels/TransparentProxyProviderPixel.swift         |  2 +-
 .../Sources/PixelKit/PixelKit+Parameters.swift         |  8 ++------
 LocalPackages/PixelKit/Sources/PixelKit/PixelKit.swift |  4 +---
 .../PixelKit/Sources/PixelKit/PixelKitEvent.swift      |  4 ++--
 .../PixelKit/Sources/PixelKit/PixelKitEventV2.swift    |  3 +--
 .../PixelKitTestingUtilities/ValidatePixel.swift       |  2 +-
 .../PixelKitTestingUtilities/XCTestCase+PixelKit.swift | 10 ++--------
 8 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/DuckDuckGo/Statistics/PixelParameters.swift b/DuckDuckGo/Statistics/PixelParameters.swift
index 12312f60bb..2313656cc7 100644
--- a/DuckDuckGo/Statistics/PixelParameters.swift
+++ b/DuckDuckGo/Statistics/PixelParameters.swift
@@ -345,11 +345,11 @@ extension Error {
         let nsError = self as NSError
 
         params[PixelKit.Parameters.errorCode] = "\(nsError.code)"
-        params[PixelKit.Parameters.errorDesc] = nsError.domain
+        params[PixelKit.Parameters.errorDomain] = nsError.domain
 
         if let underlyingError = nsError.userInfo[NSUnderlyingErrorKey] as? NSError {
             params[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingError.code)"
-            params[PixelKit.Parameters.underlyingErrorDesc] = underlyingError.domain
+            params[PixelKit.Parameters.underlyingErrorDomain] = underlyingError.domain
         }
 
         if let sqlErrorCode = nsError.userInfo["SQLiteResultCode"] as? NSNumber {
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Pixels/TransparentProxyProviderPixel.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Pixels/TransparentProxyProviderPixel.swift
index aff7421bea..4e4024d08c 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Pixels/TransparentProxyProviderPixel.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Pixels/TransparentProxyProviderPixel.swift
@@ -25,7 +25,7 @@ extension TransparentProxyProvider.StartError: ErrorWithPixelParameters {
         case .failedToUpdateNetworkSettings(let underlyingError):
             return [
                 PixelKit.Parameters.underlyingErrorCode: "\((underlyingError as NSError).code)",
-                PixelKit.Parameters.underlyingErrorDesc: (underlyingError as NSError).domain,
+                PixelKit.Parameters.underlyingErrorDomain: (underlyingError as NSError).domain,
             ]
         default:
             return [:]
diff --git a/LocalPackages/PixelKit/Sources/PixelKit/PixelKit+Parameters.swift b/LocalPackages/PixelKit/Sources/PixelKit/PixelKit+Parameters.swift
index 7a25f133ff..ea08352d29 100644
--- a/LocalPackages/PixelKit/Sources/PixelKit/PixelKit+Parameters.swift
+++ b/LocalPackages/PixelKit/Sources/PixelKit/PixelKit+Parameters.swift
@@ -28,14 +28,12 @@ public extension PixelKit {
         public static let osMajorVersion = "osMajorVersion"
 
         public static let errorCode = "e"
-        public static let errorDomain = "errorDomain"
-        public static let errorDesc = "d"
+        public static let errorDomain = "d"
         public static let errorCount = "c"
         public static let errorSource = "error_source"
         public static let sourceBrowserVersion = "source_browser_version"
         public static let underlyingErrorCode = "ue"
-        public static let underlyingErrorDomain = "underlyingErrorDomain"
-        public static let underlyingErrorDesc = "ud"
+        public static let underlyingErrorDomain = "ud"
         public static let underlyingErrorSQLiteCode = "sqlrc"
         public static let underlyingErrorSQLiteExtendedCode = "sqlerc"
 
@@ -95,12 +93,10 @@ public extension Error {
 
         params[PixelKit.Parameters.errorCode] = "\(nsError.code)"
         params[PixelKit.Parameters.errorDomain] = nsError.domain
-        params[PixelKit.Parameters.errorDesc] = nsError.localizedDescription
 
         if let underlyingError = nsError.userInfo[NSUnderlyingErrorKey] as? NSError {
             params[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingError.code)"
             params[PixelKit.Parameters.underlyingErrorDomain] = underlyingError.domain
-            params[PixelKit.Parameters.underlyingErrorDesc] = underlyingError.localizedDescription
         }
 
         if let sqlErrorCode = nsError.userInfo["SQLiteResultCode"] as? NSNumber {
diff --git a/LocalPackages/PixelKit/Sources/PixelKit/PixelKit.swift b/LocalPackages/PixelKit/Sources/PixelKit/PixelKit.swift
index 9c616d0060..5370432743 100644
--- a/LocalPackages/PixelKit/Sources/PixelKit/PixelKit.swift
+++ b/LocalPackages/PixelKit/Sources/PixelKit/PixelKit.swift
@@ -204,7 +204,7 @@ public final class PixelKit {
 
     private func printDebugInfo(pixelName: String, parameters: [String: String], skipped: Bool = false) {
 #if DEBUG
-        let params = parameters.filter { key, _ in !["appVersion", "test"].contains(key) }
+        let params = parameters.filter { key, _ in !["test"].contains(key) }
         os_log(.debug, log: log, "👾 [%{public}@] %{public}@ %{public}@", skipped ? "SKIPPED" : "FIRED", pixelName.replacingOccurrences(of: "_", with: "."), params)
 #endif
     }
@@ -377,7 +377,6 @@ extension Dictionary where Key == String, Value == String {
 
         self[PixelKit.Parameters.errorCode] = "\(nsError.code)"
         self[PixelKit.Parameters.errorDomain] = nsError.domain
-        self[PixelKit.Parameters.errorDesc] = nsError.localizedDescription
 
         if let error = error as? PixelKitEventErrorDetails,
            let underlyingError = error.underlyingError {
@@ -385,7 +384,6 @@ extension Dictionary where Key == String, Value == String {
             let underlyingNSError = underlyingError as NSError
             self[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingNSError.code)"
             self[PixelKit.Parameters.underlyingErrorDomain] = underlyingNSError.domain
-            self[PixelKit.Parameters.underlyingErrorDesc] = underlyingNSError.localizedDescription
         } else if let underlyingError = nsError.userInfo["NSUnderlyingError"] as? NSError {
             self[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingError.code)"
             self[PixelKit.Parameters.underlyingErrorDomain] = underlyingError.domain
diff --git a/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEvent.swift b/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEvent.swift
index bc87070df3..ca352f3347 100644
--- a/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEvent.swift
+++ b/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEvent.swift
@@ -79,11 +79,11 @@ public final class DebugEvent: PixelKitEvent {
             let nsError = error as NSError
 
             params[PixelKit.Parameters.errorCode] = "\(nsError.code)"
-            params[PixelKit.Parameters.errorDesc] = nsError.domain
+            params[PixelKit.Parameters.errorDomain] = nsError.domain
 
             if let underlyingError = nsError.userInfo["NSUnderlyingError"] as? NSError {
                 params[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingError.code)"
-                params[PixelKit.Parameters.underlyingErrorDesc] = underlyingError.domain
+                params[PixelKit.Parameters.underlyingErrorDomain] = underlyingError.domain
             }
 
             if let sqlErrorCode = nsError.userInfo["SQLiteResultCode"] as? NSNumber {
diff --git a/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEventV2.swift b/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEventV2.swift
index 7048519e32..811bf4643d 100644
--- a/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEventV2.swift
+++ b/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEventV2.swift
@@ -30,8 +30,7 @@ extension PixelKitEventErrorDetails {
 
         return [
             PixelKit.Parameters.underlyingErrorCode: "\(nsError.code)",
-            PixelKit.Parameters.underlyingErrorDomain: nsError.domain,
-            PixelKit.Parameters.underlyingErrorDesc: nsError.localizedDescription
+            PixelKit.Parameters.underlyingErrorDomain: nsError.domain
         ]
     }
 }
diff --git a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/ValidatePixel.swift b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/ValidatePixel.swift
index a56f128454..00547deb5b 100644
--- a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/ValidatePixel.swift
+++ b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/ValidatePixel.swift
@@ -44,7 +44,7 @@ public final class PixelRequestValidator {
 
         if let error = expectedError as? NSError {
             XCTAssertEqual(parameters[PixelKit.Parameters.errorCode], "\(error.code)")
-            XCTAssertEqual(parameters[PixelKit.Parameters.errorDesc], error.domain)
+            XCTAssertEqual(parameters[PixelKit.Parameters.errorDomain], error.domain)
         }
     }
 }
diff --git a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/XCTestCase+PixelKit.swift b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/XCTestCase+PixelKit.swift
index 5088ba1371..325b7414b3 100644
--- a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/XCTestCase+PixelKit.swift
+++ b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/XCTestCase+PixelKit.swift
@@ -38,16 +38,14 @@ public extension XCTestCase {
     ///
     private static var errorPixelParameters = [
         PixelKit.Parameters.errorCode,
-        PixelKit.Parameters.errorDomain,
-        PixelKit.Parameters.errorDesc
+        PixelKit.Parameters.errorDomain
     ]
 
     /// List of underlying error pixel parameters
     ///
     private static var underlyingErrorPixelParameters = [
         PixelKit.Parameters.underlyingErrorCode,
-        PixelKit.Parameters.underlyingErrorDomain,
-        PixelKit.Parameters.underlyingErrorDesc
+        PixelKit.Parameters.underlyingErrorDomain
     ]
 
     /// Filter out the standard parameters.
@@ -75,13 +73,11 @@ public extension XCTestCase {
             let nsError = error as NSError
             expectedParameters[PixelKit.Parameters.errorCode] = "\(nsError.code)"
             expectedParameters[PixelKit.Parameters.errorDomain] = nsError.domain
-            expectedParameters[PixelKit.Parameters.errorDesc] = nsError.localizedDescription
 
             if let underlyingError = (error as? PixelKitEventErrorDetails)?.underlyingError {
                 let underlyingNSError = underlyingError as NSError
                 expectedParameters[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingNSError.code)"
                 expectedParameters[PixelKit.Parameters.underlyingErrorDomain] = underlyingNSError.domain
-                expectedParameters[PixelKit.Parameters.underlyingErrorDesc] = underlyingNSError.localizedDescription
             }
         }
 
@@ -129,14 +125,12 @@ public extension XCTestCase {
                 let nsError = error as NSError
                 XCTAssertEqual(firedParameters[PixelKit.Parameters.errorCode], String(nsError.code), file: file, line: line)
                 XCTAssertEqual(firedParameters[PixelKit.Parameters.errorDomain], nsError.domain, file: file, line: line)
-                XCTAssertEqual(firedParameters[PixelKit.Parameters.errorDesc], nsError.localizedDescription, file: file, line: line)
             }
 
             if let underlyingError = expectations.underlyingError {
                 let nsError = underlyingError as NSError
                 XCTAssertEqual(firedParameters[PixelKit.Parameters.underlyingErrorCode], String(nsError.code), file: file, line: line)
                 XCTAssertEqual(firedParameters[PixelKit.Parameters.underlyingErrorDomain], nsError.domain, file: file, line: line)
-                XCTAssertEqual(firedParameters[PixelKit.Parameters.underlyingErrorDesc], nsError.localizedDescription, file: file, line: line)
             }
 
             completion(true, nil)

From e9bd56dca465c05a6cec74c233c9cdc1032771da Mon Sep 17 00:00:00 2001
From: Dominik Kapusta <dkapusta@duckduckgo.com>
Date: Fri, 15 Mar 2024 06:54:37 +0100
Subject: [PATCH 14/30] Fix determining if internal release should be
 automatically bumped

---
 .github/workflows/bump_internal_release.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/bump_internal_release.yml b/.github/workflows/bump_internal_release.yml
index ba06acdcc6..1b9c4b3c4e 100644
--- a/.github/workflows/bump_internal_release.yml
+++ b/.github/workflows/bump_internal_release.yml
@@ -63,13 +63,21 @@ jobs:
             echo "skip-release=false" >> $GITHUB_OUTPUT
           else
             latest_tag="$(git describe --tags --abbrev=0)"
-            changed_files="$(git diff --name-only "$latest_tag".."origin/${release_branch}")"
+            latest_tag_sha="$(git rev-parse "$latest_tag")"
+            release_branch_sha="$(git rev-parse "origin/${release_branch}")"
 
-            if grep -q -v -e '.github' -e 'scripts' <<< "$changed_files"; then
-              echo "skip-release=false" >> $GITHUB_OUTPUT
-            else
-              echo "::warning::No changes to the release branch (or only changes to scripts and workflows). Skipping automatic release."
+            if [[ "${latest_tag_sha}" == "${release_branch_sha}" ]]; then
+              echo "::warning::Release branch's HEAD is already tagged. Skipping automatic release."
               echo "skip-release=true" >> $GITHUB_OUTPUT
+            else
+              changed_files="$(git diff --name-only "$latest_tag".."origin/${release_branch}")"
+              if grep -q -v -e '.github' -e 'scripts' <<< "$changed_files"; then
+                echo "::warning::New code changes found in the release branch since the last release. Will bump internal release now."
+                echo "skip-release=false" >> $GITHUB_OUTPUT
+              else
+                echo "::warning::No changes to the release branch (or only changes to scripts and workflows). Skipping automatic release."
+                echo "skip-release=true" >> $GITHUB_OUTPUT
+              fi
             fi
           fi
 

From a40035b73906caff097f53471521d274de2696fe Mon Sep 17 00:00:00 2001
From: Juan Manuel Pereira <juanmanuel.pereira1@gmail.com>
Date: Fri, 15 Mar 2024 08:38:32 -0300
Subject: [PATCH 15/30] DBP: Use url instead of name to identify brokers on
 pixels (#2423)

---
 .../Operations/DataBrokerProfileQueryOperationManager.swift   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
index ff931a7687..58352c3fc3 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
@@ -117,7 +117,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
             notificationCenter.post(name: DataBrokerProtectionNotifications.didFinishScan, object: brokerProfileQueryData.dataBroker.name)
         }
 
-        let stageCalculator = DataBrokerProtectionStageDurationCalculator(dataBroker: brokerProfileQueryData.dataBroker.name, handler: pixelHandler)
+        let stageCalculator = DataBrokerProtectionStageDurationCalculator(dataBroker: brokerProfileQueryData.dataBroker.url, handler: pixelHandler)
 
         do {
             let event = HistoryEvent(brokerId: brokerId, profileQueryId: profileQueryId, type: .scanStarted)
@@ -280,7 +280,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
         }
 
         let retriesCalculatorUseCase = OperationRetriesCalculatorUseCase()
-        let stageDurationCalculator = DataBrokerProtectionStageDurationCalculator(dataBroker: brokerProfileQueryData.dataBroker.name, handler: pixelHandler)
+        let stageDurationCalculator = DataBrokerProtectionStageDurationCalculator(dataBroker: brokerProfileQueryData.dataBroker.url, handler: pixelHandler)
         stageDurationCalculator.fireOptOutStart()
         os_log("Running opt-out operation: %{public}@", log: .dataBrokerProtection, String(describing: brokerProfileQueryData.dataBroker.name))
 

From 919a93baf974e56a9b69b440b2b3918757bc7644 Mon Sep 17 00:00:00 2001
From: Juan Manuel Pereira <juanmanuel.pereira1@gmail.com>
Date: Fri, 15 Mar 2024 08:39:00 -0300
Subject: [PATCH 16/30] DBP: Treat 404 as failure instead of error (#2426)

---
 ...kerProtectionStageDurationCalculator.swift |   7 +-
 ...otectionStageDurationCalculatorTests.swift | 141 ++++++++++++++++++
 2 files changed, 147 insertions(+), 1 deletion(-)
 create mode 100644 LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionStageDurationCalculatorTests.swift

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift
index 7de439e30b..36723e14bf 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionStageDurationCalculator.swift
@@ -170,7 +170,12 @@ final class DataBrokerProtectionStageDurationCalculator: StageDurationCalculator
             switch dataBrokerProtectionError {
             case .httpError(let httpCode):
                 if httpCode < 500 {
-                    errorCategory = .clientError(httpCode: httpCode)
+                    if httpCode == 404 {
+                        fireScanFailed()
+                        return
+                    } else {
+                        errorCategory = .clientError(httpCode: httpCode)
+                    }
                 } else {
                     errorCategory = .serverError(httpCode: httpCode)
                 }
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionStageDurationCalculatorTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionStageDurationCalculatorTests.swift
new file mode 100644
index 0000000000..8b899e12a1
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionStageDurationCalculatorTests.swift
@@ -0,0 +1,141 @@
+//
+//  DataBrokerProtectionStageDurationCalculatorTests.swift
+//
+//  Copyright © 2023 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import BrowserServicesKit
+import Foundation
+import XCTest
+
+@testable import DataBrokerProtection
+
+final class DataBrokerProtectionStageDurationCalculatorTests: XCTestCase {
+    let handler = MockDataBrokerProtectionPixelsHandler()
+
+    override func tearDown() {
+        handler.clear()
+    }
+
+    func testWhenErrorIs404_thenWeFireScanFailedPixel() {
+        let sut = DataBrokerProtectionStageDurationCalculator(dataBroker: "broker", handler: handler)
+
+        sut.fireScanError(error: DataBrokerProtectionError.httpError(code: 404))
+
+        XCTAssertTrue(MockDataBrokerProtectionPixelsHandler.lastPixelsFired.count == 1)
+
+        if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
+            switch failurePixel {
+            case .scanFailed(let broker, _, _):
+                XCTAssertEqual(broker, "broker")
+            default: XCTFail("The scan failed pixel should be fired")
+            }
+        } else {
+            XCTFail("A pixel should be fired")
+        }
+    }
+
+    func testWhenErrorIs403_thenWeFireScanErrorPixelWithClientErrorCategory() {
+        let sut = DataBrokerProtectionStageDurationCalculator(dataBroker: "broker", handler: handler)
+
+        sut.fireScanError(error: DataBrokerProtectionError.httpError(code: 403))
+
+        XCTAssertTrue(MockDataBrokerProtectionPixelsHandler.lastPixelsFired.count == 1)
+
+        if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
+            switch failurePixel {
+            case .scanError(_, _, let category, _):
+                XCTAssertEqual(category, ErrorCategory.clientError(httpCode: 403).toString)
+            default: XCTFail("The scan error pixel should be fired")
+            }
+        } else {
+            XCTFail("A pixel should be fired")
+        }
+    }
+
+    func testWhenErrorIs500_thenWeFireScanErrorPixelWithServerErrorCategory() {
+        let sut = DataBrokerProtectionStageDurationCalculator(dataBroker: "broker", handler: handler)
+
+        sut.fireScanError(error: DataBrokerProtectionError.httpError(code: 500))
+
+        XCTAssertTrue(MockDataBrokerProtectionPixelsHandler.lastPixelsFired.count == 1)
+
+        if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
+            switch failurePixel {
+            case .scanError(_, _, let category, _):
+                XCTAssertEqual(category, ErrorCategory.serverError(httpCode: 500).toString)
+            default: XCTFail("The scan error pixel should be fired")
+            }
+        } else {
+            XCTFail("A pixel should be fired")
+        }
+    }
+
+    func testWhenErrorIsNotHttp_thenWeFireScanErrorPixelWithValidationErrorCategory() {
+        let sut = DataBrokerProtectionStageDurationCalculator(dataBroker: "broker", handler: handler)
+
+        sut.fireScanError(error: DataBrokerProtectionError.actionFailed(actionID: "Action-ID", message: "Some message"))
+
+        XCTAssertTrue(MockDataBrokerProtectionPixelsHandler.lastPixelsFired.count == 1)
+
+        if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
+            switch failurePixel {
+            case .scanError(_, _, let category, _):
+                XCTAssertEqual(category, ErrorCategory.validationError.toString)
+            default: XCTFail("The scan error pixel should be fired")
+            }
+        } else {
+            XCTFail("A pixel should be fired")
+        }
+    }
+
+    func testWhenErrorIsNotDBPErrorButItIsNSURL_thenWeFireScanErrorPixelWithNetworkErrorErrorCategory() {
+        let sut = DataBrokerProtectionStageDurationCalculator(dataBroker: "broker", handler: handler)
+        let nsURLError = NSError(domain: NSURLErrorDomain, code: NSURLErrorTimedOut)
+
+        sut.fireScanError(error: nsURLError)
+
+        XCTAssertTrue(MockDataBrokerProtectionPixelsHandler.lastPixelsFired.count == 1)
+
+        if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
+            switch failurePixel {
+            case .scanError(_, _, let category, _):
+                XCTAssertEqual(category, ErrorCategory.networkError.toString)
+            default: XCTFail("The scan error pixel should be fired")
+            }
+        } else {
+            XCTFail("A pixel should be fired")
+        }
+    }
+
+    func testWhenErrorIsNotDBPErrorAndNotURL_thenWeFireScanErrorPixelWithUnclassifiedErrorCategory() {
+        let sut = DataBrokerProtectionStageDurationCalculator(dataBroker: "broker", handler: handler)
+        let error = NSError(domain: NSCocoaErrorDomain, code: -1)
+
+        sut.fireScanError(error: error)
+
+        XCTAssertTrue(MockDataBrokerProtectionPixelsHandler.lastPixelsFired.count == 1)
+
+        if let failurePixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last{
+            switch failurePixel {
+            case .scanError(_, _, let category, _):
+                XCTAssertEqual(category, ErrorCategory.unclassified.toString)
+            default: XCTFail("The scan error pixel should be fired")
+            }
+        } else {
+            XCTFail("A pixel should be fired")
+        }
+    }
+}

From aaacc14afca2f61dd36314bb09f6837b344713bb Mon Sep 17 00:00:00 2001
From: Michal Smaga <miasma13@gmail.com>
Date: Fri, 15 Mar 2024 12:49:25 +0100
Subject: [PATCH 17/30] Properly handle edge cases (#2417)

Task/Issue URL: https://app.asana.com/0/0/1206841322374471/f

**Description**:
- Handle edge cases via "Something Went Wrong" alert
- Handle scenario when App Store purchase went through but the BE failed
- Fix description in the settings detailing subscription's billing
period and expiry or renewal date
- Handle expired subscription state

**Steps to test this PR**:
Test triggering "Something Went Wrong" alert, e.g.:
1. Opening purchase page
2. Disable internet connection
3. Try purchasing

Handle scenario when App Store purchase went through but the BE failed
1. Modify `SubscriptionPagesUserScript.swift` commenting call to
`AppStorePurchaseFlow.completeSubscriptionPurchase` and the whole
`switch` - but you need to leave `await
pushPurchaseUpdate(originalMessage: message, purchaseUpdate:
PurchaseUpdate(type: "completed"))`
2. Switch purchase platform to App Store
3. Try purchasing subscription
5. Due to code modification the confirmation endpoint will not be used
leaving you with an account lacking entitlements
6. Go to settings

Fix description in the settings detailing subscription's billing period
and expiry or renewal date
1. Purchase or activate subscription
2. Open settings, the description should properly reflect if
subscription will renew or expire at given date

Handle expired subscription state
1. Purchase subscription via App Store
3. Wait until it expires
4. Open settings

<!--
Tagging instructions
If this PR isn't ready to be merged for whatever reason it should be
marked with the `DO NOT MERGE` label (particularly if it's a draft)
If it's pending Product Review/PFR, please add the `Pending Product
Review` label.

If at any point it isn't actively being worked on/ready for
review/otherwise moving forward (besides the above PR/PFR exception)
strongly consider closing it (or not opening it in the first place). If
you decide not to close it, make sure it's labelled to make it clear the
PRs state and comment with more information.
-->

---
###### Internal references:
[Pull Request Review
Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f)
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
[Pull Request
Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)
---
 .../Images/ITR-Icon.imageset/ITR-Icon.pdf     | Bin 4129 -> 3919 bytes
 .../SubscriptionIcon.pdf                      | Bin 2646 -> 4808 bytes
 DuckDuckGo/Common/Localizables/UserText.swift |   1 -
 .../NavigationBar/View/MoreOptionsMenu.swift  |   9 +-
 .../SubscriptionPagesUserScript.swift         |  12 +-
 .../SubscriptionUI/NSAlert+Subscription.swift |   8 -
 .../PreferencesSubscriptionModel.swift        | 115 ++++--
 .../PreferencesSubscriptionView.swift         | 352 ++++++++++++------
 .../Contents.json                             |  12 +
 .../subscription-expired-icon.pdf             | Bin 0 -> 2374 bytes
 .../Contents.json                             |  12 +
 .../Info-Color-16.pdf                         | Bin 0 -> 1745 bytes
 .../ActivateSubscriptionAccessModel.swift     |   5 +-
 .../Model/ShareSubscriptionAccessModel.swift  |   2 +-
 .../SubscriptionAccessView.swift              |   1 +
 .../Sources/SubscriptionUI/UserText.swift     |  55 ++-
 16 files changed, 407 insertions(+), 177 deletions(-)
 create mode 100644 LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-expired-icon.imageset/Contents.json
 create mode 100644 LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-expired-icon.imageset/subscription-expired-icon.pdf
 create mode 100644 LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-pending-icon.imageset/Contents.json
 create mode 100644 LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-pending-icon.imageset/Info-Color-16.pdf

diff --git a/DuckDuckGo/Assets.xcassets/Images/ITR-Icon.imageset/ITR-Icon.pdf b/DuckDuckGo/Assets.xcassets/Images/ITR-Icon.imageset/ITR-Icon.pdf
index 1ff6a4f6db7f5eb49a1d732bf7d6ebef1fbc4c10..71e908133d48e1c57639464825a9722d736aefbe 100644
GIT binary patch
delta 143
zcmZ3ea9(bL_{6h*o0S;NStlzo>Tm96>tX~l^fvo(D6xP=mhr?hG8>s&Z06uAWb`vI
tHc>DD0fjs+Fl}ILY-WKWWNC;lWNL<?(ad=AasEI~GfQ(WRaIAiHvlNmAr=4t

delta 353
zcmX>vw@_h%c)h-BMTvWGNn%N=f{l%WzN-nCN={TT(6cZx00IR&J1zxGpzmr#v`S;#
zD$P(#)^|0;trVfs&TgWZKO0DKdhz7htOgsWaIgZoMnLZ7*{r)5fox-ll>X*sb|n@d
z-vp|3^A+xRMrLCJv(09_g^YeihGq&NPZ}uXae-+AV^ebrbRjbXLv$f?a}#tS3zNxT
Q`2smD4a~VzRbBnv02LET*Z=?k

diff --git a/DuckDuckGo/Assets.xcassets/Images/SubscriptionIcon.imageset/SubscriptionIcon.pdf b/DuckDuckGo/Assets.xcassets/Images/SubscriptionIcon.imageset/SubscriptionIcon.pdf
index 934a29304855a8da122da590fa025cc53f443972..d9be8eca8e50aae5d9b27cf4e2e48715bd2c614e 100644
GIT binary patch
literal 4808
zcmd^@OOG2z5`^#lEBYe9UO>%yKLA63^@QOytex3|0b>soMN4DPkXn*j$ouQ}i|S^R
zoYBJa*}SMGx-u&(GBT@5k6u52`PdG*>uhiO?VDe_zW?T%e(}%WKdk%3Pd~o-b-g-(
z@mu_Ty?J+d-#aE=P0*{|_Tz^$gZB6Mt=Wu**ZA8lH~SCE-Fmb7{o?zRCzGq|k8cib
z(U;rZ-Gp7O_uG%V)q1Zb=9y2QZa?)u_hvBdcN*AqgifP>;R?(BVYgo1b&Kcg|J<zB
zSFfJ-&#uq^TJ5`kclKyLyM8>6=5K<m$-(ty@Fiti`_)}H&wDu7uQpw2HpTUR@F}=h
z`a3WmV@>9Sl_B|<+bmN;@QEcR#0}Y3*{!gfFf-VkGT3cr?O<zhm|lW0_`nJ?$h_jb
z=CKWHyh)+Iz(OdFt*zwoG&5HpoYBn5A(AoKYbMyV@(DYO@dVzU0)On=7O=hqYcbVX
z@j4RoI1DaLREu+kJwvN54=KfD!Wo!JNn?;DCU57Eh-<q$f%8UgyD;zg0t~rWEi!{)
z-mw`bX3n9R!gFxqIt-JyIV1C;Gop=6yO^=t6E-X14D-XJmzk1TXAhOP>fU$1berxU
ze_rttjrA_tFOYm1V$8{-kcetbFb>V9q552M1FQ2PraliL)l^bX&03dSsR+QBg4{<a
zR75IC#gI*{Bj^*=Q4wLT#%qaci_HNjpq-lAs@_#6Q%l&<h7@}%x`V5%M($ElV!=X)
z#(>$uqjV}7%taH31#34LXANZpYGQ2RlZC{R&7-m2R7M^(<Qxf`%m-iDCe~q47^)t8
zS{oG`QRGsCZ60&>krm_MDJjDUKQTt1WgV&eQZupnA$aRR)!S^07R*6sg5`!e<3xp1
zSE@msLNlYQHo#~MH7dwBgz6L|-%>6C3*ur0YkCI7kO7$@DG~)y4n~W?hbrBaL>?`n
zlvpfmI~#*7G#DmT{I9x7SAyUm%x8l)5N}vth>fP%nNn=)RuE2Rnw^1JBVVLG#Xxf)
z!F1RxOR(VmghhI2!^nWzUs2Y_I7~)64pn6`mgUWmAL!5Q*Ok=#y9^tw2?o0^%a^ao
zTYN<}PS;_-V2RH#P)k$>p|%Eu#HZ{S`XghKi5a3R#hZy(XwpgHt@jiCp{Nln8tP|E
zQ(|kfM0_Hu<ujJ#nMaSd#M9C)`2l5>9_&jWA$o0qlmr@M6Re@yiegI@gQhL)Ds;QS
z;cQH`4OF7|_9#4M*VL+*Ok_94<fEulz%x+tq582RQZ%ieqS`VFm2^Ua%FxFF(RtHW
zEfh4G{7eH->rrt>#~xJ$k!p+d1=5uZ-Y2kTPrgu?T0ZkQ=ET2R1yr#|!U~M(L$s8X
za)MiUVP!uCQ))?#D(|gLmiP=F#_BTBBR)(iQ*{8Uf^yC%EpZmZS(d5#EPey*A)Hp2
zZYXpQ8i9x}0Zq4htN2hg4#}mYqGle=Ls_BS(`8y_spG)<G9{*3C}f8Pb-?<A)8__J
zo{roKa)tiLEYBfN`N-6f6k^vMfTGm2TuDHL?T{>;f^aj(DBUq2+Z<>u$~B%0<-@T+
zj{=Jj$mS*Pkb`Bwq2st<DCpFx8ao|Ccx6i@qY|r9KtDzWATe7MLY}N^J&^(k%3M2{
zSw|gHQBkebRi;-3L;^-ixVf<jt|A-^LfAYaqfK#8iW+>e=c(_bVx1#k$#OqXy+`!S
zQo^!mov@-FFN}#J7E5V+ie$uT9*sX%+KM_Gjg9UjifyL96!-~-N+e+jA(&+Ik;c{(
zX^^DY`H^ipR}*J35y7;SptS~Rqf_co*kqd#gZc`TbCny5HgOE-IFuABty<Q|ifDzY
z_cx`2s^8G5Kno-}_KAGenA=P=h%^;;jm1#|n#TZ-$c8cfsx-CYvsE7oM)RsK)*%e7
z%@xO{0!{caoJy!4YfevYf65&4p*gme?jy|M5NV-Tj&B_?B`9|)PI%J!MPqg>LO3eo
zXz3Ya*2lg>Tjjb2^q?iQOUmEcEu~v;-cHwdMtY)jdV-8^6<2H0ga*?$zw8Oa;q+I2
z!sx)!uN_Bi@W(Hh+2-`Lx@#AV(bEZ~!sch#Y;^mX2htgKvbdcur=Ll?(l({tyE*G|
zM)h!=o~-Rn`V*2?rcY1D7oQHVt`Ez@x_y6P+dtPoEcd^)(fI1spBHb`(^K|xw0PA^
za?@k@^4o*I7QBMLz5Vch`Nyu0FWm<|1WZr!c_;tR-IFKdwsCf>k95J*^qlANGcxo=
zPvixhz1w#SsC~ZW3GtaM$>Er#a4Jo%U1z2F?Pjw*?E9bfI6rOa_43_%0)AM(y;=U*
zXTCh0{>MPFIQ}=qv+d@v-msz=ID)VBzY&L?%VmSkcoH=3K#KbQ<}IQ2+QC(SjQH91
zBewQI{CkiyPrA3AxzY~z^NOdPKU*G_x7&A@wx4$EUpkt*?OKVAb(Xkx#U6b6X#xHE
z%>;2pq)hHXnVeignYMc$;zYWH0?(`a5C`Rbh<nw2$a6N|^A)(>9HGN*d2_qob)xsX
z=aBo=etWn6y8r6t?bjp4i>vJxennr)*W&u-ziV*;x%<O%cWCVJY|GuFM=ySS`9G$N
B-@X6<

literal 2646
zcmZveTW=gi5QX38SM*Dy1S##RzPA)bBF;q!5XRvx;$c}&93y)dyc-nw^?cQ{UdKsB
zmfb$nm#TA4RnMcdm#?3yuhXPX-1d(@C+D6$b0@Dp?ccoJulDoupN>E4l@s5R@VMvC
zm!E0gT-dTHJXrtJyt&+ea1rpFiPLU>JFjl0lb7>9SL^xw%?o$>_VfSNyXo)g<dwS1
z-K5@5;0(DNJUx!S{jT=VvRmIw$9Z25cI(Yld}^WA=rsFOYH7{g0Jf&R1p`~@Evu_O
z#acshTD&wVxd8QEd&vXhyjtCQYCh){q%L6X#N54V=t-8{QcM9TOYgCdQ!^)Zma2Gd
zp|#>P`C5}^mWZ!~V~8*Lq^Tq#P#;T(Q4I@GdTF*=ea|HlKd4wL%nZKN5G#p*Nz8$`
zB3M-AZSoqWF^|>k6pC2fj6{PjQCN^;Bt?5<P4*$xo=7@+=;%4v>g+4qLpUgZ#NKD<
ziNF>`D>2uRZSSoVM!^SIY~ySgB?}eTeB!l?V>qQmalC^PsI|CSQrKaTG{~SV@;b*L
zF8G*R6?jswS&PDhPtpVAbXe*Mj>V@WF<QtbN|D~c(6z<rt_K$3cwoimU884j7z8W(
z2wM<nSgf&#trgKoI@Om@LaPgs)DYo-kPqufem!heGcnqk87A1vtd=_YjW`178CHwr
zYH?V+1b#gws;mu$m#hjI_nHbOJ*1AvzG`kLw=e{uYwVwcP@e}PV{ukF$j-t+cWTCq
z<pBqaEU-LQij>d?*hmiBiVwYO0y3FnZ&r{stLX3*R_l!LgV&Dp55|!Wlf+iFqWAEZ
z<US+|DTZNKsO`kIp4d35q~UELa9*38Idy?D=1M>%5ij1dR8yxG))Ur@DKGo+7SB1#
zR}pf!$NYpa-zfO?^Z`v#h68O!m8!kc2kt@Ns7LDc+N!h!ZC&BLEuzC3<)QFRZD|fT
z2!e#V>wyr2otFZSn5meD2!h%uBd!dmG?C^DvM`STsDjaID3VeeJ{biH$|0svgnC5<
zX3_|(r~~b(i<v(8n2NOoupDx+F1VC80uUH2fe<SN3a?p)nqZ|=Yb}vd4UjnICG2R#
zvZhkW${NnGXxSY>;RMT%b6ROcCcbNvHY`)=YAC>J+FELAZWyEpQFM%5b3wmI3bfit
z{$B}Tx>O$yx-1eTWVy%CDkRhxMZ<nkh=MJV2PUm~mntN~!3dPIsnI*Vz@o+)I-HJ&
zq7>^{P=>GRjnN100?Kz}+;BZ|Q|dJg0ZIy$StRE>-V6(`rO=lbr#I_FMs=zbiTVQN
zM@^7yEX`QJD#ygb7aYd5fVD=;MB{8~8)R1tvoHg;A4?OB6?V-ul&A$q0b55|oJFUm
zJrsh}g8``(E3VE3(Jj5<Q{y96TxHXTnInzsOTtZt_uoyM>DS4w_QSn>cgfp*zI-Go
z#yH;n=?L4m!}pubcE5A)e&<_)=j6A4|C-&&+3IpW06)(cSF0D>Pww4lMi1|LyK=`f
zF4bjpx6}E&+kU)V&pT&dE9ZypPPd!=yx~Oq1i1sxR<~e|mOLOnLGE%e=>9|J$EyoM
zb(X=oyF2G}`;oQ!Rs1`U&vv3`f3}k)xH}$rpZMu&zq;ODK3w|gc78vJtJ9LJ{dOhi
zm>uxpp~Z}m+Z>@voc0_cZbtHX2$|2nfC85O0*bVuJ7|Bqy1JfkCsXf-m(cNex4oI4
rxW`u)PZm;6&bQmWvxEo1CvUI*n~8pW*{yE(BOQt}O^+VE`sMZi<vbvv

diff --git a/DuckDuckGo/Common/Localizables/UserText.swift b/DuckDuckGo/Common/Localizables/UserText.swift
index a5149fcee7..555dece7ae 100644
--- a/DuckDuckGo/Common/Localizables/UserText.swift
+++ b/DuckDuckGo/Common/Localizables/UserText.swift
@@ -1008,7 +1008,6 @@ struct UserText {
 
     // "data-broker-protection.optionsMenu" - Menu item data broker protection feature
     static let dataBrokerProtectionOptionsMenuItem = "Personal Information Removal"
-    static let dataBrokerProtectionScanOptionsMenuItem = "Personal Information Removal Scan"
     // "tab.dbp.title" - Tab data broker protection title
     static let tabDataBrokerProtectionTitle = "Personal Information Removal"
 
diff --git a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
index 6ff8bfea32..b2dd2d0a7f 100644
--- a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
+++ b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
@@ -344,7 +344,6 @@ final class MoreOptionsMenu: NSMenu {
             networkProtectionItem = makeNetworkProtectionItem()
 
             items.append(networkProtectionItem)
-
 #if SUBSCRIPTION
             if DefaultSubscriptionFeatureAvailability().isFeatureAvailable() && AccountManager().isUserAuthenticated {
                 Task {
@@ -432,19 +431,13 @@ final class MoreOptionsMenu: NSMenu {
 
 #if SUBSCRIPTION
     private func makeInactiveSubscriptionItems() -> [NSMenuItem] {
-        let dataBrokerProtectionItem = NSMenuItem(title: UserText.dataBrokerProtectionScanOptionsMenuItem,
-                                                  action: #selector(openSubscriptionPurchasePage(_:)),
-                                                  keyEquivalent: "")
-            .targetting(self)
-            .withImage(.dbpIcon)
-
         let privacyProItem = NSMenuItem(title: UserText.subscriptionOptionsMenuItem,
                                         action: #selector(openSubscriptionPurchasePage(_:)),
                                         keyEquivalent: "")
             .targetting(self)
             .withImage(.subscriptionIcon)
 
-        return [dataBrokerProtectionItem, privacyProItem]
+        return [privacyProItem]
     }
 #endif
 
diff --git a/DuckDuckGo/Tab/UserScripts/SubscriptionPagesUserScript.swift b/DuckDuckGo/Tab/UserScripts/SubscriptionPagesUserScript.swift
index b0c6391e44..a69c43fa24 100644
--- a/DuckDuckGo/Tab/UserScripts/SubscriptionPagesUserScript.swift
+++ b/DuckDuckGo/Tab/UserScripts/SubscriptionPagesUserScript.swift
@@ -305,8 +305,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
                 case .accountCreationFailed:
                     report(subscriptionActivationError: .accountCreationFailed)
                 }
-
-                return nil
+                await pushPurchaseUpdate(originalMessage: message, purchaseUpdate: PurchaseUpdate(type: "canceled"))
             }
         }
 
@@ -524,15 +523,10 @@ extension SubscriptionPagesUseSubscriptionFeature {
 extension MainWindowController {
 
     @MainActor
-    func showSomethingWentWrongAlert(environment: SubscriptionPurchaseEnvironment.Environment = SubscriptionPurchaseEnvironment.current) {
+    func showSomethingWentWrongAlert() {
         guard let window else { return }
 
-        switch environment {
-        case .appStore:
-            window.show(.somethingWentWrongAlert())
-        case .stripe:
-            window.show(.somethingWentWrongStripeAlert())
-        }
+        window.show(.somethingWentWrongAlert())
     }
 
     @MainActor
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/NSAlert+Subscription.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/NSAlert+Subscription.swift
index d79042d247..7080cdd43f 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/NSAlert+Subscription.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/NSAlert+Subscription.swift
@@ -29,14 +29,6 @@ public extension NSAlert {
         return alert
     }
 
-    static func somethingWentWrongStripeAlert() -> NSAlert {
-        let alert = NSAlert()
-        alert.messageText = UserText.somethingWentWrongAlertTitle
-        alert.informativeText = UserText.somethingWentWrongStripeAlertDescription
-        alert.addButton(withTitle: UserText.okButtonTitle)
-        return alert
-    }
-
     static func subscriptionNotFoundAlert() -> NSAlert {
         let alert = NSAlert()
         alert.messageText = UserText.subscriptionNotFoundAlertTitle
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionModel.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionModel.swift
index 8a0392ec37..c2cd52eba6 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionModel.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionModel.swift
@@ -18,11 +18,14 @@
 
 import AppKit
 import Subscription
+import struct Combine.AnyPublisher
+import enum Combine.Publishers
 
 public final class PreferencesSubscriptionModel: ObservableObject {
 
     @Published var isUserAuthenticated: Bool = false
     @Published var subscriptionDetails: String?
+    @Published var subscriptionStatus: Subscription.Status?
 
     @Published var hasAccessToVPN: Bool = false
     @Published var hasAccessToDBP: Bool = false
@@ -58,6 +61,28 @@ public final class PreferencesSubscriptionModel: ObservableObject {
              removeSubscriptionClick
     }
 
+    lazy var statePublisher: AnyPublisher<PreferencesSubscriptionState, Never> = {
+        let isSubscriptionActivePublisher = $subscriptionStatus.map {
+            $0 != .expired && $0 != .inactive
+        }.eraseToAnyPublisher()
+
+        let hasAnyEntitlementPublisher = Publishers.CombineLatest3($hasAccessToVPN, $hasAccessToDBP, $hasAccessToITR).map {
+            return $0 || $1 || $2
+        }.eraseToAnyPublisher()
+
+        return Publishers.CombineLatest3($isUserAuthenticated, isSubscriptionActivePublisher, hasAnyEntitlementPublisher)
+            .map { isUserAuthenticated, isSubscriptionActive, hasAnyEntitlement in
+                switch (isUserAuthenticated, isSubscriptionActive, hasAnyEntitlement) {
+                case (false, _, _): return PreferencesSubscriptionState.noSubscription
+                case (true, false, _): return PreferencesSubscriptionState.subscriptionExpired
+                case (true, true, false): return PreferencesSubscriptionState.subscriptionPendingActivation
+                case (true, true, true): return PreferencesSubscriptionState.subscriptionActive
+                }
+            }
+            .removeDuplicates()
+            .eraseToAnyPublisher()
+    }()
+
     public init(openURLHandler: @escaping (URL) -> Void,
                 userEventHandler: @escaping (UserEvent) -> Void,
                 sheetActionHandler: SubscriptionAccessActionHandlers,
@@ -72,9 +97,32 @@ public final class PreferencesSubscriptionModel: ObservableObject {
 
         if let token = accountManager.accessToken {
             Task {
-                let subscriptionResult = await SubscriptionService.getSubscription(accessToken: token)
+                let subscriptionResult = await SubscriptionService.getSubscription(accessToken: token, cachePolicy: .returnCacheDataElseLoad)
                 if case .success(let subscription) = subscriptionResult {
-                    self.updateDescription(for: subscription.expiresOrRenewsAt)
+                    self.updateDescription(for: subscription.expiresOrRenewsAt, status: subscription.status, period: subscription.billingPeriod)
+                    self.subscriptionPlatform = subscription.platform
+                    self.subscriptionStatus = subscription.status
+                }
+
+                switch await self.accountManager.hasEntitlement(for: .networkProtection, cachePolicy: .returnCacheDataElseLoad) {
+                case let .success(result):
+                    self.hasAccessToVPN = result
+                case .failure:
+                    self.hasAccessToVPN = false
+                }
+
+                switch await self.accountManager.hasEntitlement(for: .dataBrokerProtection, cachePolicy: .returnCacheDataElseLoad) {
+                case let .success(result):
+                    self.hasAccessToDBP = result
+                case .failure:
+                    self.hasAccessToDBP = false
+                }
+
+                switch await self.accountManager.hasEntitlement(for: .identityTheftRestoration, cachePolicy: .returnCacheDataElseLoad) {
+                case let .success(result):
+                    self.hasAccessToITR = result
+                case .failure:
+                    self.hasAccessToITR = false
                 }
             }
         }
@@ -123,6 +171,7 @@ public final class PreferencesSubscriptionModel: ObservableObject {
 
     @MainActor
     func changePlanOrBillingAction() async -> ChangePlanOrBillingAction {
+
         switch subscriptionPlatform {
         case .apple:
             if await confirmIfSignedInToSameAccount() {
@@ -199,7 +248,20 @@ public final class PreferencesSubscriptionModel: ObservableObject {
         openURLHandler(.subscriptionFAQ)
     }
 
-    // swiftlint:disable cyclomatic_complexity
+    @MainActor
+    func refreshSubscriptionPendingState() {
+        if SubscriptionPurchaseEnvironment.current == .appStore {
+            if #available(macOS 12.0, *) {
+                Task {
+                    _ = await AppStoreRestoreFlow.restoreAccountFromPastPurchase(subscriptionAppGroup: subscriptionAppGroup)
+                    fetchAndUpdateSubscriptionDetails()
+                }
+            }
+        } else {
+            fetchAndUpdateSubscriptionDetails()
+        }
+    }
+
     @MainActor
     func fetchAndUpdateSubscriptionDetails() {
         guard fetchSubscriptionDetailsTask == nil else { return }
@@ -211,22 +273,12 @@ public final class PreferencesSubscriptionModel: ObservableObject {
 
             guard let token = self?.accountManager.accessToken else { return }
 
-            let subscriptionResult = await SubscriptionService.getSubscription(accessToken: token)
+            let subscriptionResult = await SubscriptionService.getSubscription(accessToken: token, cachePolicy: .reloadIgnoringLocalCacheData)
 
             if case .success(let subscription) = subscriptionResult {
-                self?.updateDescription(for: subscription.expiresOrRenewsAt)
+                self?.updateDescription(for: subscription.expiresOrRenewsAt, status: subscription.status, period: subscription.billingPeriod)
                 self?.subscriptionPlatform = subscription.platform
-
-                if subscription.expiresOrRenewsAt.timeIntervalSinceNow < 0 || !subscription.isActive {
-                    self?.hasAccessToVPN = false
-                    self?.hasAccessToDBP = false
-                    self?.hasAccessToITR = false
-
-                    if !subscription.isActive {
-                        self?.accountManager.signOut()
-                        return
-                    }
-                }
+                self?.subscriptionStatus = subscription.status
             } else {
                 self?.accountManager.signOut()
             }
@@ -255,16 +307,33 @@ public final class PreferencesSubscriptionModel: ObservableObject {
             }
         }
     }
-    // swiftlint:enable cyclomatic_complexity
 
-    private func updateDescription(for date: Date) {
-        self.subscriptionDetails = UserText.preferencesSubscriptionActiveCaption(formattedDate: dateFormatter.string(from: date))
+    func updateDescription(for date: Date, status: Subscription.Status, period: Subscription.BillingPeriod) {
+
+        let formattedDate = dateFormatter.string(from: date)
+
+        let billingPeriod: String
+
+        switch period {
+        case .monthly: billingPeriod = UserText.monthlySubscriptionBillingPeriod.lowercased()
+        case .yearly: billingPeriod = UserText.yearlySubscriptionBillingPeriod.lowercased()
+        case .unknown: billingPeriod = ""
+        }
+
+        switch status {
+        case .autoRenewable:
+            self.subscriptionDetails = UserText.preferencesSubscriptionActiveRenewCaption(period: billingPeriod, formattedDate: formattedDate)
+        case .expired, .inactive:
+            self.subscriptionDetails = UserText.preferencesSubscriptionExpiredCaption(formattedDate: formattedDate)
+        default:
+            self.subscriptionDetails = UserText.preferencesSubscriptionActiveExpireCaption(period: billingPeriod, formattedDate: formattedDate)
+        }
     }
 
     private var dateFormatter = {
         let dateFormatter = DateFormatter()
-        dateFormatter.dateStyle = .medium
-        dateFormatter.timeStyle = .short
+        dateFormatter.dateStyle = .long
+        dateFormatter.timeStyle = .none
 
         return dateFormatter
     }()
@@ -277,3 +346,7 @@ enum ManageSubscriptionSheet: Identifiable {
         return self
     }
 }
+
+enum PreferencesSubscriptionState: String {
+    case noSubscription, subscriptionPendingActivation, subscriptionActive, subscriptionExpired
+}
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionView.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionView.swift
index f17fcb0ea8..5424f3920b 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionView.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionView.swift
@@ -21,6 +21,9 @@ import SwiftUI
 import SwiftUIExtensions
 
 public struct PreferencesSubscriptionView: View {
+
+    @State private var state: PreferencesSubscriptionState = .noSubscription
+
     @ObservedObject var model: PreferencesSubscriptionModel
     @State private var showingSheet = false
     @State private var showingRemoveConfirmationDialog = false
@@ -39,41 +42,14 @@ public struct PreferencesSubscriptionView: View {
                     SubscriptionAccessView(model: model.sheetModel)
                 }
                 .sheet(isPresented: $showingRemoveConfirmationDialog) {
-                    SubscriptionDialog(imageName: "Privacy-Pro-128",
-                                       title: UserText.removeSubscriptionDialogTitle,
-                                       description: UserText.removeSubscriptionDialogDescription,
-                                       buttons: {
-                        Button(UserText.removeSubscriptionDialogCancel) { showingRemoveConfirmationDialog = false }
-                        Button(action: {
-                            showingRemoveConfirmationDialog = false
-                            model.removeFromThisDeviceAction()
-                        }, label: {
-                            Text(UserText.removeSubscriptionDialogConfirm)
-                                .foregroundColor(.red)
-                        })
-                    })
-                    .frame(width: 320)
+                    removeConfirmationDialog
                 }
                 .sheet(item: $manageSubscriptionSheet) { sheet in
                     switch sheet {
                     case .apple:
-                        SubscriptionDialog(imageName: "app-store",
-                                           title: UserText.changeSubscriptionDialogTitle,
-                                           description: UserText.changeSubscriptionAppleDialogDescription,
-                                           buttons: {
-                            Button(UserText.changeSubscriptionDialogDone) { manageSubscriptionSheet = nil }
-                                .buttonStyle(DefaultActionButtonStyle(enabled: true))
-                        })
-                        .frame(width: 360)
+                        manageSubscriptionAppStoreDialog
                     case .google:
-                        SubscriptionDialog(imageName: "google-play",
-                                           title: UserText.changeSubscriptionDialogTitle,
-                                           description: UserText.changeSubscriptionGoogleDialogDescription,
-                                           buttons: {
-                            Button(UserText.changeSubscriptionDialogDone) { manageSubscriptionSheet = nil }
-                                .buttonStyle(DefaultActionButtonStyle(enabled: true))
-                        })
-                        .frame(width: 360)
+                        manageSubscriptionGooglePlayDialog
                     }
                 }
 
@@ -81,93 +57,26 @@ public struct PreferencesSubscriptionView: View {
                 .frame(height: 20)
 
             VStack {
-                if model.isUserAuthenticated {
-                    UniversalHeaderView {
-                        Image(.subscriptionActiveIcon)
-                            .padding(4)
-                    } content: {
-                        TextMenuItemHeader(UserText.preferencesSubscriptionActiveHeader)
-                        TextMenuItemCaption(model.subscriptionDetails ?? "")
-                    } buttons: {
-                        Button(UserText.addToAnotherDeviceButton) {
-                            model.userEventHandler(.addToAnotherDeviceClick)
-                            showingSheet.toggle()
-                        }
-
-                        Menu {
-                            Button(UserText.changePlanOrBillingButton, action: {
-                                model.userEventHandler(.changePlanOrBillingClick)
-                                Task {
-                                    switch await model.changePlanOrBillingAction() {
-                                    case .presentSheet(let sheet):
-                                        manageSubscriptionSheet = sheet
-                                    case .navigateToManageSubscription(let navigationAction):
-                                        navigationAction()
-                                    }
-                                }
-                            })
-                            Button(UserText.removeFromThisDeviceButton, action: {
-                                model.userEventHandler(.removeSubscriptionClick)
-                                showingRemoveConfirmationDialog.toggle()
-                            })
-                        } label: {
-                            Text(UserText.manageSubscriptionButton)
-                        }
-                        .fixedSize()
-                    }
-                    .onAppear {
-                        model.fetchAndUpdateSubscriptionDetails()
-                    }
-
-                } else {
-                    UniversalHeaderView {
-                        Image(.privacyPro)
-                            .padding(4)
-                            .background(Color("BadgeBackground", bundle: .module))
-                            .cornerRadius(4)
-                    } content: {
-                        TextMenuItemHeader(UserText.preferencesSubscriptionInactiveHeader)
-                        TextMenuItemCaption(UserText.preferencesSubscriptionInactiveCaption)
-                    } buttons: {
-                        Button(UserText.purchaseButton) { model.purchaseAction() }
-                            .buttonStyle(DefaultActionButtonStyle(enabled: true))
-                        Button(UserText.haveSubscriptionButton) {
-                            showingSheet.toggle()
-                            model.userEventHandler(.iHaveASubscriptionClick)
-                        }
-                    }
+                switch state {
+                case .noSubscription:
+                    unauthenticatedHeaderView
+                case .subscriptionPendingActivation:
+                    pendingActivationHeaderView
+                case .subscriptionActive:
+                    authenticatedHeaderView
+                case .subscriptionExpired:
+                    expiredHeaderView
                 }
 
                 Divider()
                     .foregroundColor(Color.secondary)
                     .padding(.horizontal, -10)
 
-                SectionView(iconName: "VPN-Icon",
-                            title: UserText.vpnServiceTitle,
-                            description: UserText.vpnServiceDescription,
-                            buttonName: model.isUserAuthenticated ? UserText.vpnServiceButtonTitle : nil,
-                            buttonAction: { model.openVPN() },
-                            enabled: !model.isUserAuthenticated || model.hasAccessToVPN)
-
-                Divider()
-                    .foregroundColor(Color.secondary)
-
-                SectionView(iconName: "PIR-Icon",
-                            title: UserText.personalInformationRemovalServiceTitle,
-                            description: UserText.personalInformationRemovalServiceDescription,
-                            buttonName: model.isUserAuthenticated ? UserText.personalInformationRemovalServiceButtonTitle : nil,
-                            buttonAction: { model.openPersonalInformationRemoval() },
-                            enabled: !model.isUserAuthenticated || model.hasAccessToDBP)
-
-                Divider()
-                    .foregroundColor(Color.secondary)
-
-                SectionView(iconName: "ITR-Icon",
-                            title: UserText.identityTheftRestorationServiceTitle,
-                            description: UserText.identityTheftRestorationServiceDescription,
-                            buttonName: model.isUserAuthenticated ? UserText.identityTheftRestorationServiceButtonTitle : nil,
-                            buttonAction: { model.openIdentityTheftRestoration() },
-                            enabled: !model.isUserAuthenticated || model.hasAccessToITR)
+                if state == .subscriptionActive {
+                    servicesRowsForActiveSubscriptionView
+                } else {
+                    servicesRowsForNoSubscriptionView
+                }
             }
             .padding(10)
             .roundedBorder()
@@ -175,19 +84,226 @@ public struct PreferencesSubscriptionView: View {
             Spacer()
                 .frame(height: 24)
 
-            PreferencePaneSection {
-                TextMenuItemHeader(UserText.preferencesSubscriptionFooterTitle)
-                HStack(alignment: .top, spacing: 6) {
-                    TextMenuItemCaption(UserText.preferencesSubscriptionFooterCaption)
-                    Button(UserText.viewFaqsButton) { model.openFAQ() }
-                }
-            }
+            footerView
         }
         .onAppear(perform: {
             if model.isUserAuthenticated {
                 model.userEventHandler(.activeSubscriptionSettingsClick)
             }
         })
+        .onReceive(model.statePublisher, perform: updateState(state:))
+    }
+
+    private func updateState(state: PreferencesSubscriptionState) {
+        self.state = state
+    }
+
+    @ViewBuilder
+    private var authenticatedHeaderView: some View {
+        UniversalHeaderView {
+            Image(.subscriptionActiveIcon)
+                .padding(4)
+        } content: {
+            TextMenuItemHeader(UserText.preferencesSubscriptionActiveHeader)
+            TextMenuItemCaption(model.subscriptionDetails ?? "")
+        } buttons: {
+            Button(UserText.addToAnotherDeviceButton) {
+                model.userEventHandler(.addToAnotherDeviceClick)
+                showingSheet.toggle()
+            }
+
+            Menu {
+                Button(UserText.changePlanOrBillingButton, action: {
+                    model.userEventHandler(.changePlanOrBillingClick)
+                    Task {
+                        switch await model.changePlanOrBillingAction() {
+                        case .presentSheet(let sheet):
+                            manageSubscriptionSheet = sheet
+                        case .navigateToManageSubscription(let navigationAction):
+                            navigationAction()
+                        }
+                    }
+                })
+                Button(UserText.removeFromThisDeviceButton, action: {
+                    model.userEventHandler(.removeSubscriptionClick)
+                    showingRemoveConfirmationDialog.toggle()
+                })
+            } label: {
+                Text(UserText.manageSubscriptionButton)
+            }
+            .fixedSize()
+        }
+        .onAppear {
+            model.fetchAndUpdateSubscriptionDetails()
+        }
+    }
+
+    @ViewBuilder
+    private var unauthenticatedHeaderView: some View {
+        UniversalHeaderView {
+            Image(.privacyPro)
+                .padding(4)
+                .background(Color("BadgeBackground", bundle: .module))
+                .cornerRadius(4)
+        } content: {
+            TextMenuItemHeader(UserText.preferencesSubscriptionInactiveHeader)
+            TextMenuItemCaption(UserText.preferencesSubscriptionInactiveCaption)
+        } buttons: {
+            Button(UserText.purchaseButton) { model.purchaseAction() }
+                .buttonStyle(DefaultActionButtonStyle(enabled: true))
+            Button(UserText.haveSubscriptionButton) {
+                showingSheet.toggle()
+                model.userEventHandler(.iHaveASubscriptionClick)
+            }
+            .buttonStyle(DismissActionButtonStyle())
+        }
+    }
+
+    @ViewBuilder
+    private var pendingActivationHeaderView: some View {
+        UniversalHeaderView {
+            Image(.subscriptionPendingIcon)
+                .padding(4)
+        } content: {
+            TextMenuItemHeader(UserText.preferencesSubscriptionPendingHeader)
+            TextMenuItemCaption(UserText.preferencesSubscriptionPendingCaption)
+        } buttons: {
+            Button(UserText.restorePurchaseButton) { model.refreshSubscriptionPendingState() }
+                .buttonStyle(DefaultActionButtonStyle(enabled: true))
+        }
+        .onAppear {
+            model.fetchAndUpdateSubscriptionDetails()
+        }
+    }
+
+    @ViewBuilder
+    private var expiredHeaderView: some View {
+        UniversalHeaderView {
+            Image(.subscriptionExpiredIcon)
+                .padding(4)
+        } content: {
+            TextMenuItemHeader(model.subscriptionDetails ?? UserText.preferencesSubscriptionInactiveHeader)
+            TextMenuItemCaption(UserText.preferencesSubscriptionExpiredCaption)
+        } buttons: {
+            Button(UserText.viewPlansButtonTitle) { model.purchaseAction() }
+                .buttonStyle(DefaultActionButtonStyle(enabled: true))
+            Menu {
+                Button(UserText.removeFromThisDeviceButton, action: {
+                    model.userEventHandler(.removeSubscriptionClick)
+                    showingRemoveConfirmationDialog.toggle()
+                })
+            } label: {
+                Text(UserText.manageDevicesButton)
+            }
+            .fixedSize()
+        }
+        .onAppear {
+            model.fetchAndUpdateSubscriptionDetails()
+        }
+    }
+
+    @ViewBuilder
+    private var servicesRowsForNoSubscriptionView: some View {
+        SectionView(iconName: "VPN-Icon",
+                    title: UserText.vpnServiceTitle,
+                    description: UserText.vpnServiceDescription)
+
+        Divider()
+            .foregroundColor(Color.secondary)
+
+        SectionView(iconName: "PIR-Icon",
+                    title: UserText.personalInformationRemovalServiceTitle,
+                    description: UserText.personalInformationRemovalServiceDescription)
+
+        Divider()
+            .foregroundColor(Color.secondary)
+
+        SectionView(iconName: "ITR-Icon",
+                    title: UserText.identityTheftRestorationServiceTitle,
+                    description: UserText.identityTheftRestorationServiceDescription)
+    }
+
+    @ViewBuilder
+    private var servicesRowsForActiveSubscriptionView: some View {
+        SectionView(iconName: "VPN-Icon",
+                    title: UserText.vpnServiceTitle,
+                    description: UserText.vpnServiceDescription,
+                    buttonName: UserText.vpnServiceButtonTitle,
+                    buttonAction: { model.openVPN() },
+                    enabled: model.hasAccessToVPN)
+
+        Divider()
+            .foregroundColor(Color.secondary)
+
+        SectionView(iconName: "PIR-Icon",
+                    title: UserText.personalInformationRemovalServiceTitle,
+                    description: UserText.personalInformationRemovalServiceDescription,
+                    buttonName: UserText.personalInformationRemovalServiceButtonTitle,
+                    buttonAction: { model.openPersonalInformationRemoval() },
+                    enabled: model.hasAccessToDBP)
+
+        Divider()
+            .foregroundColor(Color.secondary)
+
+        SectionView(iconName: "ITR-Icon",
+                    title: UserText.identityTheftRestorationServiceTitle,
+                    description: UserText.identityTheftRestorationServiceDescription,
+                    buttonName: UserText.identityTheftRestorationServiceButtonTitle,
+                    buttonAction: { model.openIdentityTheftRestoration() },
+                    enabled: model.hasAccessToITR)
+    }
+
+    @ViewBuilder
+    private var footerView: some View {
+        PreferencePaneSection {
+            TextMenuItemHeader(UserText.preferencesSubscriptionFooterTitle)
+            HStack(alignment: .top, spacing: 6) {
+                TextMenuItemCaption(UserText.preferencesSubscriptionFooterCaption)
+                Button(UserText.viewFaqsButton) { model.openFAQ() }
+            }
+        }
+    }
+
+    @ViewBuilder
+    private var removeConfirmationDialog: some View {
+        SubscriptionDialog(imageName: "Privacy-Pro-128",
+                           title: UserText.removeSubscriptionDialogTitle,
+                           description: UserText.removeSubscriptionDialogDescription,
+                           buttons: {
+            Button(UserText.removeSubscriptionDialogCancel) { showingRemoveConfirmationDialog = false }
+            Button(action: {
+                showingRemoveConfirmationDialog = false
+                model.removeFromThisDeviceAction()
+            }, label: {
+                Text(UserText.removeSubscriptionDialogConfirm)
+                    .foregroundColor(.red)
+            })
+        })
+        .frame(width: 320)
+    }
+
+    @ViewBuilder
+    private var manageSubscriptionAppStoreDialog: some View {
+        SubscriptionDialog(imageName: "app-store",
+                           title: UserText.changeSubscriptionDialogTitle,
+                           description: UserText.changeSubscriptionAppleDialogDescription,
+                           buttons: {
+            Button(UserText.changeSubscriptionDialogDone) { manageSubscriptionSheet = nil }
+                .buttonStyle(DefaultActionButtonStyle(enabled: true))
+        })
+        .frame(width: 360)
+    }
+
+    @ViewBuilder
+    private var manageSubscriptionGooglePlayDialog: some View {
+        SubscriptionDialog(imageName: "google-play",
+                           title: UserText.changeSubscriptionDialogTitle,
+                           description: UserText.changeSubscriptionGoogleDialogDescription,
+                           buttons: {
+            Button(UserText.changeSubscriptionDialogDone) { manageSubscriptionSheet = nil }
+                .buttonStyle(DefaultActionButtonStyle(enabled: true))
+        })
+        .frame(width: 360)
     }
 }
 
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-expired-icon.imageset/Contents.json b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-expired-icon.imageset/Contents.json
new file mode 100644
index 0000000000..0feb43913c
--- /dev/null
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-expired-icon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "subscription-expired-icon.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-expired-icon.imageset/subscription-expired-icon.pdf b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-expired-icon.imageset/subscription-expired-icon.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..d43daeb9b999065914b2ae55c80a3467fee00e9a
GIT binary patch
literal 2374
zcmbVOOHbS|5Wf3Y%moQ5tz#!~oJa_%ETyX2s&wfM^^j%_Y{e$+CRDV)zGKH88y2aL
z9MJ6NnQtB*&v0;YcD|5YGbTa6@Z~E5I6j7x6K49g{mJqa&)%8-X1av}!Ijk-r=4lH
zEITtlHl10$K859F`l}n+cP6=TABZ3<NJ`FBQ1U{zWrEjQsJceWqEw=>LO!dFUC*Qn
zgqnM!Z2}g&P`a*4kdjwrE{iHgKn4^^$4H+r684XXpu;GAe$fx<KNDhvIu<P=nn)CP
z#1g-^?3(rL<KI?T^V}5)6js$rfEA|t?+dQNyqHxLubeel6T%uTq^<#N8)bzmxDec#
ziHO)Tm7=WkJYs^&nN)Gllpx-pwewmc#Bi5lxo#{evD0l(41{34L!^XJHrQD+Q-V+o
zgi#&t*#DMaQXYS<KjpB{p$hf_q;2OCA}B-uFDkC<274VZ#Xkvz{Ds;41BfNB1ilW`
z3v85I^h%JuhQd83SP)1>M98y6DDj$tKDx+8iAApjb^lsq@<f80B4vf2#vYM{&Xuxb
zpv1w_fbH>`o-d7)Eh|yA6hcFMdGUovURSDVY>oZPCl1$Q^MoP_686;zaiicVYxEr{
zD8|$!fjCbBNtEc6Od_$ZFx86A?c@zJE$5}Ib9~$dSGCmm)MOP7$sj_Q2w6llk)Amv
z8Z;*E=#DHXC^8_#PH!I`VI=Gy5rONl7jBH&mFM?aSblcT%}Y`0qM)5v5{$btd)fEH
zG{V(q+@1JkpMHKbkX^Jl#slxodefc`4{#Ot55*P}j#6M+nQ^$^b!G&+omZZ2IrNk1
z(W70>0la8;hyk{?gOUYqAzJL&+szt71)ISNf}iDZkG66z{t=Oc3D;-BWD^|8VN874
zPVL=r^VsxZXRet5&E~GMf1y&UP=K)iqyQ&DPf&qz+K(XYM7)zHP>F#(f^s37JqVv`
z(3*Db=FaSxy}dVQSdPPS*qS3a+^mo0qGYRKn7}6N3Y=YTei@A3{m0YpCYMewRn86$
IUVS+K4Zq#t=Kufz

literal 0
HcmV?d00001

diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-pending-icon.imageset/Contents.json b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-pending-icon.imageset/Contents.json
new file mode 100644
index 0000000000..d161417381
--- /dev/null
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-pending-icon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Info-Color-16.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-pending-icon.imageset/Info-Color-16.pdf b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/Resources/Subscription.xcassets/Icons/subscription-pending-icon.imageset/Info-Color-16.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..42f3cc015dc1fe46421444dd220b6daad5be740b
GIT binary patch
literal 1745
zcma)7O^?(#5WV|X)MX?<!g1N<F9{*R%!1G^VraM_4oxNujb=Jar&+Q5dY&_h6KD?j
z(5il}D%X21SI#ako;_q8m0~i~fB3A39zCMRk5#w7Du0z-<IO+a{`&Zd9KcQS8jgo<
zd#jp@?!R5zZJs}+^Ec~%?V!FW)@EE}X5(SCPWS3od#j9g<3gn5WL$=kz0JZjw0o82
zd{Ye5tzxT%lZ|OUjfuU^<07Yh;%My(sySM<_$^6RR+vw#AzYzWEvYM5nJh^vRCBZ-
zImuH~RHO2$?iFd(C-w1x+N;-ps&LR=QnCpu1d$j$LE)<ZsZkU*I=aj*P}JThiwh{1
zGGR$GTPK-Vb7qc?l8$Vw@j$YZBxylfWwnde8Cfu^QBMfPs}$szDiU=vft{feH+e;E
zvyZ{U%R3v9DQHAT2{<nr_AV_5u2Wmd-tdCe$^%kHLBSQN{EDsy`4h7tuRV*40jyDd
zkZ1~)Ob*%7&2KR9w(O%oV;ml&C=ruLvMAd5<i&y!;{u?e!KQ>LQjFv{cr>Oq33Q7R
z0Sr^wvTOv-MTy|pT0z;tc@7R<;*;@yYIboYr37o@f|L&P!C2hlUH8DN_8hhtGS6G!
zR}z3>sk3^a_RJn^jOKtYC_RK%2oQ*~#z0EZ98Ct%5+{Zu?p1WKW1T=iDtoAB@cv+&
zYP{;`GJU4eGS8tha_;66E=KBjf)>lzYM$)({c)go?=i-(nz#S|+fj45z3wL9Wp}mP
zKJCBJyR`(<`&*v#V$GR0-OztMwB0~uP;RDl=l%ZJ?Qvq6k~4U@Jpdz69HG@LEl{1Y
z&ELB#luCuchURn5`>%-QllliBt4z4BRi;94s0S{@&$q|zO@IA!=(j`nQ5lNrj&=E^
z;Jxz%cv@)v(IQNMX*twcR)v`J31k_4_p?`N^IsqdOW^Ua-Q9Etg^y12;sSEq8~WSs
qKHb}0-M<s1+4TL93gJ=U=FRSVhw8_V&-QQ}>9Ds>ot^#l>e&xM_ijW0

literal 0
HcmV?d00001

diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/Model/ActivateSubscriptionAccessModel.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/Model/ActivateSubscriptionAccessModel.swift
index 41063cca08..3e14765641 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/Model/ActivateSubscriptionAccessModel.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/Model/ActivateSubscriptionAccessModel.swift
@@ -17,12 +17,13 @@
 //
 
 import Foundation
+import Subscription
 
 public final class ActivateSubscriptionAccessModel: SubscriptionAccessModel, PurchaseRestoringSubscriptionAccessModel {
     private var actionHandlers: SubscriptionAccessActionHandlers
 
     public var title = UserText.activateModalTitle
-    public var description = UserText.activateModalDescription
+    public var description = UserText.activateModalDescription(platform: SubscriptionPurchaseEnvironment.current)
 
     public var email: String?
     public var emailLabel: String { UserText.email }
@@ -31,7 +32,7 @@ public final class ActivateSubscriptionAccessModel: SubscriptionAccessModel, Pur
 
     public private(set) var shouldShowRestorePurchase: Bool
     public var restorePurchaseDescription = UserText.restorePurchaseDescription
-    public var restorePurchaseButtonTitle = UserText.restorePurchasesButton
+    public var restorePurchaseButtonTitle = UserText.restorePurchaseButton
 
     public init(actionHandlers: SubscriptionAccessActionHandlers, shouldShowRestorePurchase: Bool) {
         self.actionHandlers = actionHandlers
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/Model/ShareSubscriptionAccessModel.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/Model/ShareSubscriptionAccessModel.swift
index 5ebc6d5433..9e007f4e7e 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/Model/ShareSubscriptionAccessModel.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/Model/ShareSubscriptionAccessModel.swift
@@ -21,7 +21,7 @@ import Subscription
 
 public final class ShareSubscriptionAccessModel: SubscriptionAccessModel {
     public var title = UserText.shareModalTitle
-    public var description = UserText.shareModalDescription
+    public var description = UserText.shareModalDescription(platform: SubscriptionPurchaseEnvironment.current)
 
     private let subscriptionAppGroup: String
     private var actionHandlers: SubscriptionAccessActionHandlers
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/SubscriptionAccessView.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/SubscriptionAccessView.swift
index 8be8b6f333..bf1931a6fc 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/SubscriptionAccessView.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/SubscriptionAccessView/SubscriptionAccessView.swift
@@ -115,6 +115,7 @@ public struct SubscriptionAccessView: View {
                 Button("Cancel") {
                     dismiss()
                 }
+                .buttonStyle(DismissActionButtonStyle())
             }
             .padding(.horizontal, 20)
             .padding(.vertical, 16)
diff --git a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/UserText.swift b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/UserText.swift
index 05c1ff1a5f..f90aba85ad 100644
--- a/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/UserText.swift
+++ b/LocalPackages/SubscriptionUI/Sources/SubscriptionUI/UserText.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import Subscription
 
 enum UserText {
     // MARK: - Subscription preferences
@@ -42,11 +43,25 @@ enum UserText {
 
     // MARK: Preferences when subscription is active
     static let preferencesSubscriptionActiveHeader = NSLocalizedString("subscription.preferences.subscription.active.header", value: "Privacy Pro is active on this device", comment: "Header for the subscription preferences pane when the subscription is active")
-    static func preferencesSubscriptionActiveCaption(formattedDate: String) -> String {
-        let localized = NSLocalizedString("subscription.preferences.subscription.active.caption", value: "Your monthly Privacy Pro subscription renews on %@", comment: "Caption for the subscription preferences pane when the subscription is active")
+
+    static func preferencesSubscriptionActiveRenewCaption(period: String, formattedDate: String) -> String {
+        let localized = NSLocalizedString("subscription.preferences.subscription.active.renew.caption", value: "Your %@ Privacy Pro subscription renews on %@.", comment: "Caption for the subscription preferences pane when the subscription is active and will renew. First parameter is renewal period (monthly/yearly). Second parameter is date.")
+        return String(format: localized, period, formattedDate)
+    }
+
+    static func preferencesSubscriptionActiveExpireCaption(period: String, formattedDate: String) -> String {
+        let localized = NSLocalizedString("subscription.preferences.subscription.active.expire.caption", value: "Your %@ Privacy Pro subscription expires on %@.", comment: "Caption for the subscription preferences pane when the subscription is active but will expire. First parameter is renewal period (monthly/yearly). Second parameter is date.")
+        return String(format: localized, period, formattedDate)
+    }
+
+    static func preferencesSubscriptionExpiredCaption(formattedDate: String) -> String {
+        let localized = NSLocalizedString("subscription.preferences.subscription.expired.caption", value: "Your Privacy Pro subscription expired on %@.", comment: "Caption for the subscription preferences pane when the subscription has expired. The parameter is date of expiry.")
         return String(format: localized, formattedDate)
     }
 
+    static let monthlySubscriptionBillingPeriod = NSLocalizedString("subscription.billing.period.monthly", value: "Monthly", comment: "Type of subscription billing period that lasts a month")
+    static let yearlySubscriptionBillingPeriod = NSLocalizedString("subscription.billing.period.yearly", value: "Yearly", comment: "Type of subscription billing period that lasts a year")
+
     static let addToAnotherDeviceButton = NSLocalizedString("subscription.preferences.add.to.another.device.button", value: "Add to Another Device…", comment: "Button to add subscription to another device")
     static let manageSubscriptionButton = NSLocalizedString("subscription.preferences.manage.subscription.button", value: "Manage Subscription", comment: "Button to manage subscription")
     static let changePlanOrBillingButton = NSLocalizedString("subscription.preferences.change.plan.or.billing.button", value: "Change Plan or Billing...", comment: "Button to add subscription to another device")
@@ -59,6 +74,15 @@ enum UserText {
     static let purchaseButton = NSLocalizedString("subscription.preferences.purchase.button", value: "Get Privacy Pro", comment: "Button to open a page where user can learn more and purchase the subscription")
     static let haveSubscriptionButton = NSLocalizedString("subscription.preferences.i.have.a.subscription.button", value: "I Have a Subscription", comment: "Button enabling user to activate a subscription user bought earlier or on another device")
 
+    // MARK: Preferences when subscription activation is pending
+    static let preferencesSubscriptionPendingHeader = NSLocalizedString("subscription.preferences.subscription.pending.header", value: "Your Subscription is Being Activated", comment: "Header for the subscription preferences pane when the subscription activation is pending")
+    static let preferencesSubscriptionPendingCaption = NSLocalizedString("subscription.preferences.subscription.pending.caption", value: "This is taking longer than usual, please check back later.", comment: "Caption for the subscription preferences pane when the subscription activation is pending")
+
+    // MARK: Preferences when subscription is expired
+    static let preferencesSubscriptionExpiredCaption = NSLocalizedString("subscription.preferences.subscription.expired.caption", value: "Subscribe again to continue using Privacy Pro.", comment: "Caption for the subscription preferences pane when the subscription activation is pending")
+
+    static let manageDevicesButton = NSLocalizedString("subscription.preferences.manage.devices.button", value: "Manage Devices", comment: "Button to manage devices")
+
     // MARK: - Change plan or billing dialogs
     static let changeSubscriptionDialogTitle = NSLocalizedString("subscription.dialog.change.title", value: "Change Plan or Billing", comment: "Change plan or billing dialog title")
     static let changeSubscriptionGoogleDialogDescription = NSLocalizedString("subscription.dialog.change.google.description", value: "Your subscription was purchased through the Google Play Store. To change your plan or billing settings, please open Google Play Store subscription settings on a device signed in to the same Google Account used to purchase your subscription.", comment: "Change plan or billing dialog subtitle description for subscription purchased via Google")
@@ -76,14 +100,28 @@ enum UserText {
 
     // MARK: - Activate subscription modal
     static let activateModalTitle = NSLocalizedString("subscription.activate.modal.title", value: "Activate your subscription on this device", comment: "Activate subscription modal view title")
-    static let activateModalDescription = NSLocalizedString("subscription.activate.modal.description", value: "Access your subscription on other devices via Apple ID or an 
email address.", comment: "Activate subscription modal view subtitle description")
+    static func activateModalDescription(platform: SubscriptionPurchaseEnvironment.Environment) -> String {
+        switch platform {
+        case .appStore:
+            NSLocalizedString("subscription.appstore.activate.modal.description", value: "Access your subscription on other devices via Apple ID or an email address.", comment: "Activate subscription modal view subtitle description")
+        case .stripe:
+            NSLocalizedString("subscription.activate.modal.description", value: "Access your subscription on other devices via an email address.", comment: "Activate subscription modal view subtitle description")
+        }
+    }
 
-    static let activateModalEmailDescription = NSLocalizedString("subscription.activate.modal.email.description", value: "Use your email to access your subscription on this device.", comment: "Activate subscription modal description for email address channel")
+    static let activateModalEmailDescription = NSLocalizedString("subscription.activate.modal.email.description", value: "Use your email to activate your subscription on this device.", comment: "Activate subscription modal description for email address channel")
     static let restorePurchaseDescription = NSLocalizedString("subscription.activate.modal.restore.purchase.description", value: "Your subscription is automatically available in DuckDuckGo on any device signed in to your Apple ID.", comment: "Activate subscription modal description via restore purchase from Apple ID")
 
     // MARK: - Share subscription modal
-    static let shareModalTitle = NSLocalizedString("subscription.share.modal.title", value: "Use your subscription on all your devices", comment: "Share subscription modal view title")
-    static let shareModalDescription = NSLocalizedString("subscription.share.modal.description", value: "Access your Privacy Pro subscription on any of your devices via Sync, Apple ID or by adding an email address.", comment: "Share subscription modal view subtitle description")
+    static let shareModalTitle = NSLocalizedString("subscription.share.modal.title", value: "Use your subscription on other devices", comment: "Share subscription modal view title")
+    static func shareModalDescription(platform: SubscriptionPurchaseEnvironment.Environment) -> String {
+        switch platform {
+        case .appStore:
+            NSLocalizedString("subscription.appstore.share.modal.description", value: "Access your subscription via Apple ID or by adding an email address.", comment: "Share subscription modal view subtitle description")
+        case .stripe:
+            NSLocalizedString("subscription.share.modal.description", value: "Activate your Privacy Pro subscription via an email address.", comment: "Share subscription modal view subtitle description")
+        }
+    }
 
     static let shareModalHasEmailDescription = NSLocalizedString("subscription.share.modal.has.email.description", value: "Use this email to activate your subscription on other devices. Open the DuckDuckGo app on another device and find Privacy Pro in browser settings.", comment: "Share subscription modal description for email address channel")
     static let shareModalNoEmailDescription = NSLocalizedString("subscription.share.modal.no.email.description", value: "Add an email address to access your subscription in DuckDuckGo on other devices. We’ll only use this address to verify your subscription.", comment: "Share subscription modal description for email address channel")
@@ -91,7 +129,7 @@ enum UserText {
     static let restorePurchasesDescription = NSLocalizedString("subscription.share.modal.restore.purchases.description", value: "Your subscription is automatically available in DuckDuckGo on any device signed in to your Apple ID.", comment: "Share subscription modal description for restoring Apple ID purchases")
 
     // MARK: - Activate/share modal buttons
-    static let restorePurchasesButton = NSLocalizedString("subscription.modal.restore.purchases.button", value: "Restore Purchases", comment: "Button for restoring past subscription purchases")
+    static let restorePurchaseButton = NSLocalizedString("subscription.modal.restore.purchase.button", value: "Restore Purchase", comment: "Button for restoring past subscription purchase")
     static let manageEmailButton = NSLocalizedString("subscription.modal.manage.email.button", value: "Manage Email", comment: "Button for opening manage email address page")
     static let enterEmailButton = NSLocalizedString("subscription.modal.enter.email.button", value: "Enter Email", comment: "Button for opening page to enter email address")
     static let addEmailButton = NSLocalizedString("subscription.modal.add.email.button", value: "Add Email", comment: "Button for opening page to add email address")
@@ -103,8 +141,7 @@ enum UserText {
     static let restoreButtonTitle = NSLocalizedString("subscription.alert.button.restore", value: "Restore", comment: "Alert button for restoring past subscription purchases")
 
     static let somethingWentWrongAlertTitle = NSLocalizedString("subscription.alert.something.went.wrong.title", value: "Something Went Wrong", comment: "Alert title when unknown error has occurred")
-    static let somethingWentWrongAlertDescription = NSLocalizedString("subscription.alert.something.went.wrong.description", value: "The App Store was not able to process your purchase. Please try again later.", comment: "Alert message when unknown error has occurred")
-    static let somethingWentWrongStripeAlertDescription = NSLocalizedString("subscription.alert.something.went.wrong.stripe.description", value: "We were not able to start your purchase process. Please try again later.", comment: "Alert message when unknown error has occurred")
+    static let somethingWentWrongAlertDescription = NSLocalizedString("subscription.alert.something.went.wrong.description", value: "We’re having trouble connecting. Please try again later.", comment: "Alert message when unknown error has occurred")
 
     static let subscriptionNotFoundAlertTitle = NSLocalizedString("subscription.alert.subscription.not.found.title", value: "Subscription Not Found", comment: "Alert title when subscription was not found")
     static let subscriptionNotFoundAlertDescription = NSLocalizedString("subscription.alert.subscription.not.found.description", value: "We couldn’t find a subscription associated with this Apple ID.", comment: "Alert message when subscription was not found")

From 4167e4d43f9efae33ff11ba39970751e3ba8e761 Mon Sep 17 00:00:00 2001
From: bwaresiak <bartek@duckduckgo.com>
Date: Fri, 15 Mar 2024 13:38:32 +0100
Subject: [PATCH 18/30] Stub objects for Bookmarks DB (#2418)

Task/Issue URL: https://app.asana.com/0/414235014887631/1206754257727808/f

Description:

Provide implementation for stub objects.

Steps to test this PR:
See BSK PR.
---
 DuckDuckGo.xcodeproj/project.pbxproj          |  2 +-
 .../xcshareddata/swiftpm/Package.resolved     |  6 ++---
 DuckDuckGo/Bookmarks/Model/Bookmark.swift     | 25 ++++++++++++++-----
 DuckDuckGo/Sync/SyncDebugMenu.swift           | 25 +++++++++++++++++++
 .../DataBrokerProtection/Package.swift        |  2 +-
 .../NetworkProtectionMac/Package.swift        |  2 +-
 LocalPackages/SubscriptionUI/Package.swift    |  2 +-
 7 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index a809af52f6..76a2d243ff 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -13749,7 +13749,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 123.0.1;
+				version = 124.0.0;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 7f8548488a..e8258208b3 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "838cb53a8f7050d87ae6931b45ce126ece994359",
-        "version" : "123.0.1"
+        "branch" : "bartek/stub-objects",
+        "revision" : "968c429c464688c641d100eab584aa95b039e371"
       }
     },
     {
@@ -165,7 +165,7 @@
     {
       "identity" : "trackerradarkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/duckduckgo/TrackerRadarKit",
+      "location" : "https://github.com/duckduckgo/TrackerRadarKit.git",
       "state" : {
         "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff",
         "version" : "1.2.2"
diff --git a/DuckDuckGo/Bookmarks/Model/Bookmark.swift b/DuckDuckGo/Bookmarks/Model/Bookmark.swift
index 99ca656b3f..c7c5f61076 100644
--- a/DuckDuckGo/Bookmarks/Model/Bookmark.swift
+++ b/DuckDuckGo/Bookmarks/Model/Bookmark.swift
@@ -23,25 +23,32 @@ internal class BaseBookmarkEntity: Identifiable {
 
     static func singleEntity(with uuid: String) -> NSFetchRequest<BookmarkEntity> {
         let request = BookmarkEntity.fetchRequest()
-        request.predicate = NSPredicate(format: "%K == %@ AND %K == NO", #keyPath(BookmarkEntity.uuid), uuid, #keyPath(BookmarkEntity.isPendingDeletion))
+        request.predicate = NSPredicate(format: "%K == %@ AND %K == NO AND (%K == NO OR %K == nil)",
+                                        #keyPath(BookmarkEntity.uuid), uuid,
+                                        #keyPath(BookmarkEntity.isPendingDeletion),
+                                        #keyPath(BookmarkEntity.isStub), #keyPath(BookmarkEntity.isStub))
         return request
     }
 
     static func favorite(with uuid: String, favoritesFolder: BookmarkEntity) -> NSFetchRequest<BookmarkEntity> {
         let request = BookmarkEntity.fetchRequest()
-        request.predicate = NSPredicate(format: "%K == %@ AND %K CONTAINS %@ AND %K == NO AND %K == NO",
+        request.predicate = NSPredicate(format: "%K == %@ AND %K CONTAINS %@ AND %K == NO AND %K == NO AND (%K == NO OR %K == nil)",
                                         #keyPath(BookmarkEntity.uuid),
                                         uuid as CVarArg,
                                         #keyPath(BookmarkEntity.favoriteFolders),
                                         favoritesFolder,
                                         #keyPath(BookmarkEntity.isFolder),
-                                        #keyPath(BookmarkEntity.isPendingDeletion))
+                                        #keyPath(BookmarkEntity.isPendingDeletion),
+                                        #keyPath(BookmarkEntity.isStub), #keyPath(BookmarkEntity.isStub))
         return request
     }
 
     static func entities(with identifiers: [String]) -> NSFetchRequest<BookmarkEntity> {
         let request = BookmarkEntity.fetchRequest()
-        request.predicate = NSPredicate(format: "%K IN %@ AND %K == NO", #keyPath(BookmarkEntity.uuid), identifiers, #keyPath(BookmarkEntity.isPendingDeletion))
+        request.predicate = NSPredicate(format: "%K IN %@ AND %K == NO AND (%K == NO OR %K == nil)",
+                                        #keyPath(BookmarkEntity.uuid), identifiers,
+                                        #keyPath(BookmarkEntity.isPendingDeletion),
+                                        #keyPath(BookmarkEntity.isStub), #keyPath(BookmarkEntity.isStub))
         return request
     }
 
@@ -98,7 +105,10 @@ final class BookmarkFolder: BaseBookmarkEntity {
 
     static func bookmarkFoldersFetchRequest() -> NSFetchRequest<BookmarkEntity> {
         let request = BookmarkEntity.fetchRequest()
-        request.predicate = NSPredicate(format: "%K == YES AND %K == NO", #keyPath(BookmarkEntity.isFolder), #keyPath(BookmarkEntity.isPendingDeletion))
+        request.predicate = NSPredicate(format: "%K == YES AND %K == NO AND (%K == NO OR %K == nil)",
+                                        #keyPath(BookmarkEntity.isFolder),
+                                        #keyPath(BookmarkEntity.isPendingDeletion),
+                                        #keyPath(BookmarkEntity.isStub), #keyPath(BookmarkEntity.isStub))
         return request
     }
 
@@ -135,7 +145,10 @@ final class Bookmark: BaseBookmarkEntity {
 
     static func bookmarksFetchRequest() -> NSFetchRequest<BookmarkEntity> {
         let request = BookmarkEntity.fetchRequest()
-        request.predicate = NSPredicate(format: "%K == NO AND %K == NO", #keyPath(BookmarkEntity.isFolder), #keyPath(BookmarkEntity.isPendingDeletion))
+        request.predicate = NSPredicate(format: "%K == NO AND %K == NO AND (%K == NO OR %K == nil)",
+                                        #keyPath(BookmarkEntity.isFolder),
+                                        #keyPath(BookmarkEntity.isPendingDeletion),
+                                        #keyPath(BookmarkEntity.isStub), #keyPath(BookmarkEntity.isStub))
         return request
     }
 
diff --git a/DuckDuckGo/Sync/SyncDebugMenu.swift b/DuckDuckGo/Sync/SyncDebugMenu.swift
index 6d60705595..da1fe3e0be 100644
--- a/DuckDuckGo/Sync/SyncDebugMenu.swift
+++ b/DuckDuckGo/Sync/SyncDebugMenu.swift
@@ -18,6 +18,7 @@
 
 import Foundation
 import DDGSync
+import Bookmarks
 
 @MainActor
 final class SyncDebugMenu: NSMenu {
@@ -32,6 +33,8 @@ final class SyncDebugMenu: NSMenu {
                 .submenu(environmentMenu)
             NSMenuItem(title: "Reset Favicons Fetcher Onboarding Dialog", action: #selector(resetFaviconsFetcherOnboardingDialog))
                 .targetting(self)
+            NSMenuItem(title: "Populate Stub objects", action: #selector(createStubsForDebug))
+                .targetting(self)
         }
     }
 
@@ -78,6 +81,28 @@ final class SyncDebugMenu: NSMenu {
 #endif
     }
 
+    @objc func createStubsForDebug() {
+#if DEBUG || REVIEW
+        let db = BookmarkDatabase.shared
+
+        let context = db.db.makeContext(concurrencyType: .privateQueueConcurrencyType)
+
+        context.performAndWait {
+            let root = BookmarkUtils.fetchRootFolder(context)!
+
+            _ = BookmarkEntity.makeBookmark(title: "Non stub", url: "url", parent: root, context: context)
+            let stub = BookmarkEntity.makeBookmark(title: "Stub", url: "", parent: root, context: context)
+            stub.isStub = true
+            let emptyStub = BookmarkEntity.makeBookmark(title: "", url: "", parent: root, context: context)
+            emptyStub.isStub = true
+            emptyStub.title = nil
+            emptyStub.url = nil
+
+            try? context.save()
+        }
+#endif
+    }
+
     @objc func resetFaviconsFetcherOnboardingDialog(_ sender: NSMenuItem) {
         UserDefaults.standard.set(false, forKey: UserDefaultsWrapper<String>.Key.syncDidPresentFaviconsFetcherOnboarding.rawValue)
     }
diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
index 8e88a31067..dd701eff21 100644
--- 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: "123.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "124.0.0"),
         .package(path: "../PixelKit"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
index a5aa5f7c63..000dc4e3f9 100644
--- a/LocalPackages/NetworkProtectionMac/Package.swift
+++ b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -31,7 +31,7 @@ let package = Package(
         .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "123.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "124.0.0"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../LoginItems"),
diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
index fb17968848..98ceb2ad67 100644
--- 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: "123.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "124.0.0"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [

From 409350dcc856c7707adffa55c476a69e1e3a655f Mon Sep 17 00:00:00 2001
From: Pete Smith <peadar81@gmail.com>
Date: Fri, 15 Mar 2024 12:56:28 +0000
Subject: [PATCH 19/30] Password Import: Ignore Excluded Sites When Importing
 from Chrome (#2404)

Task/Issue URL: https://app.asana.com/0/0/1206830207129428/f
CC:

Description:
This is a Fix/Improvement as part of macOS: Investigate & Action Top Failed Import Issues for Passwords.
---
 .../Logins/Chromium/ChromiumLoginReader.swift |   6 ++--
 .../DataImport/ChromiumLoginReaderTests.swift |  34 ++++++++++++++++++
 .../TestChromeData/Legacy Excluded/Login Data | Bin 0 -> 40960 bytes
 .../TestChromeData/Legacy/Login Data          | Bin 40960 -> 40960 bytes
 .../TestChromeData/v32 Excluded/Login Data    | Bin 0 -> 40960 bytes
 .../v32 Excluded/Login Data for Account       | Bin 0 -> 40960 bytes
 .../TestChromeData/v32/Login Data             | Bin 40960 -> 40960 bytes
 7 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 UnitTests/DataImport/DataImportResources/TestChromeData/Legacy Excluded/Login Data
 create mode 100644 UnitTests/DataImport/DataImportResources/TestChromeData/v32 Excluded/Login Data
 create mode 100644 UnitTests/DataImport/DataImportResources/TestChromeData/v32 Excluded/Login Data for Account

diff --git a/DuckDuckGo/DataImport/Logins/Chromium/ChromiumLoginReader.swift b/DuckDuckGo/DataImport/Logins/Chromium/ChromiumLoginReader.swift
index 2c5b36ba8e..c423ec9025 100644
--- a/DuckDuckGo/DataImport/Logins/Chromium/ChromiumLoginReader.swift
+++ b/DuckDuckGo/DataImport/Logins/Chromium/ChromiumLoginReader.swift
@@ -65,9 +65,9 @@ final class ChromiumLoginReader {
     private let decryptionKey: String?
     private let decryptionKeyPrompt: ChromiumKeychainPrompting
 
-    private static let sqlSelectWithPasswordTimestamp = "SELECT signon_realm, username_value, password_value, date_password_modified FROM logins;"
-    private static let sqlSelectWithCreatedTimestamp = "SELECT signon_realm, username_value, password_value, date_created FROM logins;"
-    private static let sqlSelectWithoutTimestamp = "SELECT signon_realm, username_value, password_value FROM logins;"
+    private static let sqlSelectWithPasswordTimestamp = "SELECT signon_realm, username_value, password_value, date_password_modified, blacklisted_by_user FROM logins WHERE blacklisted_by_user != 1;"
+    private static let sqlSelectWithCreatedTimestamp = "SELECT signon_realm, username_value, password_value, date_created, blacklisted_by_user FROM logins WHERE blacklisted_by_user != 1;"
+    private static let sqlSelectWithoutTimestamp = "SELECT signon_realm, username_value, password_value, blacklisted_by_user FROM logins WHERE blacklisted_by_user != 1;"
 
     private let source: DataImport.Source
 
diff --git a/UnitTests/DataImport/ChromiumLoginReaderTests.swift b/UnitTests/DataImport/ChromiumLoginReaderTests.swift
index ba59c59bba..4c5d835e7a 100644
--- a/UnitTests/DataImport/ChromiumLoginReaderTests.swift
+++ b/UnitTests/DataImport/ChromiumLoginReaderTests.swift
@@ -22,7 +22,9 @@ import XCTest
 
 private struct ChromiumLoginStore {
     static let legacy: Self = .init(directory: "Legacy", decryptionKey: "0geUdf5dTuZmIrtd8Omf/Q==")
+    static let legacyExcluded: Self = .init(directory: "Legacy Excluded", decryptionKey: "0geUdf5dTuZmIrtd8Omf/Q==")
     static let v32: Self = .init(directory: "v32", decryptionKey: "IcBAbGhvYp70AP+5W5ojcw==")
+    static let v32Excluded: Self = .init(directory: "v32 Excluded", decryptionKey: "IcBAbGhvYp70AP+5W5ojcw==")
 
     let directory: String
     let decryptionKey: String
@@ -64,6 +66,22 @@ class ChromiumLoginReaderTests: XCTestCase {
         XCTAssertEqual(logins[2].password, "password")
     }
 
+    func testImportFromVersion32_WithOnlyExcludedSites_IgnoresExcludedCredentials() throws {
+        // Given
+        let expectedResult: DataImportResult<[ImportedLoginCredential]> = .success([])
+        let reader = ChromiumLoginReader(
+            chromiumDataDirectoryURL: ChromiumLoginStore.v32Excluded.databaseDirectoryURL,
+            source: .chrome,
+            decryptionKey: ChromiumLoginStore.v32Excluded.decryptionKey
+        )
+
+        // When
+        let actualResult = reader.readLogins()
+
+        // Then
+        XCTAssertEqual(expectedResult, actualResult)
+    }
+
     func testImportFromLegacyVersion() throws {
 
         let reader = ChromiumLoginReader(
@@ -83,6 +101,22 @@ class ChromiumLoginReaderTests: XCTestCase {
         XCTAssertEqual(logins[0].password, "password")
     }
 
+    func testImportFromLegacyVersion_WithOnlyExcludedSites_IgnoresExcludedCredentials() {
+        // Given
+        let expectedResult: DataImportResult<[ImportedLoginCredential]> = .success([])
+        let reader = ChromiumLoginReader(
+            chromiumDataDirectoryURL: ChromiumLoginStore.legacyExcluded.databaseDirectoryURL,
+            source: .chrome,
+            decryptionKey: ChromiumLoginStore.legacyExcluded.decryptionKey
+        )
+
+        // When
+        let actualResult = reader.readLogins()
+
+        // Then
+        XCTAssertEqual(expectedResult, actualResult)
+    }
+
     func testWhenImportingChromiumData_AndTheUserCancelsTheKeychainPrompt_ThenAnErrorIsReturned() {
         let mockPrompt = MockChromiumPrompt(returnValue: .userDeniedKeychainPrompt)
         let reader = ChromiumLoginReader(
diff --git a/UnitTests/DataImport/DataImportResources/TestChromeData/Legacy Excluded/Login Data b/UnitTests/DataImport/DataImportResources/TestChromeData/Legacy Excluded/Login Data
new file mode 100644
index 0000000000000000000000000000000000000000..0acb8dc848e3636e8d752fcf7b06458492928ab0
GIT binary patch
literal 40960
zcmeI)PjA~~90%~nO%`Vb1BH&NNJS4jK&zT|gBwVUbPJ}CrEN$zda@kH%d9$f=ErGP
z4sf8Hc0jNb>Wv$`fSz_5;>Lj!N5pLsmq~jA<@eZenzUWk6>XI1`$UgZKmYtZpXZ6}
z+HF2tDY=ouuLWV#iuk)M&lH7y$T?$7#&L?zQ+$!)D-^R7)1ah340-2l?&>F6)@Rww
zHp}j23z_?wZN=Yv4XOJKW~sr*+t1*zFr+6TP|4*c-kMZ|>(`x|UeIuTVG6h52Y#}n
zUaS-g)goUkUn+ji2MX||ayNlbCsoYQvApKY@~Pa!?5wgDSvAiQH$3|6o5H!#c6@vP
zZm!#WwXjes@_l8eeXHr{RC8uFo13^Wsj#@0-BMON3gUgU+pF`*`zd1j?nzJ`yUlOD
z%%~HSlgh2Du}IR*WSborf0D+hgV3dkFx#QWuM{d5KQ2^wd8x|FtEH08Ejx09flQsZ
zg%e6F)A5|9<40+=zMKuqYdd@CElY?_5Y`XY=;b6e7D`JCIv4F)(~S-m?w|Lx@xH#+
zEt-0pRz>90X$e(}MzMb=HP5owJy%e!S=%(_C=Mwl?CUhBLo#|jjW%1oe4R&b(-E?<
z-XZn))MHX_ES`)f?wHu51=&}q?uwRYZJJUt9gNOhd%yNIr|yK-!C4UNZp-|_2?Nvi
zTzft3vCbQg->cB_0;_I{$coxxuS6>l!lh43Y!J_6%W^}}?XBDEBwwy9UM^JD_@~7+
zURbRzEtY8oT`rcZI*-TXSt1%3dv7-QrQ%10)l!w8(|I%4aQ%i^^8$OF?CHeZJ<@7<
zab>mGzXJP~P<L_lrNm1_=e>#OmFQm=Gc(8j<e(x1AOHafKmY;|fB*y_009U<00RFT
z0WJ3`Q?j>N_BL%0AOL}<C@>N{#e@Avhf;P7<IL2UrWv`@`FwuM$!nUHr_RWz{9tHj
zrex2QZz<j~DDP{QdriJmFtq(uu18Tzyf;7J>2&5or(SoXIXh_1$G7L_hh|RG^Ga17
ziNaZmX<^^#h`CK_q~`io6oh;29lhKLwI_!ogM374F`HgdZ$ENw#yh*ayI;kL-Hm*N
znnu~i{vaQiq#<ozmTR$2oGjDQJG?UC-?T6LA^YyPJ&$_z_sR;*+B-CB3Wcq@Lerrr
z<19D+Xt+n0uxy)dvL{bQTAhva=N62+@BjGV^*@a5t>vFC-1~lL6Kwv?zka><AlAXO
z%84Hg{mW)>T9a~;@9r<Z%bij6XQrqPrZ#AU009U<00Izzz!3%3A6jl@YRr(QU&f3D
zRbJ5=N_tuI_?NFaYUYY;Fm2-D*R6vWS3}EZHT5o?|96<WL$BZB&SC=r2tWV=5P-mm
z6c`=JOe)Erq{{1p502l-QT0zc|KDNi9ois300Izz00ba#;sxHw?A;AG^oD}GHaI){
z_x}?=NOTYa5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwx`qYAu0
z1)rlhN^y*${JvkArcr!}qWnkG(-bol<v*ax?**3M2mCTc1PDL?0uX=z1Rwwb2tWV=
z5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHaf
kKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rhi1AJH3Z1ONa4

literal 0
HcmV?d00001

diff --git a/UnitTests/DataImport/DataImportResources/TestChromeData/Legacy/Login Data b/UnitTests/DataImport/DataImportResources/TestChromeData/Legacy/Login Data
index d1e638bf0cc38240ff3c0cd2beb7ab0b59c94af3..f59f562ef053406026e5f105cc3a6059ca0ebf87 100644
GIT binary patch
delta 410
zcmZoTz|?SnX@WGP;zSu|Rz(KAaIcLi3&c5?Snn~giLu_>%*av1Jh@K#Nj>8>cXv@)
zL0(>WHck!>j+RsoUS3`f1_lNYW}NBHD=G_QFfjH5ako2A4oEkHXdrOsMc0y1Qc_TC
zrLSLJUanV^nv#-PqL-YXtDlpfo|&hQO_CEXJNcm87Yj3XNvPSp9GoB*zyJpWHr;T|
zo5kebF>)}mw=l4;Vs8QZ&WwGsle&~&psb)fBiIagAn6QrG9y-VRN2ASVwZ%upMCQx
vb#V?>cA!ai6C1528L$9tyve|RlN}VEo7v@+u$m3h&ce*g$iDfWxl#rIC+TQo

delta 119
zcmZoTz|?SnX@WGP%tRSyRv8ApaF2~C3&c4X*~A#w#F%R~GjbF$Pp*@GvUvhyHzO01
z=)^|#&0=!z7&#c(S23`!Vz&pXFk_$Wq%Jjag5Ty<>f#)%EDQ_`b`u+|CK<2*Ro!D?
WzsG(IsA?}eqvS+Kk<Ital`;T<R3ME2

diff --git a/UnitTests/DataImport/DataImportResources/TestChromeData/v32 Excluded/Login Data b/UnitTests/DataImport/DataImportResources/TestChromeData/v32 Excluded/Login Data
new file mode 100644
index 0000000000000000000000000000000000000000..6a4ffefe50d8c8490d7a8071714c0442d4959781
GIT binary patch
literal 40960
zcmeI5Pi))P8Nf+V){~PkiB<=M=N_J$1(pywo?~P{ll6~cvyL}ajum;EyAA{`(GFpX
zR7EPOcj=U*Eef>gxrd@X73i=_55+D42CUeCtcPvbZ5X;8mcuR^2INqnhwOWgB1QeR
z(lyH}d@m9IeD8bT``+(8hUE8<$159o(=+IfQ?KeCT@sRlC<@O~DhR?P{HEX+q{DC!
z4^Ch&Mvey^P6}s!_`M0HOuk?`$Nk+Pb(A9kB!C2v01`j~51)WMAwwk+`L#g)N&W^q
zOh^C;AOR$R1dzbjg23aFbRlKwuBVlqYEAddZOhQE8Fklm?4`vcF=-|hoSi)`N+(m*
zs$SDvPxl(`{Nf>KqeSiq<PP~ax%;(fFgl3@kN^@u0!RP}1O#TJ3*vyM0O_zaBetFa
zVn?NulaVI?_WmD>Ul1lfg$*VofCL^P0rBp}#);X~S$Q>)gmkMU%W^U~B_yU2S3R%h
z!aUkPHsoO%=NA@i<GOnWG=H@r%U}zRegj8x+bT$Y%Ovu^dYBc^`jBhM;LRj>1A_OX
zf}3*ko6+;OyYiIG-3^@Chc}aL)7Cwweg+N~EN9oWhiV85=imC-Uq1PS!XzVUb;uL2
zA6kf;6@*dsVqlNWak9kbHFcp3f4uPAGhXH=_wV0-g$r97Ht!kyn2l&U6*&oPGo6}n
zo#y~Vp{Bd;b*Elof-h^E)z5sk8<xfFuypHeg7wES=vcqQUJHhg{Nf1xL5H$s9b$g;
z-rMg##14_55dpNXszW%L)+Vt1Rdq-|+ib#oSC|*-f&qg`hmQAPe-(~=nF|s}umu<L
zSz-f%4K%%O=v>feGib0yRl5how;+?kPrUiLd;a6%Gq<;HOvc|mmHyXv-+1NEug6nQ
zOZFe{9ewBL?EODR9Dz9GmvD#)2_OL^fCP{L5_n(&FV3b`*`2t=_E*`{;|nrBf@gRB
zFuY3G6En*TB=D^M;E%`2OJL{NNOp!l)+N~czew&0@D~#jKmter2_OL^FvbK9iPE&l
zgJo{gfB(NNkk82NF>W$84GACtB!C2vz}OI&l@16bBoEZ!@Be%fVr-~jLy!OxKmter
z2_S)k2(b7+-v1Axg!xDS2_OL^fCR>i0N(${t3R<dNB{{S0VIF~Mj^oF|MC5Q6jG>z
z1dsp{Kmtf$d<fwEe|-89TY?0T01`j~NMKX~GWlGXkYN44UGn?*3^^~|ks7g2WAnm0
z;@^dnkjawt!Kmg?4+$WFM?v87L_#@zTHNw<SpU;~$%3zXXs+>6!?4TUr-|jFnk%Wa
zl)IQ$X_s!=)~iMqN@iYrTq4T!wD{&@+@}8@hWu^3!-6lPX{T<&x;|Q?ZqXm)ip!UB
zMOs)d(ZXgvpQU=)g9S;WnOWL!jXJANGc2QO*j`X9l5<VB8b(_ltew+aBFyniT+FXu
z%u=_pT{XR4W!K!b!5LU{#i|CzBfeI2fLDfG&#2I~LP=d!qfObi^zxo%x{#}F?`y0T
zeYD*2RcKV7jL=hWzZT|asb^LVml+GI%<|8&XyA=b{q|H$w`S@48iN-2ouy{E8|;oz
zG3u}sY`5IqGi%yUjk=?iEwj8AIG3fnh8-5DS&m+5EfCw*s5!37mzE7Xt)`oGx8;}_
zI!!MZ*PhQ6x9IoPEt=abt*;eeusp98N?FRe@<r;R%?!cQ74^B?X1+wfouyUhnrZK9
z+m=(_1I+M!ng9Xon-F2ushB%v8(Cjln}xNFO*J|`BLl28^db^IfU-2KBh-kFnoQ<&
zJfS=@EefVxF<x$6M0&$>__^j^6WXG`pV$$Ja^i&8T;P{d)$pJLJw4WO88JzE&)BE=
z^}=fR1w>noh|tYaf2c>)Gjp+oa^b`vr&tZzBHOa1me|rmLNNbNe)lN;(ZV{B01`j~
zNB{{Sf&ZGocOKkA5dSBCdhoJX0tp}iB!C2v0226rA}~L)GjhBr91&j?$S+7NQJI*I
z{~`W@REf_?Q{oq~zd{D4hflyu5oLZ>Y|io65yZ2sie}n74s0N{)IOhT#f#PoE9#GE
zTkh-8^+H5O)9jnh8jD%Mm!9ed1QWU4P>^Zr$A~gJE8diOP^xXNee{iv099MwZ9E7Q
zhT*rK+6HPwgP@V(e)LsiLD4=%gNWWiP0TDEPbjOigW_TB25F1!<Hrg|6Ur$?^douf
zLs_oohqn1~s-qL4*{lQjc@PP&I91)WGtFm@5JgeM8=4=SXBN5M(GI*^6h<livO$nH
zLMDvAc7?_vHe5AbSGV9hU=4_+x8l|i*sSrm>rj-P9(M;rGntH>P@Yl-ar7Z9^4&4G
zTzF*BJ4}>?b7C{)4`Qcoz);j6zUhxv({_zAj7t`0uR!eI)GhZ&2U_Ud&LWI&zhX39
zgXPn0Pcti-)k6v8$L9t)+OM>>*iU-+#-&N3oI5ApTH>A7Pp6;kP)C>c(};K*^bswp
z&#6VVu&iF8t;rN<>gMGYHcPXdyRw{HQCZ_x)VvyzK)75j7WpL3T4AlUmdoe2SPUJ6
z>IzH?_=HVwU;9!QndxfPM!y-5Xq-N{62l(osW+2p&LoMlv?Mlv;*bA*yR1Rr-mo+l
zie}RrZm(#v17sfsnjUS^p|hr*3o6r`BSd-fNwI0Ry<_9iGhsTW!@(YDve(BR9h!FG
zvlsfV!G?a=;gK+Y_asSBWv{2jL_(RH7F~WpwI&$+ISK!SbX-0i3T*VWMpn9G8Y6uF
z|Lo!4=CB4NfCP{L5<mh-;D1EmiQ)AG^Z&!OFc%3R0VIF~kN^@GCj!Cy|2VY?+kym;
f01`j~NB{{8CxG|=;e0R`2_OL^fCP}hI1=~|nNt8i

literal 0
HcmV?d00001

diff --git a/UnitTests/DataImport/DataImportResources/TestChromeData/v32 Excluded/Login Data for Account b/UnitTests/DataImport/DataImportResources/TestChromeData/v32 Excluded/Login Data for Account
new file mode 100644
index 0000000000000000000000000000000000000000..3cd1c61467128db9a6e4d022234bd4522b69b7e6
GIT binary patch
literal 40960
zcmeI54R93I9l-bFa+`#Nd=R*NK;1w!IdUPnd;keXyd*~wxm=P<_^w^{?lxh~-UqjP
ziGg9@_)wHUnW2u=)+s75l;VIeQlKzcTdbghLY>w^g-VN46&$Ic!btme_wI6+TtFN%
z!tme8?Z<on_xAt)z4x-a|NrdU))osdadf-K=VB$g6pP1j9D9(aF$^QnF9ZET%P_Q~
z2_2v<9<e{zE`d#$^-!EFOkI;@Qq|31;*bsmfB+Bx0zd!=3_XG5xMXw^l6noJE>dUF
z1{NRy1b_e#00KbZjvz3aB&VbatSB)KkITzSyj|d!F3u<N9(SoRi6C>*LPsU3I5{rO
z<zl^zD6x`XEHow}8%gR2MjfF(r~Z9M7z|1R0U!VbfB+Bx0wDr9<P?06y8v<+nS%%K
z0f^z`xP*v10Qvc!(3as;rnW3p6>Nb35C8%|00_h)5SUM7wX}@PO({vP(<a2nC$uFe
zC&$NUVA>4r0!i|Ul|@Bvu3MbYgPut3yqlFgz6ofzNbq#<?wd=n4hMQR<$P||#g&%O
zUB=?|m+$M$)94KI?Bg~2SO0#)4eP*)D%URl;&%&Zq&pQue>rX~$FbdhK~S=h{E~T3
zEeh{HwfZ6!;BeW-f{=~zLu#W#@c5nI$xzq4moCys^KWaYU_Nm!WT<Q2jxzcApP(9X
zs*&2Pq{9jb00AHX1b_e#xHSSZDfzCb4!_~;iE<Ov?-u8V1qf^|s<$AeF5!k^G3r%s
zD{fdyjsL%jQD0Dhqh7r=b3qyi00AHX1b_e#_+bc)BFWMOvB&LTTplMUFfLAFovg%W
z6J!Ohq;qbGmv~MLXAy}wnT0F23nHOD{~yGtGt|K!#sWAi5C8%|00;m9AaF|ra><+c
z8VH)aiPu1l|64HXKCR`J&JDsq00;m9AOHk{1Ol@N4Yr~b#p^E^8s13UoK(BlUAE->
z6z=}4!e{sV<9fE{?>n$rzx{flt?mWe192<1Z<_nns*S5h@7-IA9pA;Rocj3NGgB_n
zC2LOZ-nsblk+bja`Xsw}o#Tb#j`#K$X06@danYan^4@va`0Ss(^=3)M#MKLS9r$`%
zO48D?TgP5GEfMz1nfk5!TD#YOcE!{z?90S@H$Q9tOn>IB*PqKvI`#46&mYjaQYJm7
zIeg_mA8b1Mj^SA5=O?bOeC6XOethMysq*Byx@E$Jd(AtyY-OKrU%ctlpVVLYYx?2E
zSv6Nb49voVmc_;8Y<OkC)jyuYdU_A8c>bpwPW}1ZwDzOhMx_@{DPQ-xn6&>-2Y>Wp
z@}6<;J$>m{dt5%tyOm!$mwxg_wf+4kMtrz+L#4FoVurKsnQ`kcKXm$^n>O2eKOH}P
z{D~=xr|()da${H9FMf0Gz?vmX*PPwc@_u&ClH=cOcfN>!F!9{^b(*QaG>uq0W?y>!
zQK{!r^IxvT?XBXH#yqeYH!ZAW=Fhq3Bze8QId^^G+ShikJ#;AW+=arA7Hy;t9oT*9
z=LL=1T8`~_(z@G!Y}woX-AzxPUi04qV%Z}*Ka#Kixb_bi`hx`s00AHX1c1PuLty#+
z=+eA$N#Yhf{^j#T`mgcyUOb*iw<c;632%2QmRg#fo`7Ao>c2b{hvkNL#%3h6&L2@O
zr={Xqsa4YxOfR+0FUd?C6;Gr+JSL$+&dEgb!6kjNT%X-JSbc++q_O&MdRJWhUy)bc
zq+{8$%WJ&VMn^%7Fl(l{+s5(Jipn2#71W!{%Dvq+U1h$xVpsFR;-=ZvjeK))wP<Re
zKC{tVVXAda6vP7F)yYrx@%Gy8PS@O?M@ps{%Ub=#w$|>dDjFZ3=_+$H6wUOuwp$vE
zT`k>{dW2~e_Li!ul99$@qtRGVQ8uyMSTeDEa%stAWBDZc`j004fdvQv0U!VbfB+D<
ziwMZ^f4KhNMGX$70s$ZZ1b_e#Km_3W58VI=00AHX1c1QZM<AK{3X3Dr{C^$PaZL_Y
zNgg5n#G6DR_6+_nY#hpz7jnzp2L>z#0(TOD<~Xgcpa7pEv1tBJaiM^|>cNQILO<tr
z^gq<r*vzIjGu>vYwwURDvib6?D+W|j|JZ1f(q(1gy(5%5)fa};wI-?tHI2^q_;@tG
z3*+|*^h}ejrru<utxavTb%w=apjn56CM1o_G|-_*UKmc`T<ATeP_c-dE>`e!ed%6S
z6uUh>=fD!-9JNHXrK#FLi+;O{mj()pe1{t;<KtMt6{<W!SM&lE$2d@~#5w5(Yn!>w
z9BGPOU>%(TFQQz=-owaN#E=pl3y@JUGQyflJ>GD>ftGj|dPxga7Cxmx`78?~zs^Og
z_BeUbE3iF`+(se24K(lQ54N3iay~Q_Z2xqzllL-<IG=}c2)v^+q@027;N0N?UctjU
zgA>H|Nq9Y?s7x&zZZt2;`^2DPd{}9^+1Ai#vdy8Vo9ED`8Es7sR@7M<&DJ&pt#DN)
zsf#o-44$qvPczN1w9&-|+U4ou-5rcw@HjdVX7qiU5CXYv!U)kzZ+tu7hb(4YGpr3Q
zGt80wGoph9yIw?!(t!+g_#9!0$X=t@7ihG)saZJ2yPe#l!9m3OC698<sAGaLs@u4B
zoYIXPi3f_5p(MYgC;y13VI-&IcXB<nrO8^?e*n=zBO>S;Xtk?Hi0ktRt!~Q5!IYBE
zz!>E<iT<@IQGba4-%0=EL02FE1b_e#00Q3+0r3BSKOCVJAOHk_01yBIcM^eQjSWk}
zS7Fq4iqJaavNZ2#=8{fL9+`n(BhH`<ScaZ}lt$?abMZi);yXhAEWyd}?sgAaA>UHp
zaYoQz)L^YO&!+p*RXMuJ8j(il%inZnWS<rK(vy!v&P1i&aDqO-rck=vTzo~c;*{#E
zu5T|r%0bna-oNsYn=tHt8*sKkB_f@m5ye&SD<eBaV-yW}^loONzBE;<tIHkCAJ%6O
zW9-`>VI8j3-K)b@PoDgtERj)N+sb}gR3k)Y%MG9$hdkj<kBjBq`oM!pluoC^mout!
zUanD*8y<yMNeX)@)v_TcZv>gJ|FxfM9QlS_yeP5)`VN>M`O<@aYvkDUDt^}+qKwwK
zzcW;?*C%UrRl31Ast}CICIt-_#j_|4qjW{(cpy#f#2z1qx*~)8n`&?6-6H2e{ZjU`
zJLNgbSV2sRLW>$Vx`@m-Rxvu?%lc3i4DZy}C2Do^$_G<4R%yl<D|OiN`UFZ>UXHIU
zRT?dpOsurTs3wgi5ut6UjcA*Bn%QQy)|gxAU@!%lI-|K(j?&baT5C+TX4&{!v&9^d
zg52e1n@tJgG*}zj8cY_;9NCAC63w+JET9tRr5@%x4Kf~08Rw4`0g3d}hel$!1qPf~
zuMgzJQ@YYpJn*pE{|C-i7h?jugeZ_P1nB&47j%f87jM9T(g*S=N>@>V2lzhi2F#fk
zdnUd3fjSN-N#~2`^9O7PCwKjDgGadW`v*y6_q-DF=^p~n+q7C;UKTDY11cC`P-7D6
z0TnfTq6FmL6YN>}QDF>t{vZ0wJDdRs00AHX1c1QpMgZdfw_A&VK0p8n00AHX1csgf
pJpT_pV>km400KY&2mpcGjR0K#Z?_f!eSiQE00KY&2n;=e{{!tc{`UX?

literal 0
HcmV?d00001

diff --git a/UnitTests/DataImport/DataImportResources/TestChromeData/v32/Login Data b/UnitTests/DataImport/DataImportResources/TestChromeData/v32/Login Data
index 76ab8de045152236833e62ee84aebff573ed9e65..6ffc00b624f06022593919113f0210425583e72e 100644
GIT binary patch
delta 281
zcmZoTz|?SnX@WE(=R_H2R!#=JaIcLi3&gpYnL`*@3z>VELpC;YGS^oyFff$3^U8_>
z=^P-=aOdUaHD=)D;N$@Ez#tSP#ET-tz`()4kx^pCDG8PXN+YR<N|qE9Tj}eUmzV1m
zrKY50mgptt=j!L=r)TErHz#pO1qO;L3L0&mCY{H^#muhC!0yeym|b;aBNw}|8PHlI
zSy5g_Ag!g!4z_|ZqXdtEoSVJXw{Y-tashQPvu|f$-_CxIea~h=j+N}}EX=%&oQlko
N1J&g>-!)gx0022tIGX?f

delta 90
zcmV-g0Hyzczyg540+1U42$38^1qc8xS4pvCpce=N1B?I#aRZF8fq(<Ej2n0a2m%L7
w00&D4qp^WM2eV5jv<M9d3IG5A0tdVR2i^y~vk?fe2Ld4jlTjxhv)wl%XjuLjTL1t6


From 7d524cce0a6a5b8f7999cee64eef63a9b03ec799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mariusz=20=C5=9Apiewak?= <dus7@users.noreply.github.com>
Date: Fri, 15 Mar 2024 14:03:57 +0100
Subject: [PATCH 20/30] Roll back CPM post-rollout cleanup (#2430)

Task/Issue URL:
https://app.asana.com/0/414235014887631/1206850469068241/f
Tech Design URL:
CC:

**Description**:

Updates the BSK reference as a part of rolling back
https://github.com/duckduckgo/macos-browser/pull/2316

**Steps to test this PR**:
1. CI is green

<!--
Tagging instructions
If this PR isn't ready to be merged for whatever reason it should be
marked with the `DO NOT MERGE` label (particularly if it's a draft)
If it's pending Product Review/PFR, please add the `Pending Product
Review` label.

If at any point it isn't actively being worked on/ready for
review/otherwise moving forward (besides the above PR/PFR exception)
strongly consider closing it (or not opening it in the first place). If
you decide not to close it, make sure it's labelled to make it clear the
PRs state and comment with more information.
-->

---
###### Internal references:
[Pull Request Review
Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f)
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
[Pull Request
Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)
---
 DuckDuckGo.xcodeproj/project.pbxproj                        | 2 +-
 .../xcshareddata/swiftpm/Package.resolved                   | 6 +++---
 LocalPackages/DataBrokerProtection/Package.swift            | 2 +-
 LocalPackages/NetworkProtectionMac/Package.swift            | 2 +-
 LocalPackages/SubscriptionUI/Package.swift                  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index 76a2d243ff..23d4cdecf1 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -13749,7 +13749,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 124.0.0;
+				version = 124.1.0;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index e8258208b3..5d9e06d99f 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "branch" : "bartek/stub-objects",
-        "revision" : "968c429c464688c641d100eab584aa95b039e371"
+        "revision" : "bcafd206465427c560f9f581def57d8eef53748c",
+        "version" : "124.1.0"
       }
     },
     {
@@ -165,7 +165,7 @@
     {
       "identity" : "trackerradarkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/duckduckgo/TrackerRadarKit.git",
+      "location" : "https://github.com/duckduckgo/TrackerRadarKit",
       "state" : {
         "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff",
         "version" : "1.2.2"
diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
index dd701eff21..e07c2c873c 100644
--- 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: "124.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "124.1.0"),
         .package(path: "../PixelKit"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
index 000dc4e3f9..5c07540155 100644
--- a/LocalPackages/NetworkProtectionMac/Package.swift
+++ b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -31,7 +31,7 @@ let package = Package(
         .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "124.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "124.1.0"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../LoginItems"),
diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
index 98ceb2ad67..c29571c2ce 100644
--- 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: "124.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "124.1.0"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [

From c299d42a0f292e156efeb392d89195c41de93e13 Mon Sep 17 00:00:00 2001
From: Juan Manuel Pereira <juanmanuel.pereira1@gmail.com>
Date: Fri, 15 Mar 2024 10:36:10 -0300
Subject: [PATCH 21/30] DBP: Debug scan model implementation (#2421)

---
 .../CCF/DataBrokerProtectionFeature.swift     |   4 +-
 .../CCF/WebViewHandler.swift                  |  71 +++
 .../DebugUI/DataBrokerRunCustomJSONView.swift |  60 ++-
 .../DataBrokerRunCustomJSONViewModel.swift    | 425 ++++++++++++++++--
 .../DebugUI/DebugScanOperation.swift          | 181 ++++++++
 .../Model/DataBrokerProtectionProfile.swift   |   2 +-
 .../Model/ProfileQuery.swift                  |  15 +
 .../Operations/OptOutOperation.swift          |   2 +-
 .../Operations/ScanOperation.swift            |   2 +-
 .../DataBrokerProtectionFeatureTests.swift    |   2 +-
 .../DataBrokerProtectionTests/Mocks.swift     |   8 +
 11 files changed, 700 insertions(+), 72 deletions(-)
 create mode 100644 LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DebugScanOperation.swift

diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift
index c596488888..be97096c4e 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/DataBrokerProtectionFeature.swift
@@ -24,7 +24,7 @@ import Common
 
 protocol CCFCommunicationDelegate: AnyObject {
     func loadURL(url: URL) async
-    func extractedProfiles(profiles: [ExtractedProfile]) async
+    func extractedProfiles(profiles: [ExtractedProfile], meta: [String: Any]?) async
     func captchaInformation(captchaInfo: GetCaptchaInfoResponse) async
     func solveCaptcha(with response: SolveCaptchaResponse) async
     func success(actionId: String, actionType: ActionType) async
@@ -101,7 +101,7 @@ struct DataBrokerProtectionFeature: Subfeature {
                 await delegate?.onError(error: DataBrokerProtectionError.malformedURL)
             }
         case .extract(let profiles):
-            await delegate?.extractedProfiles(profiles: profiles)
+            await delegate?.extractedProfiles(profiles: profiles, meta: success.meta)
         case .getCaptchaInfo(let captchaInfo):
             await delegate?.captchaInformation(captchaInfo: captchaInfo)
         case .solveCaptcha(let response):
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/WebViewHandler.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/WebViewHandler.swift
index c89644eec4..ab98fa98b9 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/WebViewHandler.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/CCF/WebViewHandler.swift
@@ -25,6 +25,8 @@ import Common
 protocol WebViewHandler: NSObject {
     func initializeWebView(showWebView: Bool) async
     func load(url: URL) async throws
+    func takeSnaphost(path: String, fileName: String) async throws
+    func saveHTML(path: String, fileName: String) async throws
     func waitForWebViewLoad(timeoutInSeconds: Int) async throws
     func finish() async
     func execute(action: Action, data: CCFRequestData) async
@@ -122,6 +124,75 @@ final class DataBrokerProtectionWebViewHandler: NSObject, WebViewHandler {
     func evaluateJavaScript(_ javaScript: String) async throws {
         _ = webView?.evaluateJavaScript(javaScript, in: nil, in: WKContentWorld.page)
     }
+
+    func takeSnaphost(path: String, fileName: String) async throws {
+        let script = "document.body.scrollHeight"
+
+        let result = try await webView?.evaluateJavaScript(script)
+
+        if let height = result as? CGFloat {
+            webView?.frame = CGRect(origin: .zero, size: CGSize(width: 1024, height: height))
+            let configuration = WKSnapshotConfiguration()
+            configuration.rect = CGRect(x: 0, y: 0, width: webView?.frame.size.width ?? 0.0, height: height)
+            if let image = try await webView?.takeSnapshot(configuration: configuration) {
+                saveToDisk(image: image, path: path, fileName: fileName)
+            }
+        }
+    }
+
+    func saveHTML(path: String, fileName: String) async throws {
+        let result = try await webView?.evaluateJavaScript("document.documentElement.outerHTML")
+        let fileManager = FileManager.default
+
+        if let htmlString = result as? String {
+            do {
+                if !fileManager.fileExists(atPath: path) {
+                    try fileManager.createDirectory(atPath: path, withIntermediateDirectories: true, attributes: nil)
+                }
+
+                let fileURL = URL(fileURLWithPath: "\(path)/\(fileName)")
+                try htmlString.write(to: fileURL, atomically: true, encoding: .utf8)
+                print("HTML content saved to file: \(fileURL)")
+            } catch {
+                print("Error writing HTML content to file: \(error)")
+            }
+        }
+    }
+
+    private func saveToDisk(image: NSImage, path: String, fileName: String) {
+        guard let tiffData = image.tiffRepresentation else {
+            // Handle the case where tiff representation is not available
+            return
+        }
+
+        // Create a bitmap representation from the tiff data
+        guard let bitmapImageRep = NSBitmapImageRep(data: tiffData) else {
+            // Handle the case where bitmap representation cannot be created
+            return
+        }
+
+        let fileManager = FileManager.default
+
+        if !fileManager.fileExists(atPath: path) {
+            do {
+                try fileManager.createDirectory(atPath: path, withIntermediateDirectories: true, attributes: nil)
+            } catch {
+                print("Error creating folder: \(error)")
+            }
+        }
+
+        if let pngData = bitmapImageRep.representation(using: .png, properties: [:]) {
+            // Save the PNG data to a file
+            do {
+                let fileURL = URL(fileURLWithPath: "\(path)/\(fileName)")
+                try pngData.write(to: fileURL)
+            } catch {
+                print("Error writing PNG: \(error)")
+            }
+        } else {
+            print("Error png data was not respresented")
+        }
+    }
 }
 
 extension DataBrokerProtectionWebViewHandler: WKNavigationDelegate {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONView.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONView.swift
index 33671421d5..22b8c6b90a 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONView.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONView.swift
@@ -28,26 +28,42 @@ struct DataBrokerRunCustomJSONView: View {
         if viewModel.results.isEmpty {
             VStack(alignment: .leading) {
                 Text("macOS App version: \(viewModel.appVersion())")
-                Text("C-S-S version: \(viewModel.contentScopeScriptsVersion())")
 
                 Divider()
 
-                HStack {
-                    TextField("First name", text: $viewModel.firstName)
-                        .padding()
-                    TextField("Last name", text: $viewModel.lastName)
-                        .padding()
-                    TextField("Middle", text: $viewModel.middle)
-                        .padding()
+                ForEach(viewModel.names.indices, id: \.self) { index in
+                    HStack {
+                        TextField("First name", text: $viewModel.names[index].first)
+                            .padding()
+                        TextField("Middle", text: $viewModel.names[index].middle)
+                            .padding()
+                        TextField("Last name", text: $viewModel.names[index].last)
+                            .padding()
+                    }
+                }
+
+                Button("Add other name") {
+                    viewModel.names.append(.empty())
                 }
 
                 Divider()
 
-                HStack {
-                    TextField("City", text: $viewModel.city)
-                        .padding()
-                    TextField("State", text: $viewModel.state)
-                        .padding()
+                ForEach(viewModel.addresses.indices, id: \.self) { index in
+                    HStack {
+                        TextField("City", text: $viewModel.addresses[index].city)
+                            .padding()
+                        TextField("State (two characters format)", text: $viewModel.addresses[index].state)
+                            .onChange(of: viewModel.addresses[index].state) { newValue in
+                                if newValue.count > 2 {
+                                    viewModel.addresses[index].state = String(newValue.prefix(2))
+                                }
+                            }
+                            .padding()
+                    }
+                }
+
+                Button("Add other address") {
+                    viewModel.addresses.append(.empty())
                 }
 
                 Divider()
@@ -76,6 +92,14 @@ struct DataBrokerRunCustomJSONView: View {
                 Button("Run") {
                     viewModel.runJSON(jsonString: jsonText)
                 }
+
+                if viewModel.isRunningOnAllBrokers {
+                    ProgressView("Scanning...")
+                } else {
+                    Button("Run all brokers") {
+                        viewModel.runAllBrokers()
+                    }
+                }
             }
             .padding()
             .frame(minWidth: 600, minHeight: 800)
@@ -88,19 +112,19 @@ struct DataBrokerRunCustomJSONView: View {
         } else {
             VStack {
                 VStack {
-                    List(viewModel.results, id: \.name) { extractedProfile in
+                    List(viewModel.results, id: \.id) { scanResult in
                         HStack {
-                            Text(extractedProfile.name ?? "No name")
+                            Text(scanResult.extractedProfile.name ?? "No name")
                                 .padding(.horizontal, 10)
                             Divider()
-                            Text(extractedProfile.addresses?.first?.fullAddress ?? "No address")
+                            Text(scanResult.extractedProfile.addresses?.first?.fullAddress ?? "No address")
                                 .padding(.horizontal, 10)
                             Divider()
-                            Text(extractedProfile.relatives?.joined(separator: ",") ?? "No relatives")
+                            Text(scanResult.extractedProfile.relatives?.joined(separator: ",") ?? "No relatives")
                                 .padding(.horizontal, 10)
                             Divider()
                             Button("Opt-out") {
-                                viewModel.runOptOut(extractedProfile: extractedProfile)
+                                viewModel.runOptOut(scanResult: scanResult)
                             }
                         }
                     }.navigationTitle("Results")
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
index e0241d5542..0cb75a8f1d 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerRunCustomJSONViewModel.swift
@@ -22,6 +22,49 @@ import Common
 import ContentScopeScripts
 import Combine
 
+struct ExtractedAddress: Codable {
+    let state: String
+    let city: String
+}
+
+struct UserData: Codable {
+    let firstName: String
+    let lastName: String
+    let middleName: String?
+    let state: String
+    let email: String?
+    let city: String
+    let age: Int
+    let addresses: [ExtractedAddress]
+}
+
+struct ProfileUrl: Codable {
+    let profileUrl: String
+    let identifier: String
+}
+
+struct ScrapedData: Codable {
+    let name: String?
+    let alternativeNamesList: [String]?
+    let age: String?
+    let addressCityState: String?
+    let addressCityStateList: [ExtractedAddress]?
+    let relativesList: [String]?
+    let profileUrl: ProfileUrl?
+}
+
+struct ExtractResult: Codable {
+    let scrapedData: ScrapedData
+    let result: Bool
+    let score: Int
+    let matchedFields: [String]
+}
+
+struct Metadata: Codable {
+    let userData: UserData
+    let extractResults: [ExtractResult]
+}
+
 struct AlertUI {
     var title: String = ""
     var description: String = ""
@@ -30,28 +73,80 @@ struct AlertUI {
         AlertUI(title: "No results", description: "No results were found.")
     }
 
+    static func finishedScanningAllBrokers() -> AlertUI {
+        AlertUI(title: "Finished!", description: "We finished scanning all brokers. You should find the data inside ~/Desktop/PIR-Debug/")
+    }
+
     static func from(error: DataBrokerProtectionError) -> AlertUI {
         AlertUI(title: error.title, description: error.description)
     }
 }
 
-final class DataBrokerRunCustomJSONViewModel: ObservableObject {
+final class NameUI: ObservableObject {
+    let id = UUID()
+    @Published var first: String
+    @Published var middle: String
+    @Published var last: String
+
+    init(first: String, middle: String = "", last: String) {
+        self.first = first
+        self.middle = middle
+        self.last = last
+    }
 
-    @Published var firstName: String = ""
-    @Published var lastName: String = ""
-    @Published var middle: String = ""
-    @Published var city: String = ""
-    @Published var state: String = ""
+    static func empty() -> NameUI {
+        .init(first: "", middle: "", last: "")
+    }
+
+    func toModel() -> DataBrokerProtectionProfile.Name {
+        .init(firstName: first, lastName: last, middleName: middle.isEmpty ? nil : middle)
+    }
+}
+
+final class AddressUI: ObservableObject {
+    let id = UUID()
+    @Published var city: String
+    @Published var state: String
+
+    init(city: String, state: String) {
+        self.city = city
+        self.state = state
+    }
+
+    static func empty() -> AddressUI {
+        .init(city: "", state: "")
+    }
+
+    func toModel() -> DataBrokerProtectionProfile.Address {
+        .init(city: city, state: state)
+    }
+}
+
+struct ScanResult {
+    let id = UUID()
+    let dataBroker: DataBroker
+    let profileQuery: ProfileQuery
+    let extractedProfile: ExtractedProfile
+}
+
+final class DataBrokerRunCustomJSONViewModel: ObservableObject {
     @Published var birthYear: String = ""
-    @Published var results = [ExtractedProfile]()
+    @Published var results = [ScanResult]()
     @Published var showAlert = false
     @Published var showNoResults = false
+    @Published var isRunningOnAllBrokers = false
+    @Published var names = [NameUI.empty()]
+    @Published var addresses = [AddressUI.empty()]
+
     var alert: AlertUI?
     var selectedDataBroker: DataBroker?
 
     let brokers: [DataBroker]
 
     private let runnerProvider: OperationRunnerProvider
+    private let privacyConfigManager: PrivacyConfigurationManaging
+    private let contentScopeProperties: ContentScopeProperties
+    private let csvColumns = ["name_input", "age_input", "city_input", "state_input", "name_scraped", "age_scraped", "address_scraped", "relatives_scraped", "url", "broker name", "screenshot_id", "error", "matched_fields", "result_match", "expected_match"]
 
     init() {
         let privacyConfigurationManager = PrivacyConfigurationManagingMock()
@@ -69,45 +164,202 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject {
         let contentScopeProperties = ContentScopeProperties(gpcEnabled: false,
                                                             sessionKey: sessionKey,
                                                             featureToggles: features)
+
         self.runnerProvider = DataBrokerOperationRunnerProvider(
             privacyConfigManager: privacyConfigurationManager,
             contentScopeProperties: contentScopeProperties,
             emailService: EmailService(),
             captchaService: CaptchaService())
+        self.privacyConfigManager = privacyConfigurationManager
+        self.contentScopeProperties = contentScopeProperties
 
         let fileResources = FileResources()
         self.brokers = fileResources.fetchBrokerFromResourceFiles() ?? [DataBroker]()
     }
 
-    func runJSON(jsonString: String) {
-        if firstName.isEmpty || lastName.isEmpty || city.isEmpty || state.isEmpty || birthYear.isEmpty {
+    func runAllBrokers() {
+        isRunningOnAllBrokers = true
+
+        let brokerProfileQueryData = createBrokerProfileQueryData()
+
+        Task.detached {
+            var scanResults = [DebugScanReturnValue]()
+            let semaphore = DispatchSemaphore(value: 10)
+            try await withThrowingTaskGroup(of: DebugScanReturnValue.self) { group in
+                for queryData in brokerProfileQueryData {
+                    semaphore.wait()
+                    let debugScanOperation = DebugScanOperation(privacyConfig: self.privacyConfigManager, prefs: self.contentScopeProperties, query: queryData) {
+                        true
+                    }
+
+                    group.addTask {
+                        defer {
+                            semaphore.signal()
+                        }
+                        do {
+                            return try await debugScanOperation.run(inputValue: (), stageCalculator: FakeStageDurationCalculator(), showWebView: false)
+                        } catch {
+                            return DebugScanReturnValue(brokerURL: "ERROR - with broker: \(queryData.dataBroker.name)", extractedProfiles: [ExtractedProfile](), brokerProfileQueryData: queryData)
+                        }
+                    }
+                }
+
+                for try await result in group {
+                    scanResults.append(result)
+                }
+
+                self.formCSV(with: scanResults)
+
+                self.finishLoading()
+            }
+        }
+    }
+
+    private func finishLoading() {
+        DispatchQueue.main.async {
+            self.alert = AlertUI.finishedScanningAllBrokers()
             self.showAlert = true
-            self.alert = AlertUI(title: "Error", description: "Some required fields were not entered.")
-            return
+            self.isRunningOnAllBrokers = false
+        }
+    }
+
+    private func formCSV(with scanResults: [DebugScanReturnValue]) {
+        var csvText = csvColumns.map { $0 }.joined(separator: ",")
+        csvText.append("\n")
+
+        for result in scanResults {
+            if let error = result.error {
+                csvText.append(append(error: error, for: result))
+            } else {
+                csvText.append(append(result))
+            }
+        }
+
+        save(csv: csvText)
+    }
+
+    private func append(error: Error, for result: DebugScanReturnValue) -> String {
+        if let dbpError = error as? DataBrokerProtectionError {
+            if dbpError.is404 {
+                return createRowFor(matched: false, result: result, error: "404 - No results")
+            } else {
+                return createRowFor(matched: false, result: result, error: "\(dbpError.title)-\(dbpError.description)")
+            }
+        } else {
+            return createRowFor(matched: false, result: result, error: error.localizedDescription)
+        }
+    }
+
+    private func append(_ result: DebugScanReturnValue) -> String {
+        var resultsText = ""
+
+        if let meta = result.meta{
+            do {
+                let jsonData = try JSONSerialization.data(withJSONObject: meta, options: [])
+                let decoder = JSONDecoder()
+                let decodedMeta = try decoder.decode(Metadata.self, from: jsonData)
+
+                for extractedResult in decodedMeta.extractResults {
+                    resultsText.append(createRowFor(matched: extractedResult.result, result: result, extractedResult: extractedResult))
+                }
+            } catch {
+                print("Error decoding JSON: \(error)")
+            }
+        } else {
+            print("No meta object")
         }
 
+        return resultsText
+    }
+
+    private func createRowFor(matched: Bool,
+                              result: DebugScanReturnValue,
+                              error: String? = nil,
+                              extractedResult: ExtractResult? = nil) -> String {
+        let matchedString = matched ? "TRUE" : "FALSE"
+        let profileQuery = result.brokerProfileQueryData.profileQuery
+
+        var csvRow = ""
+
+        csvRow.append("\(profileQuery.fullName),") // Name (input)
+        csvRow.append("\(profileQuery.age),") // Age (input)
+        csvRow.append("\(profileQuery.city),") // City (input)
+        csvRow.append("\(profileQuery.state),") // State (input)
+
+        if let extractedResult = extractedResult {
+            csvRow.append("\(extractedResult.scrapedData.nameCSV),") // Name (scraped)
+            csvRow.append("\(extractedResult.scrapedData.ageCSV),") // Age (scraped)
+            csvRow.append("\(extractedResult.scrapedData.addressesCSV),") // Address (scraped)
+            csvRow.append("\(extractedResult.scrapedData.relativesCSV),") // Relatives (matched)
+        } else {
+            csvRow.append(",") // Name (scraped)
+            csvRow.append(",") // Age (scraped)
+            csvRow.append(",") // Address (scraped)
+            csvRow.append(",") // Relatives (scraped)
+        }
+
+        csvRow.append("\(result.brokerURL),") // Broker URL
+        csvRow.append("\(result.brokerProfileQueryData.dataBroker.name),") // Broker Name
+        csvRow.append("\(profileQuery.id ?? 0)_\(result.brokerProfileQueryData.dataBroker.name),") // Screenshot name
+
+        if let error = error {
+            csvRow.append("\(error),") // Error
+        } else {
+            csvRow.append(",") // Error empty
+        }
+
+        if let extractedResult = extractedResult {
+            csvRow.append("\(extractedResult.matchedFields.joined(separator: "-")),") // matched_fields
+        } else {
+            csvRow.append(",") // matched_fields
+        }
+
+        csvRow.append("\(matchedString),") // result_match
+        csvRow.append(",") // expected_match
+        csvRow.append("\n")
+
+        return csvRow
+    }
+
+    private func save(csv: String) {
+        do {
+            if let desktopPath = FileManager.default.urls(for: .desktopDirectory, in: .userDomainMask).first?.relativePath {
+                let path = desktopPath + "/PIR-Debug"
+                let fileName = "output.csv"
+                let fileURL = URL(fileURLWithPath: "\(path)/\(fileName)")
+                try csv.write(to: fileURL, atomically: true, encoding: .utf8)
+            } else {
+                os_log("Error getting path")
+            }
+        } catch {
+            os_log("Error writing to file: \(error)")
+        }
+    }
+
+    func runJSON(jsonString: String) {
         if let data = jsonString.data(using: .utf8) {
             do {
                 let decoder = JSONDecoder()
                 let dataBroker = try decoder.decode(DataBroker.self, from: data)
                 self.selectedDataBroker = dataBroker
                 let brokerProfileQueryData = createBrokerProfileQueryData(for: dataBroker)
-
                 let runner = runnerProvider.getOperationRunner()
 
-                Task {
-                    do {
-                        let extractedProfiles = try await runner.scan(brokerProfileQueryData, stageCalculator: FakeStageDurationCalculator(), showWebView: true) { true }
-
-                        DispatchQueue.main.async {
-                            if extractedProfiles.isEmpty {
-                                self.showNoResultsAlert()
-                            } else {
-                                self.results = extractedProfiles
+                for query in brokerProfileQueryData {
+                    Task {
+                        do {
+                            let extractedProfiles = try await runner.scan(query, stageCalculator: FakeStageDurationCalculator(), showWebView: true) { true }
+
+                            DispatchQueue.main.async {
+                                for extractedProfile in extractedProfiles {
+                                    self.results.append(ScanResult(dataBroker: query.dataBroker,
+                                                                   profileQuery: query.profileQuery,
+                                                                   extractedProfile: extractedProfile))
+                                }
                             }
+                        } catch {
+                            print("Error when scanning: \(error)")
                         }
-                    } catch {
-                        showAlert(for: error)
                     }
                 }
             } catch {
@@ -116,18 +368,16 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject {
         }
     }
 
-    func runOptOut(extractedProfile: ExtractedProfile) {
+    func runOptOut(scanResult: ScanResult) {
         let runner = runnerProvider.getOperationRunner()
-        guard let dataBroker = self.selectedDataBroker else {
-            print("No broker selected")
-            return
-        }
-
-        let brokerProfileQueryData = createBrokerProfileQueryData(for: dataBroker)
-
+        let brokerProfileQueryData = BrokerProfileQueryData(
+            dataBroker: scanResult.dataBroker,
+            profileQuery: scanResult.profileQuery,
+            scanOperationData: ScanOperationData(brokerId: 1, profileQueryId: 1, historyEvents: [HistoryEvent]())
+        )
         Task {
             do {
-                try await runner.optOut(profileQuery: brokerProfileQueryData, extractedProfile: extractedProfile, stageCalculator: FakeStageDurationCalculator(), showWebView: true) {
+                try await runner.optOut(profileQuery: brokerProfileQueryData, extractedProfile: scanResult.extractedProfile, stageCalculator: FakeStageDurationCalculator(), showWebView: true) {
                     true
                 }
 
@@ -142,10 +392,54 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject {
         }
     }
 
-    private func createBrokerProfileQueryData(for dataBroker: DataBroker) -> BrokerProfileQueryData {
-        let profile = createProfile()
-        let fakeScanOperationData = ScanOperationData(brokerId: 0, profileQueryId: 0, historyEvents: [HistoryEvent]())
-        return BrokerProfileQueryData(dataBroker: dataBroker, profileQuery: profile.profileQueries.first!, scanOperationData: fakeScanOperationData)
+    private func createBrokerProfileQueryData(for broker: DataBroker) -> [BrokerProfileQueryData] {
+        let profile: DataBrokerProtectionProfile =
+            .init(
+                names: names.map { $0.toModel() },
+                addresses: addresses.map { $0.toModel() },
+                phones: [String](),
+                birthYear: Int(birthYear) ?? 1990
+            )
+        let profileQueries = profile.profileQueries
+        var brokerProfileQueryData = [BrokerProfileQueryData]()
+
+        var profileQueryIndex: Int64 = 1
+        for profileQuery in profileQueries {
+            let fakeScanOperationData = ScanOperationData(brokerId: 0, profileQueryId: profileQueryIndex, historyEvents: [HistoryEvent]())
+            brokerProfileQueryData.append(
+                .init(dataBroker: broker, profileQuery: profileQuery.with(id: profileQueryIndex), scanOperationData: fakeScanOperationData)
+            )
+
+            profileQueryIndex += 1
+        }
+
+        return brokerProfileQueryData
+    }
+
+    private func createBrokerProfileQueryData() -> [BrokerProfileQueryData] {
+        let profile: DataBrokerProtectionProfile =
+            .init(
+                names: names.map { $0.toModel() },
+                addresses: addresses.map { $0.toModel() },
+                phones: [String](),
+                birthYear: Int(birthYear) ?? 1990
+            )
+        let profileQueries = profile.profileQueries
+        var brokerProfileQueryData = [BrokerProfileQueryData]()
+
+        var profileQueryIndex: Int64 = 1
+        for profileQuery in profileQueries {
+            let fakeScanOperationData = ScanOperationData(brokerId: 0, profileQueryId: profileQueryIndex, historyEvents: [HistoryEvent]())
+            for broker in brokers {
+                brokerProfileQueryData.append(
+                    .init(dataBroker: broker, profileQuery: profileQuery.with(id: profileQueryIndex), scanOperationData: fakeScanOperationData)
+                )
+            }
+
+            profileQueryIndex += 1
+        }
+
+        return brokerProfileQueryData
     }
 
     private func showNoResultsAlert() {
@@ -166,21 +460,9 @@ final class DataBrokerRunCustomJSONViewModel: ObservableObject {
         }
     }
 
-    private func createProfile() -> DataBrokerProtectionProfile {
-        let names = DataBrokerProtectionProfile.Name(firstName: firstName, lastName: lastName, middleName: middle)
-        let addresses = DataBrokerProtectionProfile.Address(city: city, state: state)
-
-        return DataBrokerProtectionProfile(names: [names], addresses: [addresses], phones: [String](), birthYear: Int(birthYear) ?? 1990)
-    }
-
     func appVersion() -> String {
         AppVersion.shared.versionNumber
     }
-
-    func contentScopeScriptsVersion() -> String {
-        // How can I return this?
-        return "4.59.2"
-    }
 }
 
 final class FakeStageDurationCalculator: StageDurationCalculator {
@@ -367,4 +649,51 @@ extension DataBrokerProtectionError {
         default: return name
         }
     }
+
+    var is404: Bool {
+        switch self {
+        case .httpError(let code):
+            return code == 404
+        default: return false
+        }
+    }
+}
+
+extension ScrapedData {
+
+    var nameCSV: String {
+        if let name = self.name {
+            return name.replacingOccurrences(of: ",", with: "-")
+        } else if let alternativeNamesList = self.alternativeNamesList {
+            return alternativeNamesList.joined(separator: "/").replacingOccurrences(of: ",", with: "-")
+        } else {
+            return ""
+        }
+    }
+
+    var ageCSV: String {
+        if let age = self.age {
+            return age
+        } else {
+            return ""
+        }
+    }
+
+    var addressesCSV: String {
+        if let address = self.addressCityState {
+            return address
+        } else if let addressFull = self.addressCityStateList {
+            return addressFull.map { "\($0.city)-\($0.state)" }.joined(separator: "/")
+        } else {
+            return ""
+        }
+    }
+
+    var relativesCSV: String {
+        if let relatives = self.relativesList {
+            return relatives.joined(separator: "-").replacingOccurrences(of: ",", with: "-")
+        } else {
+            return ""
+        }
+    }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DebugScanOperation.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DebugScanOperation.swift
new file mode 100644
index 0000000000..94ee1b481c
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DebugScanOperation.swift
@@ -0,0 +1,181 @@
+//
+//  DebugScanOperation.swift
+//
+//  Copyright © 2023 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import WebKit
+import BrowserServicesKit
+import UserScript
+import Common
+
+struct DebugScanReturnValue {
+    let brokerURL: String
+    let extractedProfiles: [ExtractedProfile]
+    let error: Error?
+    let brokerProfileQueryData: BrokerProfileQueryData
+    let meta: [String: Any]?
+
+    init(brokerURL: String,
+         extractedProfiles: [ExtractedProfile] = [ExtractedProfile](),
+         error: Error? = nil,
+         brokerProfileQueryData: BrokerProfileQueryData,
+         meta: [String: Any]? = nil) {
+        self.brokerURL = brokerURL
+        self.extractedProfiles = extractedProfiles
+        self.error = error
+        self.brokerProfileQueryData = brokerProfileQueryData
+        self.meta = meta
+    }
+}
+
+final class DebugScanOperation: DataBrokerOperation {
+    typealias ReturnValue = DebugScanReturnValue
+    typealias InputValue = Void
+
+    let privacyConfig: PrivacyConfigurationManaging
+    let prefs: ContentScopeProperties
+    let query: BrokerProfileQueryData
+    let emailService: EmailServiceProtocol
+    let captchaService: CaptchaServiceProtocol
+    var webViewHandler: WebViewHandler?
+    var actionsHandler: ActionsHandler?
+    var continuation: CheckedContinuation<DebugScanReturnValue, Error>?
+    var extractedProfile: ExtractedProfile?
+    var stageCalculator: StageDurationCalculator?
+    private let operationAwaitTime: TimeInterval
+    let shouldRunNextStep: () -> Bool
+    var retriesCountOnError: Int = 0
+    var scanURL: String?
+
+    private let fileManager = FileManager.default
+    private let debugScanContentPath: String?
+
+    init(privacyConfig: PrivacyConfigurationManaging,
+         prefs: ContentScopeProperties,
+         query: BrokerProfileQueryData,
+         emailService: EmailServiceProtocol = EmailService(),
+         captchaService: CaptchaServiceProtocol = CaptchaService(),
+         operationAwaitTime: TimeInterval = 3,
+         shouldRunNextStep: @escaping () -> Bool
+    ) {
+        self.privacyConfig = privacyConfig
+        self.prefs = prefs
+        self.query = query
+        self.emailService = emailService
+        self.captchaService = captchaService
+        self.operationAwaitTime = operationAwaitTime
+        self.shouldRunNextStep = shouldRunNextStep
+        if let desktopPath = fileManager.urls(for: .desktopDirectory, in: .userDomainMask).first?.relativePath {
+            self.debugScanContentPath = desktopPath + "/PIR-Debug"
+        } else {
+            self.debugScanContentPath = nil
+        }
+    }
+
+    func run(inputValue: Void,
+             webViewHandler: WebViewHandler? = nil,
+             actionsHandler: ActionsHandler? = nil,
+             stageCalculator: StageDurationCalculator, // We do not need it for scans - for now.
+             showWebView: Bool) async throws -> DebugScanReturnValue {
+        try await withCheckedThrowingContinuation { continuation in
+            self.continuation = continuation
+            Task {
+                await initialize(handler: webViewHandler, isFakeBroker: query.dataBroker.isFakeBroker, showWebView: showWebView)
+
+                do {
+                    let scanStep = try query.dataBroker.scanStep()
+                    if let actionsHandler = actionsHandler {
+                        self.actionsHandler = actionsHandler
+                    } else {
+                        self.actionsHandler = ActionsHandler(step: scanStep)
+                    }
+                    if self.shouldRunNextStep() {
+                        await executeNextStep()
+                    } else {
+                        failed(with: DataBrokerProtectionError.cancelled)
+                    }
+                } catch {
+                    failed(with: DataBrokerProtectionError.unknown(error.localizedDescription))
+                }
+            }
+        }
+    }
+
+    func runNextAction(_ action: Action) async {
+        if action as? ExtractAction != nil {
+            do {
+                if let path = self.debugScanContentPath {
+                    let fileName = "\(query.profileQuery.id ?? 0)_\(query.dataBroker.name)"
+                    try await webViewHandler?.takeSnaphost(path: path + "/screenshots/", fileName: "\(fileName).png")
+                    try await webViewHandler?.saveHTML(path: path + "/html/", fileName: "\(fileName).html")
+                }
+            } catch {
+                print("Error: \(error)")
+            }
+        }
+
+        await webViewHandler?.execute(action: action, data: .userData(query.profileQuery, self.extractedProfile))
+    }
+
+    func extractedProfiles(profiles: [ExtractedProfile], meta: [String: Any]?) async {
+        if let scanURL = self.scanURL {
+            let debugScanReturnValue = DebugScanReturnValue(
+                brokerURL: scanURL,
+                extractedProfiles: profiles,
+                brokerProfileQueryData: query,
+                meta: meta
+            )
+            complete(debugScanReturnValue)
+        }
+
+        await executeNextStep()
+    }
+
+    func completeWith(error: Error) async {
+        if let scanURL = self.scanURL {
+            let debugScanReturnValue = DebugScanReturnValue(brokerURL: scanURL, error: error, brokerProfileQueryData: query)
+            complete(debugScanReturnValue)
+        }
+
+        await executeNextStep()
+    }
+
+    func executeNextStep() async {
+        retriesCountOnError = 0 // We reset the retries on error when it is successful
+        os_log("SCAN Waiting %{public}f seconds...", log: .action, operationAwaitTime)
+
+        try? await Task.sleep(nanoseconds: UInt64(operationAwaitTime) * 1_000_000_000)
+
+        if let action = actionsHandler?.nextAction() {
+            os_log("Next action: %{public}@", log: .action, String(describing: action.actionType.rawValue))
+            await runNextAction(action)
+        } else {
+            os_log("Releasing the web view", log: .action)
+            await webViewHandler?.finish() // If we executed all steps we release the web view
+        }
+    }
+
+    func loadURL(url: URL) async {
+        do {
+            self.scanURL = url.absoluteString
+            try await webViewHandler?.load(url: url)
+            await executeNextStep()
+        } catch {
+            await completeWith(error: error)
+        }
+    }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBrokerProtectionProfile.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBrokerProtectionProfile.swift
index a77770d5f9..c76645a804 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBrokerProtectionProfile.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/DataBrokerProtectionProfile.swift
@@ -69,7 +69,7 @@ public struct DataBrokerProtectionProfile: Codable {
     }
 }
 
-internal extension DataBrokerProtectionProfile {
+extension DataBrokerProtectionProfile {
     var profileQueries: [ProfileQuery] {
         return addresses.flatMap { address in
             names.map { name in
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/ProfileQuery.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/ProfileQuery.swift
index 0850e3027c..c2cbde5fa5 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/ProfileQuery.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/ProfileQuery.swift
@@ -117,6 +117,21 @@ extension ProfileQuery {
                              birthYear: birthYear,
                              deprecated: deprecated)
      }
+
+    func with(id: Int64) -> ProfileQuery {
+        return ProfileQuery(id: id,
+                            firstName: firstName,
+                            lastName: lastName,
+                            middleName: middleName,
+                            suffix: suffix,
+                            city: city,
+                            state: state,
+                            street: street,
+                            zipCode: zip,
+                            phone: phone,
+                            birthYear: birthYear,
+                            deprecated: deprecated)
+    }
 }
 
 extension ProfileQuery: Hashable {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OptOutOperation.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OptOutOperation.swift
index ba59229aeb..7f12d1112f 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OptOutOperation.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OptOutOperation.swift
@@ -99,7 +99,7 @@ final class OptOutOperation: DataBrokerOperation {
         }
     }
 
-    func extractedProfiles(profiles: [ExtractedProfile]) async {
+    func extractedProfiles(profiles: [ExtractedProfile], meta: [String: Any]?) async {
         // No - op
     }
 
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ScanOperation.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ScanOperation.swift
index ac26510a64..06dfddd03d 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ScanOperation.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/ScanOperation.swift
@@ -87,7 +87,7 @@ final class ScanOperation: DataBrokerOperation {
         }
     }
 
-    func extractedProfiles(profiles: [ExtractedProfile]) async {
+    func extractedProfiles(profiles: [ExtractedProfile], meta: [String: Any]?) async {
         complete(profiles)
         await executeNextStep()
     }
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionFeatureTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionFeatureTests.swift
index 4fe2f44458..280b30050d 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionFeatureTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionFeatureTests.swift
@@ -118,7 +118,7 @@ final class MockCSSCommunicationDelegate: CCFCommunicationDelegate {
         self.url = url
     }
 
-    func extractedProfiles(profiles: [ExtractedProfile]) {
+    func extractedProfiles(profiles: [ExtractedProfile], meta: [String: Any]?) async {
         self.profiles = profiles
     }
 
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift
index 24a55ee92d..cc36c1e9de 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/Mocks.swift
@@ -214,6 +214,14 @@ final class WebViewHandlerMock: NSObject, WebViewHandler {
         wasExecuteJavascriptCalled = true
     }
 
+    func takeSnaphost(path: String, fileName: String) async throws {
+
+    }
+
+    func saveHTML(path: String, fileName: String) async throws {
+
+    }
+
     func reset() {
         wasInitializeWebViewCalled = false
         wasLoadCalledWithURL = nil

From 8f594baec13c6b48634fa0361bf7a7044a5d0ecd Mon Sep 17 00:00:00 2001
From: Dax the Duck <dax@duckduckgo.com>
Date: Fri, 15 Mar 2024 13:41:32 +0000
Subject: [PATCH 22/30] Update embedded files

---
 .../AppPrivacyConfigurationDataProvider.swift |  4 +-
 DuckDuckGo/ContentBlocker/macos-config.json   | 68 ++++++++++++++-----
 2 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift b/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift
index 427b2983c2..1843f8fc9d 100644
--- a/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift
+++ b/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift
@@ -22,8 +22,8 @@ import BrowserServicesKit
 final class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {
 
     public struct Constants {
-        public static let embeddedDataETag = "\"b9487380b1490e67513c650e9497a28c\""
-        public static let embeddedDataSHA = "79590d4f2a9713b20eb127a29f862130fdc964145917004031022beaecf80fd0"
+        public static let embeddedDataETag = "\"11616ebbea5b6d7731bf08d224c6b1a7\""
+        public static let embeddedDataSHA = "980b19df068a45b754ed6865295960a914c3d2c3bcc2f20b9d1f8a5f2c1d68c3"
     }
 
     var embeddedDataEtag: String {
diff --git a/DuckDuckGo/ContentBlocker/macos-config.json b/DuckDuckGo/ContentBlocker/macos-config.json
index 57da7cd02e..bb74d388c6 100644
--- a/DuckDuckGo/ContentBlocker/macos-config.json
+++ b/DuckDuckGo/ContentBlocker/macos-config.json
@@ -1,6 +1,6 @@
 {
     "readme": "https://github.com/duckduckgo/privacy-configuration",
-    "version": 1710170291349,
+    "version": 1710501855617,
     "features": {
         "adClickAttribution": {
             "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection",
@@ -264,6 +264,18 @@
                 {
                     "domain": "meneame.net"
                 },
+                {
+                    "domain": "espn.com"
+                },
+                {
+                    "domain": "usaa.com"
+                },
+                {
+                    "domain": "publico.es"
+                },
+                {
+                    "domain": "cnbc.com"
+                },
                 {
                     "domain": "earth.google.com"
                 },
@@ -287,7 +299,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "8458a9cc012a9613e1497204003be946"
+            "hash": "ec25d3a0b633fbc4f208f35999f4ab0e"
         },
         "autofill": {
             "exceptions": [
@@ -968,8 +980,11 @@
         },
         "clientBrandHint": {
             "exceptions": [],
+            "settings": {
+                "domains": []
+            },
             "state": "disabled",
-            "hash": "728493ef7a1488e4781656d3f9db84aa"
+            "hash": "d35dd75140cdfe166762013e59eb076d"
         },
         "contentBlocking": {
             "state": "enabled",
@@ -3904,6 +3919,23 @@
                             }
                         ]
                     },
+                    {
+                        "domain": "uzone.id",
+                        "rules": [
+                            {
+                                "selector": "[class^='box-ads']",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": "[class^='section-ads']",
+                                "type": "hide-empty"
+                            },
+                            {
+                                "selector": ".parallax-container",
+                                "type": "hide-empty"
+                            }
+                        ]
+                    },
                     {
                         "domain": "washingtontimes.com",
                         "rules": [
@@ -3984,7 +4016,7 @@
                 ]
             },
             "state": "enabled",
-            "hash": "3dc2d5b9a38827f46503a3b5882c7e33"
+            "hash": "3098b766cd343378237605f207f4fd17"
         },
         "exceptionHandler": {
             "exceptions": [
@@ -4878,6 +4910,16 @@
             "state": "enabled",
             "settings": {
                 "allowlistedTrackers": {
+                    "2mdn.net": {
+                        "rules": [
+                            {
+                                "rule": "2mdn.net",
+                                "domains": [
+                                    "crunchyroll.com"
+                                ]
+                            }
+                        ]
+                    },
                     "3lift.com": {
                         "rules": [
                             {
@@ -6013,22 +6055,11 @@
                     "fwmrm.net": {
                         "rules": [
                             {
-                                "rule": "2a7e9.v.fwmrm.net/ad/g/1",
+                                "rule": "v.fwmrm.net/ad",
                                 "domains": [
+                                    "6play.fr",
                                     "channel4.com"
                                 ]
-                            },
-                            {
-                                "rule": "2a7e9.v.fwmrm.net/ad/l/1",
-                                "domains": [
-                                    "channel4.com"
-                                ]
-                            },
-                            {
-                                "rule": "7cbf2.v.fwmrm.net/ad/g/1",
-                                "domains": [
-                                    "6play.fr"
-                                ]
                             }
                         ]
                     },
@@ -6197,6 +6228,7 @@
                                 "domains": [
                                     "arkadium.com",
                                     "bloomberg.com",
+                                    "crunchyroll.com",
                                     "gamak.tv",
                                     "games.washingtonpost.com",
                                     "metro.co.uk",
@@ -7946,7 +7978,7 @@
                     "domain": "sundancecatalog.com"
                 }
             ],
-            "hash": "4325ed151d126936fbeb9a608d77da86"
+            "hash": "1bbefc586e08d2c42b5db17ed95cc8e5"
         },
         "trackingCookies1p": {
             "settings": {

From ecdd9ac00618cdf9cb3314be0f86548dc9f37855 Mon Sep 17 00:00:00 2001
From: Dax the Duck <dax@duckduckgo.com>
Date: Fri, 15 Mar 2024 13:41:32 +0000
Subject: [PATCH 23/30] Set marketing version to 1.80.0

---
 Configuration/Version.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig
index da3c8e7045..7a0581611b 100644
--- a/Configuration/Version.xcconfig
+++ b/Configuration/Version.xcconfig
@@ -1 +1 @@
-MARKETING_VERSION = 1.79.0
+MARKETING_VERSION = 1.80.0

From 05d80b76af5b65443a8dcf923a25e659388221b5 Mon Sep 17 00:00:00 2001
From: Dax the Duck <dax@duckduckgo.com>
Date: Fri, 15 Mar 2024 13:52:33 +0000
Subject: [PATCH 24/30] Bump version to 1.80.0 (144)

---
 Configuration/BuildNumber.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
index 9a14499d7a..db702d8aab 100644
--- a/Configuration/BuildNumber.xcconfig
+++ b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 143
+CURRENT_PROJECT_VERSION = 144

From 8fdbc689ac386571c186ff2f69a67c5d1e051b83 Mon Sep 17 00:00:00 2001
From: Dominik Kapusta <dkapusta@duckduckgo.com>
Date: Fri, 15 Mar 2024 15:08:14 +0100
Subject: [PATCH 25/30] Fix syntax in Asana actions

---
 .github/actions/asana-create-action-item/action.yml | 2 +-
 .github/actions/asana-log-message/action.yml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/asana-create-action-item/action.yml b/.github/actions/asana-create-action-item/action.yml
index f3c5455006..7f4ee3f3c2 100644
--- a/.github/actions/asana-create-action-item/action.yml
+++ b/.github/actions/asana-create-action-item/action.yml
@@ -44,7 +44,7 @@ runs:
         task-url: ${{ inputs.release-task-url }}
 
     - id: get-asana-user-id
-      if: github.event_name != "schedule"
+      if: github.event_name != 'schedule'
       uses: duckduckgo/apple-infra/actions/asana-get-user-id-for-github-handle@main
       with:
         access-token: ${{ inputs.access-token }}
diff --git a/.github/actions/asana-log-message/action.yml b/.github/actions/asana-log-message/action.yml
index 86940852bf..288fd832ba 100644
--- a/.github/actions/asana-log-message/action.yml
+++ b/.github/actions/asana-log-message/action.yml
@@ -30,7 +30,7 @@ runs:
         task-url: ${{ inputs.task-url }}
 
     - id: get-asana-user-id
-      if: github.event_name != "schedule"
+      if: github.event_name != 'schedule'
       uses: duckduckgo/apple-infra/actions/asana-get-user-id-for-github-handle@main
       with:
         access-token: ${{ inputs.access-token }}

From 90cff6bc14ff3f80997ad1251d37464397b3bcf7 Mon Sep 17 00:00:00 2001
From: Dax the Duck <dax@duckduckgo.com>
Date: Fri, 15 Mar 2024 14:28:41 +0000
Subject: [PATCH 26/30] Bump version to 1.80.0 (145)

---
 Configuration/BuildNumber.xcconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig
index db702d8aab..b11c07fc54 100644
--- a/Configuration/BuildNumber.xcconfig
+++ b/Configuration/BuildNumber.xcconfig
@@ -1 +1 @@
-CURRENT_PROJECT_VERSION = 144
+CURRENT_PROJECT_VERSION = 145

From 793d16e629d10198642340da0ad0530fd0448845 Mon Sep 17 00:00:00 2001
From: Daniel Bernal <dbernal@duckduckgo.com>
Date: Sat, 16 Mar 2024 00:35:41 +0100
Subject: [PATCH 27/30] Bump BSK (#2435)

Task/Issue URL:
https://app.asana.com/0/72649045549333/1206350282230222/f

**Description**:
Bump BSK

**Steps to test this PR**:
1. iOS Changes Only

<!--
Tagging instructions
If this PR isn't ready to be merged for whatever reason it should be
marked with the `DO NOT MERGE` label (particularly if it's a draft)
If it's pending Product Review/PFR, please add the `Pending Product
Review` label.

If at any point it isn't actively being worked on/ready for
review/otherwise moving forward (besides the above PR/PFR exception)
strongly consider closing it (or not opening it in the first place). If
you decide not to close it, make sure it's labelled to make it clear the
PRs state and comment with more information.
-->

---
###### Internal references:
[Pull Request Review
Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f)
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
[Pull Request
Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)
---
 DuckDuckGo.xcodeproj/project.pbxproj                          | 2 +-
 .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++--
 LocalPackages/DataBrokerProtection/Package.swift              | 2 +-
 LocalPackages/NetworkProtectionMac/Package.swift              | 2 +-
 LocalPackages/SubscriptionUI/Package.swift                    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index 23d4cdecf1..c985be5176 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -13749,7 +13749,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 124.1.0;
+				version = 125.0.0;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 5d9e06d99f..24e42fd976 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "bcafd206465427c560f9f581def57d8eef53748c",
-        "version" : "124.1.0"
+        "revision" : "ac2127a26f75b2aa293f6036bcdd2bc241d09819",
+        "version" : "125.0.0"
       }
     },
     {
diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
index e07c2c873c..d428da60b2 100644
--- 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: "124.1.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "125.0.0"),
         .package(path: "../PixelKit"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
index 5c07540155..39f13d9fe0 100644
--- a/LocalPackages/NetworkProtectionMac/Package.swift
+++ b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -31,7 +31,7 @@ let package = Package(
         .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "124.1.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "125.0.0"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../LoginItems"),
diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
index c29571c2ce..6ffb49191b 100644
--- 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: "124.1.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "125.0.0"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [

From 5d7b4bc272c7f06188e129f807d44dc99f5b6894 Mon Sep 17 00:00:00 2001
From: Juan Manuel Pereira <juanmanuel.pereira1@gmail.com>
Date: Sun, 17 Mar 2024 13:50:36 -0300
Subject: [PATCH 28/30] DBP: Implement event pixels (#2408)

---
 DuckDuckGo/DBP/DBPHomeViewController.swift    |   6 +-
 .../Model/HistoryEvent.swift                  |  10 +
 ...taBrokerProfileQueryOperationManager.swift |   7 +-
 .../OperationPreferredDateCalculator.swift    |   5 +-
 .../DataBrokerProtectionEventPixels.swift     | 142 ++++++++
 .../Pixels/DataBrokerProtectionPixels.swift   |  29 +-
 .../DataBrokerProtectionProcessor.swift       |   4 +
 ...kerProfileQueryOperationManagerTests.swift |  17 +
 ...DataBrokerProtectionEventPixelsTests.swift | 318 ++++++++++++++++++
 9 files changed, 531 insertions(+), 7 deletions(-)
 create mode 100644 LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionEventPixels.swift
 create mode 100644 LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionEventPixelsTests.swift

diff --git a/DuckDuckGo/DBP/DBPHomeViewController.swift b/DuckDuckGo/DBP/DBPHomeViewController.swift
index b64fc689e8..9313c0530a 100644
--- a/DuckDuckGo/DBP/DBPHomeViewController.swift
+++ b/DuckDuckGo/DBP/DBPHomeViewController.swift
@@ -191,7 +191,11 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .dataBrokerProtectionNotificationOpenedAllRecordsRemoved,
                     .dailyActiveUser,
                     .weeklyActiveUser,
-                    .monthlyActiveUser:
+                    .monthlyActiveUser,
+                    .weeklyReportScanning,
+                    .weeklyReportRemovals,
+                    .scanningEventNewMatch,
+                    .scanningEventReAppearance:
                 Pixel.fire(.pixelKitEvent(event))
             }
         }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/HistoryEvent.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/HistoryEvent.swift
index 111d6dad23..9ed693822b 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/HistoryEvent.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Model/HistoryEvent.swift
@@ -27,6 +27,7 @@ public struct HistoryEvent: Identifiable, Sendable {
         case optOutRequested
         case optOutConfirmed
         case scanStarted
+        case reAppearence
     }
 
     public let extractedProfileId: Int64?
@@ -50,4 +51,13 @@ public struct HistoryEvent: Identifiable, Sendable {
         self.date = date
         self.type = type
     }
+
+    func matchesFound() -> Int {
+        switch type {
+        case .matchesFound(let matchesFound):
+            return matchesFound
+        default:
+            return 0
+        }
+    }
 }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
index 58352c3fc3..f5c29ae8b7 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/DataBrokerProfileQueryOperationManager.swift
@@ -117,7 +117,8 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
             notificationCenter.post(name: DataBrokerProtectionNotifications.didFinishScan, object: brokerProfileQueryData.dataBroker.name)
         }
 
-        let stageCalculator = DataBrokerProtectionStageDurationCalculator(dataBroker: brokerProfileQueryData.dataBroker.url, handler: pixelHandler)
+        let eventPixels = DataBrokerProtectionEventPixels(database: database, handler: pixelHandler)
+        let stageCalculator = DataBrokerProtectionStageDurationCalculator(dataBroker: brokerProfileQueryData.dataBroker.name, handler: pixelHandler)
 
         do {
             let event = HistoryEvent(brokerId: brokerId, profileQueryId: profileQueryId, type: .scanStarted)
@@ -141,6 +142,9 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
                     if doesProfileExistsInDatabase, let alreadyInDatabaseProfile = extractedProfilesForBroker.first(where: { $0.identifier == extractedProfile.identifier }), let id = alreadyInDatabaseProfile.id {
                         // If it was removed in the past but was found again when scanning, it means it appearead again, so we reset the remove date.
                         if alreadyInDatabaseProfile.removedDate != nil {
+                            let reAppereanceEvent = HistoryEvent(extractedProfileId: extractedProfile.id, brokerId: brokerId, profileQueryId: profileQueryId, type: .reAppearence)
+                            eventPixels.fireReAppereanceEventPixel()
+                            database.add(reAppereanceEvent)
                             database.updateRemovedDate(nil, on: id)
                         }
 
@@ -148,6 +152,7 @@ struct DataBrokerProfileQueryOperationManager: OperationsManager {
                     } else {
                         // If it's a new found profile, we'd like to opt-out ASAP
                         // If this broker has a parent opt out, we set the preferred date to nil, as we will only perform the operation within the parent.
+                        eventPixels.fireNewMatchEventPixel()
                         let broker = brokerProfileQueryData.dataBroker
                         let preferredRunOperation: Date? = broker.performsOptOutWithinParent() ? nil : Date()
 
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateCalculator.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateCalculator.swift
index f5d2063be0..ca42eaedda 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateCalculator.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Operations/OperationPreferredDateCalculator.swift
@@ -41,14 +41,13 @@ struct OperationPreferredDateCalculator {
         }
 
         switch lastEvent.type {
-
         case .optOutConfirmed:
             if isDeprecated {
                 return nil
             } else {
                 return Date().addingTimeInterval(schedulingConfig.maintenanceScan.hoursToSeconds)
             }
-        case .noMatchFound, .matchesFound:
+        case .noMatchFound, .matchesFound, .reAppearence:
             return Date().addingTimeInterval(schedulingConfig.maintenanceScan.hoursToSeconds)
         case .error:
             return Date().addingTimeInterval(schedulingConfig.retryError.hoursToSeconds)
@@ -70,7 +69,7 @@ struct OperationPreferredDateCalculator {
         }
 
         switch lastEvent.type {
-        case .matchesFound:
+        case .matchesFound, .reAppearence:
             if let extractedProfileID = extractedProfileID, shouldScheduleNewOptOut(events: historyEvents,
                                                                                     extractedProfileId: extractedProfileID,
                                                                                     schedulingConfig: schedulingConfig) {
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionEventPixels.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionEventPixels.swift
new file mode 100644
index 0000000000..fd0a382703
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionEventPixels.swift
@@ -0,0 +1,142 @@
+//
+//  DataBrokerProtectionEventPixels.swift
+//
+//  Copyright © 2023 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Foundation
+import Common
+import BrowserServicesKit
+import PixelKit
+
+protocol DataBrokerProtectionEventPixelsRepository {
+    func markWeeklyPixelSent()
+
+    func getLatestWeeklyPixel() -> Date?
+}
+
+final class DataBrokerProtectionEventPixelsUserDefaults: DataBrokerProtectionEventPixelsRepository {
+
+    enum Consts {
+        static let weeklyPixelKey = "macos.browser.data-broker-protection.eventsWeeklyPixelKey"
+    }
+
+    private let userDefaults: UserDefaults
+
+    init(userDefaults: UserDefaults = .standard) {
+        self.userDefaults = userDefaults
+    }
+
+    func markWeeklyPixelSent() {
+        userDefaults.set(Date(), forKey: Consts.weeklyPixelKey)
+    }
+
+    func getLatestWeeklyPixel() -> Date? {
+        userDefaults.object(forKey: Consts.weeklyPixelKey) as? Date
+    }
+}
+
+final class DataBrokerProtectionEventPixels {
+
+    private let database: DataBrokerProtectionRepository
+    private let repository: DataBrokerProtectionEventPixelsRepository
+    private let handler: EventMapping<DataBrokerProtectionPixels>
+    private let calendar = Calendar.current
+
+    init(database: DataBrokerProtectionRepository,
+         repository: DataBrokerProtectionEventPixelsRepository = DataBrokerProtectionEventPixelsUserDefaults(),
+         handler: EventMapping<DataBrokerProtectionPixels>) {
+        self.database = database
+        self.repository = repository
+        self.handler = handler
+    }
+
+    func tryToFireWeeklyPixels() {
+        if shouldWeFireWeeklyPixel() {
+            fireWeeklyReportPixels()
+            repository.markWeeklyPixelSent()
+        }
+    }
+
+    func fireNewMatchEventPixel() {
+        handler.fire(.scanningEventNewMatch)
+    }
+
+    func fireReAppereanceEventPixel() {
+        handler.fire(.scanningEventReAppearance)
+    }
+
+    private func shouldWeFireWeeklyPixel() -> Bool {
+        guard let lastPixelFiredDate = repository.getLatestWeeklyPixel() else {
+            return true // Last pixel fired date is not present. We should fire it
+        }
+
+        return didWeekPassedBetweenDates(start: lastPixelFiredDate, end: Date())
+    }
+
+    private func fireWeeklyReportPixels() {
+        let data = database.fetchAllBrokerProfileQueryData()
+        let dataInThePastWeek = data.filter(hadScanThisWeek(_:))
+
+        var newMatchesFoundInTheLastWeek = 0
+        var reAppereancesInTheLastWeek = 0
+        var removalsInTheLastWeek = 0
+
+        for query in data {
+            let allHistoryEventsForQuery = query.scanOperationData.historyEvents + query.optOutOperationsData.flatMap { $0.historyEvents }
+            let historyEventsInThePastWeek = allHistoryEventsForQuery.filter {
+                !didWeekPassedBetweenDates(start: $0.date, end: Date())
+            }
+            let newMatches = historyEventsInThePastWeek.reduce(0, { result, next in
+                return result + next.matchesFound()
+            })
+            let reAppereances = historyEventsInThePastWeek.filter { $0.type == .reAppearence }.count
+            let removals = historyEventsInThePastWeek.filter { $0.type == .optOutConfirmed }.count
+
+            newMatchesFoundInTheLastWeek += newMatches
+            reAppereancesInTheLastWeek += reAppereances
+            removalsInTheLastWeek += removals
+        }
+
+        let totalBrokers = Dictionary(grouping: data, by: { $0.dataBroker.url }).count
+        let totalBrokersInTheLastWeek = Dictionary(grouping: dataInThePastWeek, by: { $0.dataBroker.url }).count
+        var percentageOfBrokersScanned: Int
+
+        if totalBrokers == 0 {
+            percentageOfBrokersScanned = 0
+        } else {
+            percentageOfBrokersScanned = (totalBrokersInTheLastWeek * 100) / totalBrokers
+        }
+
+        handler.fire(.weeklyReportScanning(hadNewMatch: newMatchesFoundInTheLastWeek > 0, hadReAppereance: reAppereancesInTheLastWeek > 0, scanCoverage: percentageOfBrokersScanned))
+        handler.fire(.weeklyReportRemovals(removals: removalsInTheLastWeek))
+    }
+
+    private func hadScanThisWeek(_ brokerProfileQuery: BrokerProfileQueryData) -> Bool {
+        return brokerProfileQuery.scanOperationData.historyEvents.contains { historyEvent in
+            !didWeekPassedBetweenDates(start: historyEvent.date, end: Date())
+        }
+    }
+
+    private func didWeekPassedBetweenDates(start: Date, end: Date) -> Bool {
+        let components = calendar.dateComponents([.day], from: start, to: end)
+
+        if let differenceInDays = components.day {
+            return differenceInDays >= 7
+        } else {
+            return false
+        }
+    }
+}
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
index e7198fe713..9663bbae4d 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
@@ -54,6 +54,10 @@ public enum DataBrokerProtectionPixels {
         static let pattern = "pattern"
         static let isParent = "is_parent"
         static let actionIDKey = "action_id"
+        static let hadNewMatch = "had_new_match"
+        static let hadReAppereance = "had_re-appearance"
+        static let scanCoverage = "scan_coverage"
+        static let removals = "removals"
     }
 
     case error(error: DataBrokerProtectionError, dataBroker: String)
@@ -117,6 +121,12 @@ public enum DataBrokerProtectionPixels {
     case dailyActiveUser
     case weeklyActiveUser
     case monthlyActiveUser
+
+    // KPIs - events
+    case weeklyReportScanning(hadNewMatch: Bool, hadReAppereance: Bool, scanCoverage: Int)
+    case weeklyReportRemovals(removals: Int)
+    case scanningEventNewMatch
+    case scanningEventReAppearance
 }
 
 extension DataBrokerProtectionPixels: PixelKitEvent {
@@ -190,6 +200,11 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
         case .dailyActiveUser: return "m_mac_dbp_engagement_dau"
         case .weeklyActiveUser: return "m_mac_dbp_engagement_wau"
         case .monthlyActiveUser: return "m_mac_dbp_engagement_mau"
+
+        case .weeklyReportScanning: return "m_mac_dbp_event_weekly-report_scanning"
+        case .weeklyReportRemovals: return "m_mac_dbp_event_weekly-report_removals"
+        case .scanningEventNewMatch: return "m_mac_dbp_event_scanning-events_new-match"
+        case .scanningEventReAppearance: return "m_mac_dbp_event_scanning-events_re-appearance"
         }
     }
 
@@ -251,6 +266,10 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
             }
 
             return params
+        case .weeklyReportScanning(let hadNewMatch, let hadReAppereance, let scanCoverage):
+            return [Consts.hadNewMatch: hadNewMatch.description, Consts.hadReAppereance: hadReAppereance.description, Consts.scanCoverage: scanCoverage.description]
+        case .weeklyReportRemovals(let removals):
+            return [Consts.removals: String(removals)]
         case .backgroundAgentStarted,
                 .backgroundAgentRunOperationsAndStartSchedulerIfPossible,
                 .backgroundAgentRunOperationsAndStartSchedulerIfPossibleNoSavedProfile,
@@ -266,7 +285,9 @@ extension DataBrokerProtectionPixels: PixelKitEvent {
                 .dataBrokerProtectionNotificationOpenedAllRecordsRemoved,
                 .dailyActiveUser,
                 .weeklyActiveUser,
-                .monthlyActiveUser:
+                .monthlyActiveUser,
+                .scanningEventNewMatch,
+                .scanningEventReAppearance:
             return [:]
         case .ipcServerRegister,
                 .ipcServerStartScheduler,
@@ -341,7 +362,11 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .dataBrokerProtectionNotificationOpenedAllRecordsRemoved,
                     .dailyActiveUser,
                     .weeklyActiveUser,
-                    .monthlyActiveUser:
+                    .monthlyActiveUser,
+                    .weeklyReportScanning,
+                    .weeklyReportRemovals,
+                    .scanningEventNewMatch,
+                    .scanningEventReAppearance:
 
                 PixelKit.fire(event)
             }
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
index a06a9a3b92..d6971d1a80 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionProcessor.swift
@@ -33,6 +33,7 @@ final class DataBrokerProtectionProcessor {
     private var pixelHandler: EventMapping<DataBrokerProtectionPixels>
     private let userNotificationService: DataBrokerProtectionUserNotificationService
     private let engagementPixels: DataBrokerProtectionEngagementPixels
+    private let eventPixels: DataBrokerProtectionEventPixels
 
     init(database: DataBrokerProtectionRepository,
          config: SchedulerConfig,
@@ -50,6 +51,7 @@ final class DataBrokerProtectionProcessor {
         self.operationQueue.maxConcurrentOperationCount = config.concurrentOperationsDifferentBrokers
         self.userNotificationService = userNotificationService
         self.engagementPixels = DataBrokerProtectionEngagementPixels(database: database, handler: pixelHandler)
+        self.eventPixels = DataBrokerProtectionEventPixels(database: database, handler: pixelHandler)
     }
 
     // MARK: - Public functions
@@ -115,6 +117,8 @@ final class DataBrokerProtectionProcessor {
 
         // This will fire the DAU/WAU/MAU pixels,
         engagementPixels.fireEngagementPixel()
+        // This will try to fire the event weekly report pixels
+        eventPixels.tryToFireWeeklyPixels()
 
         let brokersProfileData = database.fetchAllBrokerProfileQueryData()
         let dataBrokerOperationCollections = createDataBrokerOperationCollections(from: brokersProfileData,
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProfileQueryOperationManagerTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProfileQueryOperationManagerTests.swift
index 08796454c7..70619e8736 100644
--- a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProfileQueryOperationManagerTests.swift
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProfileQueryOperationManagerTests.swift
@@ -974,6 +974,10 @@ extension ScanOperationData {
             historyEvents: [HistoryEvent]()
         )
     }
+
+    static func mockWith(historyEvents: [HistoryEvent]) -> ScanOperationData {
+        ScanOperationData(brokerId: 1, profileQueryId: 1, historyEvents: historyEvents)
+    }
 }
 
 extension OptOutOperationData {
@@ -1035,6 +1039,19 @@ extension DataBroker {
             )
         )
     }
+
+    static func mockWithURL(_ url: String) -> DataBroker {
+        .init(name: "Test",
+              url: url,
+              steps: [Step](),
+              version: "1.0",
+              schedulingConfig: DataBrokerScheduleConfig(
+                retryError: 0,
+                confirmOptOutScan: 0,
+                maintenanceScan: 0
+            )
+        )
+    }
 }
 
 extension ProfileQuery {
diff --git a/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionEventPixelsTests.swift b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionEventPixelsTests.swift
new file mode 100644
index 0000000000..4c5a93563b
--- /dev/null
+++ b/LocalPackages/DataBrokerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionEventPixelsTests.swift
@@ -0,0 +1,318 @@
+//
+//  DataBrokerProtectionEventPixelsTests.swift
+//
+//  Copyright © 2023 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import XCTest
+import Foundation
+@testable import DataBrokerProtection
+
+final class DataBrokerProtectionEventPixelsTests: XCTestCase {
+
+    let database = MockDatabase()
+    let repository = MockDataBrokerProtectionEventPixelsRepository()
+    let handler = MockDataBrokerProtectionPixelsHandler()
+    let calendar = Calendar.current
+
+    override func tearDown() {
+        handler.clear()
+        repository.clear()
+    }
+
+    func testWhenFireNewMatchEventPixelIsCalled_thenCorrectPixelIsFired() {
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+
+        sut.fireNewMatchEventPixel()
+
+        XCTAssertEqual(
+            MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last!.name,
+            DataBrokerProtectionPixels.scanningEventNewMatch.name
+        )
+    }
+
+    func testWhenFireReAppereanceEventPixelIsCalled_thenCorrectPixelIsFired() {
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+
+        sut.fireReAppereanceEventPixel()
+
+        XCTAssertEqual(
+            MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last!.name,
+            DataBrokerProtectionPixels.scanningEventReAppearance.name
+        )
+    }
+
+    func testWhenReportWasFiredInTheLastWeek_thenWeDoNotFireWeeklyPixels() {
+        repository.customGetLatestWeeklyPixel = Date().yesterday
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+
+        sut.tryToFireWeeklyPixels()
+
+        XCTAssertFalse(repository.wasMarkWeeklyPixelSentCalled)
+    }
+
+    func testWhenReportWasNotFiredInTheLastWeek_thenWeFireWeeklyPixels() {
+        guard let eightDaysSinceToday = Calendar.current.date(byAdding: .day, value: -8, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        repository.customGetLatestWeeklyPixel = eightDaysSinceToday
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+
+        sut.tryToFireWeeklyPixels()
+
+        XCTAssertTrue(repository.wasMarkWeeklyPixelSentCalled)
+    }
+
+    func testWhenLastWeeklyPixelIsNil_thenWeFireWeeklyPixels() {
+        repository.customGetLatestWeeklyPixel = nil
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+
+        sut.tryToFireWeeklyPixels()
+
+        XCTAssertTrue(repository.wasMarkWeeklyPixelSentCalled)
+    }
+
+    func testWhenReAppereanceOcurredInTheLastWeek_thenReAppereanceFlagIsTrue() {
+        guard let sixDaysSinceToday = Calendar.current.date(byAdding: .day, value: -6, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let reAppereanceThisWeekEvent = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .reAppearence, date: sixDaysSinceToday)
+        let dataBrokerProfileQueryWithReAppereance: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mock,
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [reAppereanceThisWeekEvent]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueryWithReAppereance
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+        let hadReAppereance = weeklyReportScanningPixel.params!["had_re-appearance"]!
+
+        XCTAssertTrue(Bool(hadReAppereance)!)
+    }
+
+    func testWhenReAppereanceDidNotOcurrInTheLastWeek_thenReAppereanceFlagIsFalse() {
+        guard let eighDaysSinceToday = Calendar.current.date(byAdding: .day, value: -8, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let reAppereanceThisWeekEvent = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .reAppearence, date: eighDaysSinceToday)
+        let dataBrokerProfileQueryWithReAppereance: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mock,
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [reAppereanceThisWeekEvent]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueryWithReAppereance
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+        let hadReAppereance = weeklyReportScanningPixel.params!["had_re-appearance"]!
+
+        XCTAssertFalse(Bool(hadReAppereance)!)
+    }
+
+    func testWhenNoMatchesHappendInTheLastWeek_thenHadNewMatchFlagIsFalse() {
+        guard let eighDaysSinceToday = Calendar.current.date(byAdding: .day, value: -8, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let newMatchesPriorToThisWeekEvent = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .matchesFound(count: 2), date: eighDaysSinceToday)
+        let dataBrokerProfileQueryWithMatches: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mock,
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [newMatchesPriorToThisWeekEvent]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueryWithMatches
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+        let hadNewMatch = weeklyReportScanningPixel.params!["had_new_match"]!
+
+        XCTAssertFalse(Bool(hadNewMatch)!)
+    }
+
+    func testWhenMatchesHappendInTheLastWeek_thenHadNewMatchFlagIsTrue() {
+        guard let sixDaysSinceToday = Calendar.current.date(byAdding: .day, value: -6, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let newMatchesThisWeekEvent = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .matchesFound(count: 2), date: sixDaysSinceToday)
+        let dataBrokerProfileQueryWithMatches: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mock,
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [newMatchesThisWeekEvent]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueryWithMatches
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+        let hadNewMatch = weeklyReportScanningPixel.params!["had_new_match"]!
+
+        XCTAssertTrue(Bool(hadNewMatch)!)
+    }
+
+    func testWhenNoRemovalsHappendInTheLastWeek_thenRemovalsCountIsZero() {
+        guard let eighDaysSinceToday = Calendar.current.date(byAdding: .day, value: -8, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let removalsPriorToThisWeekEvent = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .optOutConfirmed, date: eighDaysSinceToday)
+        let dataBrokerProfileQueryWithRemovals: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mock,
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [removalsPriorToThisWeekEvent]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueryWithRemovals
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last!
+        let removals = weeklyReportScanningPixel.params!["removals"]!
+
+        XCTAssertEqual("0", removals)
+    }
+
+    func testWhenRemovalsHappendInTheLastWeek_thenRemovalsCountIsCorrect() {
+        guard let sixDaysSinceToday = Calendar.current.date(byAdding: .day, value: -6, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let removalThisWeekEventOne = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .optOutConfirmed, date: sixDaysSinceToday)
+        let removalThisWeekEventTwo = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .optOutConfirmed, date: sixDaysSinceToday)
+        let dataBrokerProfileQueryWithRemovals: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mock,
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [removalThisWeekEventOne, removalThisWeekEventTwo]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueryWithRemovals
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.last!
+        let removals = weeklyReportScanningPixel.params!["removals"]!
+
+        XCTAssertEqual("2", removals)
+    }
+
+    func testWhenNoHistoryEventsHappenedInTheLastWeek_thenBrokersScannedIsZero() {
+        guard let eighDaysSinceToday = Calendar.current.date(byAdding: .day, value: -8, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let eventOne = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .optOutStarted, date: eighDaysSinceToday)
+        let eventTwo = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .error(error: .cancelled), date: eighDaysSinceToday)
+        let eventThree = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .scanStarted, date: eighDaysSinceToday)
+        let eventFour = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .noMatchFound, date: eighDaysSinceToday)
+        let dataBrokerProfileQueries: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mock,
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventOne, eventTwo, eventThree, eventFour]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueries
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+        let scanCoverage = weeklyReportScanningPixel.params!["scan_coverage"]!
+
+        XCTAssertEqual("0", scanCoverage)
+    }
+
+    func testWhenHistoryEventsHappenedInTheLastWeek_thenBrokersScannedIsMoreThanZero() {
+        guard let eighDaysSinceToday = Calendar.current.date(byAdding: .day, value: -8, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        guard let sixDaysSinceToday = Calendar.current.date(byAdding: .day, value: -6, to: Date()) else {
+            XCTFail("This should no throw")
+            return
+        }
+
+        let eventOne = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .scanStarted, date: eighDaysSinceToday)
+        let eventTwo = HistoryEvent(brokerId: 1, profileQueryId: 1, type: .scanStarted, date: sixDaysSinceToday)
+        let dataBrokerProfileQueries: [BrokerProfileQueryData] = [
+            .init(dataBroker: .mockWithURL("www.brokerone.com"),
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventOne])),
+            .init(dataBroker: .mockWithURL("www.brokertwo.com"),
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventOne])),
+            .init(dataBroker: .mockWithURL("www.brokerthree.com"),
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventTwo])),
+            .init(dataBroker: .mockWithURL("www.brokerfour.com"),
+                  profileQuery: .mock,
+                  scanOperationData: .mockWith(historyEvents: [eventTwo]))
+        ]
+        let sut = DataBrokerProtectionEventPixels(database: database, repository: repository, handler: handler)
+        database.brokerProfileQueryDataToReturn = dataBrokerProfileQueries
+        repository.customGetLatestWeeklyPixel = nil
+
+        sut.tryToFireWeeklyPixels()
+
+        let weeklyReportScanningPixel = MockDataBrokerProtectionPixelsHandler.lastPixelsFired.first!
+        let scanCoverage = weeklyReportScanningPixel.params!["scan_coverage"]!
+
+        XCTAssertEqual("50", scanCoverage)
+    }
+}
+
+final class MockDataBrokerProtectionEventPixelsRepository: DataBrokerProtectionEventPixelsRepository {
+
+    var wasMarkWeeklyPixelSentCalled = false
+    var customGetLatestWeeklyPixel: Date?
+
+    func markWeeklyPixelSent() {
+        wasMarkWeeklyPixelSentCalled = true
+    }
+
+    func getLatestWeeklyPixel() -> Date? {
+        return customGetLatestWeeklyPixel
+    }
+
+    func clear() {
+        wasMarkWeeklyPixelSentCalled = false
+        customGetLatestWeeklyPixel = nil
+    }
+}

From 67c9d66e68e911cb80fcd368af55c5389180af5f Mon Sep 17 00:00:00 2001
From: Diego Rey Mendez <diegoreymendez@users.noreply.github.com>
Date: Mon, 18 Mar 2024 00:29:02 +0100
Subject: [PATCH 29/30] Improves VPN pixel info and adds tests (#2434)

Task/Issue URL: https://app.asana.com/0/0/1206857816167860/f

iOS: https://github.com/duckduckgo/iOS/pull/2604
BSK: https://github.com/duckduckgo/BrowserServicesKit/pull/732

## Description

1. Makes `NetworkProtectionPixelEvent` implement `PixelKitEventV2` to
make it easier for me to add automated tests.
2. Ensures all our error pixels contain both error and underlying error
information.
3. Adds automated to validate that all pixels in
`NetworkProtectionPixelEvent` send the right information.
---
 DuckDuckGo.xcodeproj/project.pbxproj          |   8 +-
 .../xcshareddata/swiftpm/Package.resolved     |   8 +-
 .../DuckDuckGo Privacy Browser.xcscheme       |   3 +
 .../NetworkProtectionPixelEvent.swift         | 210 +++++++----
 .../EventMapping+NetworkProtectionError.swift |   8 +-
 .../NetworkProtectionTunnelController.swift   |   2 +-
 .../MacPacketTunnelProvider.swift             |  23 +-
 .../DataBrokerProtection/Package.swift        |   2 +-
 .../NetworkProtectionMac/Package.swift        |   2 +-
 .../PixelKit/PixelKit+Parameters.swift        |   2 +-
 .../PixelFireExpectations.swift               |  28 +-
 .../XCTestCase+PixelKit.swift                 |  42 +--
 LocalPackages/SubscriptionUI/Package.swift    |   2 +-
 .../NetworkProtectionPixelEventTests.swift    | 345 ++++++++++++++++++
 14 files changed, 563 insertions(+), 122 deletions(-)
 create mode 100644 UnitTests/NetworkProtection/NetworkProtectionPixelEventTests.swift

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index c985be5176..9f4d19a784 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -2171,6 +2171,8 @@
 		7B00997F2B6508C200FE7C31 /* NetworkProtectionProxy in Frameworks */ = {isa = PBXBuildFile; productRef = 7B00997E2B6508C200FE7C31 /* NetworkProtectionProxy */; };
 		7B0099822B65C6B300FE7C31 /* MacTransparentProxyProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B0099802B65C6B300FE7C31 /* MacTransparentProxyProvider.swift */; };
 		7B0694982B6E980F00FA4DBA /* VPNProxyLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B0694972B6E980F00FA4DBA /* VPNProxyLauncher.swift */; };
+		7B09CBA92BA4BE8100CF245B /* NetworkProtectionPixelEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B09CBA72BA4BE7000CF245B /* NetworkProtectionPixelEventTests.swift */; };
+		7B09CBAA2BA4BE8200CF245B /* NetworkProtectionPixelEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B09CBA72BA4BE7000CF245B /* NetworkProtectionPixelEventTests.swift */; };
 		7B1459542B7D437200047F2C /* BrowserWindowManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B0099782B65013800FE7C31 /* BrowserWindowManager.swift */; };
 		7B1459552B7D438F00047F2C /* VPNProxyLauncher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B0694972B6E980F00FA4DBA /* VPNProxyLauncher.swift */; };
 		7B1459572B7D43E500047F2C /* NetworkProtectionProxy in Frameworks */ = {isa = PBXBuildFile; productRef = 7B1459562B7D43E500047F2C /* NetworkProtectionProxy */; };
@@ -3833,6 +3835,7 @@
 		7B0099802B65C6B300FE7C31 /* MacTransparentProxyProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacTransparentProxyProvider.swift; sourceTree = "<group>"; };
 		7B05829D2A812AC000AC3F7C /* NetworkProtectionOnboardingMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkProtectionOnboardingMenu.swift; sourceTree = "<group>"; };
 		7B0694972B6E980F00FA4DBA /* VPNProxyLauncher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNProxyLauncher.swift; sourceTree = "<group>"; };
+		7B09CBA72BA4BE7000CF245B /* NetworkProtectionPixelEventTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkProtectionPixelEventTests.swift; sourceTree = "<group>"; };
 		7B1E819B27C8874900FF0E60 /* ContentOverlayPopover.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentOverlayPopover.swift; sourceTree = "<group>"; };
 		7B1E819C27C8874900FF0E60 /* ContentOverlay.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = ContentOverlay.storyboard; sourceTree = "<group>"; };
 		7B1E819D27C8874900FF0E60 /* ContentOverlayViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentOverlayViewController.swift; sourceTree = "<group>"; };
@@ -6095,6 +6098,7 @@
 				4BCF15E62ABB98A20083F6DF /* Resources */,
 				4BCF15E42ABB98990083F6DF /* NetworkProtectionRemoteMessageTests.swift */,
 				4BD57C032AC112DF00B580EE /* NetworkProtectionRemoteMessagingTests.swift */,
+				7B09CBA72BA4BE7000CF245B /* NetworkProtectionPixelEventTests.swift */,
 			);
 			path = NetworkProtection;
 			sourceTree = "<group>";
@@ -10702,6 +10706,7 @@
 				3706FE78293F661700E42796 /* HistoryCoordinatingMock.swift in Sources */,
 				3706FE79293F661700E42796 /* AppearancePreferencesTests.swift in Sources */,
 				3706FE7A293F661700E42796 /* FirePopoverViewModelTests.swift in Sources */,
+				7B09CBAA2BA4BE8200CF245B /* NetworkProtectionPixelEventTests.swift in Sources */,
 				3706FE7B293F661700E42796 /* HistoryStoringMock.swift in Sources */,
 				562984702AC4610100AC20EB /* SyncPreferencesTests.swift in Sources */,
 				3706FE7C293F661700E42796 /* LocalBookmarkStoreTests.swift in Sources */,
@@ -12509,6 +12514,7 @@
 				FD23FD2B28816606007F6985 /* AutoconsentMessageProtocolTests.swift in Sources */,
 				1D77921A28FDC79800BE0210 /* FaviconStoringMock.swift in Sources */,
 				1D1C36E629FB019C001FA40C /* HistoryTabExtensionTests.swift in Sources */,
+				7B09CBA92BA4BE8100CF245B /* NetworkProtectionPixelEventTests.swift in Sources */,
 				B6DA441E2616C84600DD1EC2 /* PixelStoreMock.swift in Sources */,
 				4B434690285ED7A100177407 /* BookmarksBarViewModelTests.swift in Sources */,
 				B6BBF1702744CDE1004F850E /* CoreDataStoreTests.swift in Sources */,
@@ -13749,7 +13755,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 125.0.0;
+				version = 125.0.1;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 24e42fd976..23b4cce189 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "ac2127a26f75b2aa293f6036bcdd2bc241d09819",
-        "version" : "125.0.0"
+        "revision" : "eced8f93c945ff2fa4ff92bdd619514d4eff7131",
+        "version" : "125.0.1"
       }
     },
     {
@@ -122,8 +122,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-argument-parser",
       "state" : {
-        "revision" : "c8ed701b513cf5177118a175d85fbbbcd707ab41",
-        "version" : "1.3.0"
+        "revision" : "46989693916f56d1186bd59ac15124caef896560",
+        "version" : "1.3.1"
       }
     },
     {
diff --git a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme
index 58557db074..0224eeaec8 100644
--- a/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme	
+++ b/DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo Privacy Browser.xcscheme	
@@ -120,6 +120,9 @@
                <Test
                   Identifier = "PixelStoreTests/testWhenValuesAreRemovedThenTheyAreNotInCache()">
                </Test>
+               <Test
+                  Identifier = "PreferencesSidebarModelTests/testWhenResetTabSelectionIfNeededCalledThenPreferencesTabIsSelected()">
+               </Test>
                <Test
                   Identifier = "StatisticsLoaderTests/testWhenRefreshRetentionAtbIsPerformedForNavigationThenAppRetentionAtbRequested()">
                </Test>
diff --git a/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift
index f7e491577b..2f60171c17 100644
--- a/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift
+++ b/DuckDuckGo/NetworkProtection/AppAndExtensionAndAgentTargets/NetworkProtectionPixelEvent.swift
@@ -22,22 +22,23 @@ import Foundation
 import PixelKit
 import NetworkProtection
 
-enum NetworkProtectionPixelEvent: PixelKitEvent {
+enum NetworkProtectionPixelEvent: PixelKitEventV2 {
+    static let vpnErrorDomain = "com.duckduckgo.vpn.errorDomain"
 
     case networkProtectionActiveUser
     case networkProtectionNewUser
 
     case networkProtectionControllerStartAttempt
     case networkProtectionControllerStartSuccess
-    case networkProtectionControllerStartFailure
+    case networkProtectionControllerStartFailure(_ error: Error)
 
     case networkProtectionTunnelStartAttempt
     case networkProtectionTunnelStartSuccess
-    case networkProtectionTunnelStartFailure
+    case networkProtectionTunnelStartFailure(_ error: Error)
 
     case networkProtectionTunnelUpdateAttempt
     case networkProtectionTunnelUpdateSuccess
-    case networkProtectionTunnelUpdateFailure
+    case networkProtectionTunnelUpdateFailure(_ error: Error)
 
     case networkProtectionEnableAttemptConnecting
     case networkProtectionEnableAttemptSuccess
@@ -55,23 +56,23 @@ enum NetworkProtectionPixelEvent: PixelKitEvent {
     case networkProtectionTunnelConfigurationCouldNotGetPeerHostName
     case networkProtectionTunnelConfigurationCouldNotGetInterfaceAddressRange
 
-    case networkProtectionClientFailedToFetchServerList(error: Error?)
+    case networkProtectionClientFailedToFetchServerList(_ error: Error?)
     case networkProtectionClientFailedToParseServerListResponse
     case networkProtectionClientFailedToEncodeRegisterKeyRequest
-    case networkProtectionClientFailedToFetchRegisteredServers(error: Error?)
+    case networkProtectionClientFailedToFetchRegisteredServers(_ error: Error?)
     case networkProtectionClientFailedToParseRegisteredServersResponse
     case networkProtectionClientFailedToEncodeRedeemRequest
     case networkProtectionClientInvalidInviteCode
-    case networkProtectionClientFailedToRedeemInviteCode(error: Error?)
-    case networkProtectionClientFailedToParseRedeemResponse(error: Error)
-    case networkProtectionClientFailedToFetchLocations(error: Error?)
-    case networkProtectionClientFailedToParseLocationsResponse(error: Error?)
+    case networkProtectionClientFailedToRedeemInviteCode(_ error: Error?)
+    case networkProtectionClientFailedToParseRedeemResponse(_ error: Error)
+    case networkProtectionClientFailedToFetchLocations(_ error: Error?)
+    case networkProtectionClientFailedToParseLocationsResponse(_ error: Error?)
     case networkProtectionClientInvalidAuthToken
 
     case networkProtectionServerListStoreFailedToEncodeServerList
     case networkProtectionServerListStoreFailedToDecodeServerList
-    case networkProtectionServerListStoreFailedToWriteServerList(error: Error)
-    case networkProtectionServerListStoreFailedToReadServerList(error: Error)
+    case networkProtectionServerListStoreFailedToWriteServerList(_ error: Error)
+    case networkProtectionServerListStoreFailedToReadServerList(_ error: Error)
 
     case networkProtectionKeychainErrorFailedToCastKeychainValueToData(field: String)
     case networkProtectionKeychainReadError(field: String, status: Int32)
@@ -82,14 +83,14 @@ enum NetworkProtectionPixelEvent: PixelKitEvent {
     case networkProtectionWireguardErrorCannotLocateTunnelFileDescriptor
     case networkProtectionWireguardErrorInvalidState(reason: String)
     case networkProtectionWireguardErrorFailedDNSResolution
-    case networkProtectionWireguardErrorCannotSetNetworkSettings(error: Error)
+    case networkProtectionWireguardErrorCannotSetNetworkSettings(_ error: Error)
     case networkProtectionWireguardErrorCannotStartWireguardBackend(code: Int32)
 
     case networkProtectionNoAuthTokenFoundError
 
     case networkProtectionRekeyAttempt
     case networkProtectionRekeyCompleted
-    case networkProtectionRekeyFailure
+    case networkProtectionRekeyFailure(_ error: Error)
 
     case networkProtectionSystemExtensionActivationFailure
 
@@ -102,169 +103,169 @@ enum NetworkProtectionPixelEvent: PixelKitEvent {
         switch self {
 
         case .networkProtectionActiveUser:
-            return "m_mac_netp_daily_active"
+            return "netp_daily_active"
 
         case .networkProtectionNewUser:
-            return "m_mac_netp_daily_active_u"
+            return "netp_daily_active_u"
 
         case .networkProtectionControllerStartAttempt:
-            return "m_mac_netp_controller_start_attempt"
+            return "netp_controller_start_attempt"
 
         case .networkProtectionControllerStartSuccess:
-            return "m_mac_netp_controller_start_success"
+            return "netp_controller_start_success"
 
         case .networkProtectionControllerStartFailure:
-            return "m_mac_netp_controller_start_failure"
+            return "netp_controller_start_failure"
 
         case .networkProtectionTunnelStartAttempt:
-            return "m_mac_netp_tunnel_start_attempt"
+            return "netp_tunnel_start_attempt"
 
         case .networkProtectionTunnelStartSuccess:
-            return "m_mac_netp_tunnel_start_success"
+            return "netp_tunnel_start_success"
 
         case .networkProtectionTunnelStartFailure:
-            return "m_mac_netp_tunnel_start_failure"
+            return "netp_tunnel_start_failure"
 
         case .networkProtectionTunnelUpdateAttempt:
-            return "m_mac_netp_tunnel_update_attempt"
+            return "netp_tunnel_update_attempt"
 
         case .networkProtectionTunnelUpdateSuccess:
-            return "m_mac_netp_tunnel_update_success"
+            return "netp_tunnel_update_success"
 
         case .networkProtectionTunnelUpdateFailure:
-            return "m_mac_netp_tunnel_update_failure"
+            return "netp_tunnel_update_failure"
 
         case .networkProtectionEnableAttemptConnecting:
-            return "m_mac_netp_ev_enable_attempt"
+            return "netp_ev_enable_attempt"
 
         case .networkProtectionEnableAttemptSuccess:
-            return "m_mac_netp_ev_enable_attempt_success"
+            return "netp_ev_enable_attempt_success"
 
         case .networkProtectionEnableAttemptFailure:
-            return "m_mac_netp_ev_enable_attempt_failure"
+            return "netp_ev_enable_attempt_failure"
 
         case .networkProtectionTunnelFailureDetected:
-            return "m_mac_netp_ev_tunnel_failure"
+            return "netp_ev_tunnel_failure"
 
         case .networkProtectionTunnelFailureRecovered:
-            return "m_mac_netp_ev_tunnel_failure_recovered"
+            return "netp_ev_tunnel_failure_recovered"
 
         case .networkProtectionLatency(let quality):
-            return "m_mac_netp_ev_\(quality.rawValue)_latency"
+            return "netp_ev_\(quality.rawValue)_latency"
 
         case .networkProtectionLatencyError:
-            return "m_mac_netp_ev_latency_error"
+            return "netp_ev_latency_error"
 
         case .networkProtectionTunnelConfigurationNoServerRegistrationInfo:
-            return "m_mac_netp_tunnel_config_error_no_server_registration_info"
+            return "netp_tunnel_config_error_no_server_registration_info"
 
         case .networkProtectionTunnelConfigurationCouldNotSelectClosestServer:
-            return "m_mac_netp_tunnel_config_error_could_not_select_closest_server"
+            return "netp_tunnel_config_error_could_not_select_closest_server"
 
         case .networkProtectionTunnelConfigurationCouldNotGetPeerPublicKey:
-            return "m_mac_netp_tunnel_config_error_could_not_get_peer_public_key"
+            return "netp_tunnel_config_error_could_not_get_peer_public_key"
 
         case .networkProtectionTunnelConfigurationCouldNotGetPeerHostName:
-            return "m_mac_netp_tunnel_config_error_could_not_get_peer_host_name"
+            return "netp_tunnel_config_error_could_not_get_peer_host_name"
 
         case .networkProtectionTunnelConfigurationCouldNotGetInterfaceAddressRange:
-            return "m_mac_netp_tunnel_config_error_could_not_get_interface_address_range"
+            return "netp_tunnel_config_error_could_not_get_interface_address_range"
 
         case .networkProtectionClientFailedToFetchServerList:
-            return "m_mac_netp_backend_api_error_failed_to_fetch_server_list"
+            return "netp_backend_api_error_failed_to_fetch_server_list"
 
         case .networkProtectionClientFailedToParseServerListResponse:
-            return "m_mac_netp_backend_api_error_parsing_server_list_response_failed"
+            return "netp_backend_api_error_parsing_server_list_response_failed"
 
         case .networkProtectionClientFailedToEncodeRegisterKeyRequest:
-            return "m_mac_netp_backend_api_error_encoding_register_request_body_failed"
+            return "netp_backend_api_error_encoding_register_request_body_failed"
 
         case .networkProtectionClientFailedToFetchRegisteredServers:
-            return "m_mac_netp_backend_api_error_failed_to_fetch_registered_servers"
+            return "netp_backend_api_error_failed_to_fetch_registered_servers"
 
         case .networkProtectionClientFailedToParseRegisteredServersResponse:
-            return "m_mac_netp_backend_api_error_parsing_device_registration_response_failed"
+            return "netp_backend_api_error_parsing_device_registration_response_failed"
 
         case .networkProtectionClientFailedToEncodeRedeemRequest:
-            return "m_mac_netp_backend_api_error_encoding_redeem_request_body_failed"
+            return "netp_backend_api_error_encoding_redeem_request_body_failed"
 
         case .networkProtectionClientInvalidInviteCode:
-            return "m_mac_netp_backend_api_error_invalid_invite_code"
+            return "netp_backend_api_error_invalid_invite_code"
 
         case .networkProtectionClientFailedToRedeemInviteCode:
-            return "m_mac_netp_backend_api_error_failed_to_redeem_invite_code"
+            return "netp_backend_api_error_failed_to_redeem_invite_code"
 
         case .networkProtectionClientFailedToParseRedeemResponse:
-            return "m_mac_netp_backend_api_error_parsing_redeem_response_failed"
+            return "netp_backend_api_error_parsing_redeem_response_failed"
 
         case .networkProtectionClientFailedToFetchLocations:
-            return "m_mac_netp_backend_api_error_failed_to_fetch_location_list"
+            return "netp_backend_api_error_failed_to_fetch_location_list"
 
         case .networkProtectionClientFailedToParseLocationsResponse:
-            return "m_mac_netp_backend_api_error_parsing_location_list_response_failed"
+            return "netp_backend_api_error_parsing_location_list_response_failed"
 
         case .networkProtectionClientInvalidAuthToken:
-            return "m_mac_netp_backend_api_error_invalid_auth_token"
+            return "netp_backend_api_error_invalid_auth_token"
 
         case .networkProtectionServerListStoreFailedToEncodeServerList:
-            return "m_mac_netp_storage_error_failed_to_encode_server_list"
+            return "netp_storage_error_failed_to_encode_server_list"
 
         case .networkProtectionServerListStoreFailedToDecodeServerList:
-            return "m_mac_netp_storage_error_failed_to_decode_server_list"
+            return "netp_storage_error_failed_to_decode_server_list"
 
         case .networkProtectionServerListStoreFailedToWriteServerList:
-            return "m_mac_netp_storage_error_server_list_file_system_write_failed"
+            return "netp_storage_error_server_list_file_system_write_failed"
 
         case .networkProtectionServerListStoreFailedToReadServerList:
-            return "m_mac_netp_storage_error_server_list_file_system_read_failed"
+            return "netp_storage_error_server_list_file_system_read_failed"
 
         case .networkProtectionKeychainErrorFailedToCastKeychainValueToData:
-            return "m_mac_netp_keychain_error_failed_to_cast_keychain_value_to_data"
+            return "netp_keychain_error_failed_to_cast_keychain_value_to_data"
 
         case .networkProtectionKeychainReadError:
-            return "m_mac_netp_keychain_error_read_failed"
+            return "netp_keychain_error_read_failed"
 
         case .networkProtectionKeychainWriteError:
-            return "m_mac_netp_keychain_error_write_failed"
+            return "netp_keychain_error_write_failed"
 
         case .networkProtectionKeychainUpdateError:
-            return "m_mac_netp_keychain_error_update_failed"
+            return "netp_keychain_error_update_failed"
 
         case .networkProtectionKeychainDeleteError:
-            return "m_mac_netp_keychain_error_delete_failed"
+            return "netp_keychain_error_delete_failed"
 
         case .networkProtectionWireguardErrorCannotLocateTunnelFileDescriptor:
-            return "m_mac_netp_wireguard_error_cannot_locate_tunnel_file_descriptor"
+            return "netp_wireguard_error_cannot_locate_tunnel_file_descriptor"
 
         case .networkProtectionWireguardErrorInvalidState:
-            return "m_mac_netp_wireguard_error_invalid_state"
+            return "netp_wireguard_error_invalid_state"
 
         case .networkProtectionWireguardErrorFailedDNSResolution:
-            return "m_mac_netp_wireguard_error_failed_dns_resolution"
+            return "netp_wireguard_error_failed_dns_resolution"
 
         case .networkProtectionWireguardErrorCannotSetNetworkSettings:
-            return "m_mac_netp_wireguard_error_cannot_set_network_settings"
+            return "netp_wireguard_error_cannot_set_network_settings"
 
         case .networkProtectionWireguardErrorCannotStartWireguardBackend:
-            return "m_mac_netp_wireguard_error_cannot_start_wireguard_backend"
+            return "netp_wireguard_error_cannot_start_wireguard_backend"
 
         case .networkProtectionNoAuthTokenFoundError:
-            return "m_mac_netp_no_auth_token_found_error"
+            return "netp_no_auth_token_found_error"
 
         case .networkProtectionRekeyAttempt:
-            return "m_mac_netp_rekey_attempt"
+            return "netp_rekey_attempt"
 
         case .networkProtectionRekeyCompleted:
-            return "m_mac_netp_rekey_completed"
+            return "netp_rekey_completed"
 
         case .networkProtectionRekeyFailure:
-            return "m_mac_netp_rekey_failure"
+            return "netp_rekey_failure"
 
         case .networkProtectionSystemExtensionActivationFailure:
-            return "m_mac_netp_system_extension_activation_failure"
+            return "netp_system_extension_activation_failure"
 
         case .networkProtectionUnhandledError:
-            return "m_mac_netp_unhandled_error"
+            return "netp_unhandled_error"
         }
     }
 
@@ -308,13 +309,13 @@ enum NetworkProtectionPixelEvent: PixelKitEvent {
         case .networkProtectionClientFailedToFetchRegisteredServers(let error):
             return error?.pixelParameters
 
-        case .networkProtectionClientFailedToRedeemInviteCode(error: let error):
+        case .networkProtectionClientFailedToRedeemInviteCode(let error):
             return error?.pixelParameters
 
-        case .networkProtectionClientFailedToFetchLocations(error: let error):
+        case .networkProtectionClientFailedToFetchLocations(let error):
             return error?.pixelParameters
 
-        case .networkProtectionClientFailedToParseLocationsResponse(error: let error):
+        case .networkProtectionClientFailedToParseLocationsResponse(let error):
             return error?.pixelParameters
 
         case .networkProtectionUnhandledError(let function, let line, let error):
@@ -323,7 +324,7 @@ enum NetworkProtectionPixelEvent: PixelKitEvent {
             parameters[PixelKit.Parameters.line] = String(line)
             return parameters
 
-        case .networkProtectionWireguardErrorCannotSetNetworkSettings(error: let error):
+        case .networkProtectionWireguardErrorCannotSetNetworkSettings(let error):
             return error.pixelParameters
 
         case .networkProtectionWireguardErrorCannotStartWireguardBackend(code: let code):
@@ -379,6 +380,69 @@ enum NetworkProtectionPixelEvent: PixelKitEvent {
             return nil
         }
     }
+
+    var error: (any Error)? {
+        switch self {
+        case .networkProtectionActiveUser,
+                .networkProtectionNewUser,
+                .networkProtectionControllerStartAttempt,
+                .networkProtectionControllerStartSuccess,
+                .networkProtectionTunnelStartAttempt,
+                .networkProtectionTunnelStartSuccess,
+                .networkProtectionTunnelUpdateAttempt,
+                .networkProtectionTunnelUpdateSuccess,
+                .networkProtectionEnableAttemptConnecting,
+                .networkProtectionEnableAttemptSuccess,
+                .networkProtectionEnableAttemptFailure,
+                .networkProtectionTunnelFailureDetected,
+                .networkProtectionTunnelFailureRecovered,
+                .networkProtectionLatencyError,
+                .networkProtectionLatency,
+                .networkProtectionTunnelConfigurationNoServerRegistrationInfo,
+                .networkProtectionTunnelConfigurationCouldNotGetPeerPublicKey,
+                .networkProtectionTunnelConfigurationCouldNotGetPeerHostName,
+                .networkProtectionTunnelConfigurationCouldNotGetInterfaceAddressRange,
+                .networkProtectionClientFailedToParseServerListResponse,
+                .networkProtectionClientFailedToEncodeRegisterKeyRequest,
+                .networkProtectionClientFailedToParseRegisteredServersResponse,
+                .networkProtectionTunnelConfigurationCouldNotSelectClosestServer,
+                .networkProtectionClientFailedToEncodeRedeemRequest,
+                .networkProtectionClientInvalidInviteCode,
+                .networkProtectionClientInvalidAuthToken,
+                .networkProtectionServerListStoreFailedToEncodeServerList,
+                .networkProtectionServerListStoreFailedToDecodeServerList,
+                .networkProtectionKeychainErrorFailedToCastKeychainValueToData,
+                .networkProtectionKeychainReadError,
+                .networkProtectionKeychainWriteError,
+                .networkProtectionKeychainUpdateError,
+                .networkProtectionKeychainDeleteError,
+                .networkProtectionWireguardErrorCannotLocateTunnelFileDescriptor,
+                .networkProtectionWireguardErrorInvalidState,
+                .networkProtectionWireguardErrorFailedDNSResolution,
+                .networkProtectionWireguardErrorCannotStartWireguardBackend,
+                .networkProtectionNoAuthTokenFoundError,
+                .networkProtectionRekeyAttempt,
+                .networkProtectionRekeyCompleted,
+                .networkProtectionSystemExtensionActivationFailure:
+            return nil
+        case .networkProtectionClientFailedToRedeemInviteCode(let error),
+                .networkProtectionClientFailedToFetchLocations(let error),
+                .networkProtectionClientFailedToParseLocationsResponse(let error),
+                .networkProtectionClientFailedToFetchServerList(let error),
+                .networkProtectionClientFailedToFetchRegisteredServers(let error):
+            return error
+        case .networkProtectionControllerStartFailure(let error),
+                .networkProtectionTunnelStartFailure(let error),
+                .networkProtectionTunnelUpdateFailure(let error),
+                .networkProtectionClientFailedToParseRedeemResponse(let error),
+                .networkProtectionServerListStoreFailedToWriteServerList(let error),
+                .networkProtectionServerListStoreFailedToReadServerList(let error),
+                .networkProtectionWireguardErrorCannotSetNetworkSettings(let error),
+                .networkProtectionRekeyFailure(let error),
+                .networkProtectionUnhandledError(_, _, let error):
+            return error
+        }
+    }
 }
 
 #endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift
index b363c3d843..3a42455d0f 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift
@@ -36,10 +36,10 @@ extension EventMapping where Event == NetworkProtectionError {
             domainEvent = .networkProtectionClientInvalidInviteCode
             frequency = .standard
         case .failedToRedeemInviteCode(let error):
-            domainEvent = .networkProtectionClientFailedToRedeemInviteCode(error: error)
+            domainEvent = .networkProtectionClientFailedToRedeemInviteCode(error)
             frequency = .standard
         case .failedToParseRedeemResponse(let error):
-            domainEvent = .networkProtectionClientFailedToParseRedeemResponse(error: error)
+            domainEvent = .networkProtectionClientFailedToParseRedeemResponse(error)
             frequency = .standard
         case .invalidAuthToken:
             domainEvent = .networkProtectionClientInvalidAuthToken
@@ -63,10 +63,10 @@ extension EventMapping where Event == NetworkProtectionError {
             domainEvent = .networkProtectionNoAuthTokenFoundError
             frequency = .standard
         case .failedToFetchLocationList(let error):
-            domainEvent = .networkProtectionClientFailedToFetchLocations(error: error)
+            domainEvent = .networkProtectionClientFailedToFetchLocations(error)
             frequency = .dailyAndContinuous
         case .failedToParseLocationListResponse(let error):
-            domainEvent = .networkProtectionClientFailedToParseLocationsResponse(error: error)
+            domainEvent = .networkProtectionClientFailedToParseLocationsResponse(error)
             frequency = .dailyAndContinuous
         case .noServerRegistrationInfo,
                 .couldNotSelectClosestServer,
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift
index 0ea6d48740..4132457ca2 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift
@@ -519,7 +519,7 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
             }
         } catch {
             PixelKit.fire(
-                NetworkProtectionPixelEvent.networkProtectionControllerStartFailure, frequency: .dailyAndContinuous, withError: error, includeAppVersionParameter: true
+                NetworkProtectionPixelEvent.networkProtectionControllerStartFailure(error), frequency: .dailyAndContinuous, includeAppVersionParameter: true
             )
 
             await stop()
diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
index d7d6de4627..da8d81fc24 100644
--- a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
+++ b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
@@ -59,13 +59,13 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .couldNotGetInterfaceAddressRange:
                 domainEvent = .networkProtectionTunnelConfigurationCouldNotGetInterfaceAddressRange
             case .failedToFetchServerList(let eventError):
-                domainEvent = .networkProtectionClientFailedToFetchServerList(error: eventError)
+                domainEvent = .networkProtectionClientFailedToFetchServerList(eventError)
             case .failedToParseServerListResponse:
                 domainEvent = .networkProtectionClientFailedToParseServerListResponse
             case .failedToEncodeRegisterKeyRequest:
                 domainEvent = .networkProtectionClientFailedToEncodeRegisterKeyRequest
             case .failedToFetchRegisteredServers(let eventError):
-                domainEvent = .networkProtectionClientFailedToFetchRegisteredServers(error: eventError)
+                domainEvent = .networkProtectionClientFailedToFetchRegisteredServers(eventError)
             case .failedToParseRegisteredServersResponse:
                 domainEvent = .networkProtectionClientFailedToParseRegisteredServersResponse
             case .failedToEncodeRedeemRequest:
@@ -73,9 +73,9 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .invalidInviteCode:
                 domainEvent = .networkProtectionClientInvalidInviteCode
             case .failedToRedeemInviteCode(let error):
-                domainEvent = .networkProtectionClientFailedToRedeemInviteCode(error: error)
+                domainEvent = .networkProtectionClientFailedToRedeemInviteCode(error)
             case .failedToParseRedeemResponse(let error):
-                domainEvent = .networkProtectionClientFailedToParseRedeemResponse(error: error)
+                domainEvent = .networkProtectionClientFailedToParseRedeemResponse(error)
             case .invalidAuthToken:
                 domainEvent = .networkProtectionClientInvalidAuthToken
             case .serverListInconsistency:
@@ -85,13 +85,13 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .failedToDecodeServerList:
                 domainEvent = .networkProtectionServerListStoreFailedToDecodeServerList
             case .failedToWriteServerList(let eventError):
-                domainEvent = .networkProtectionServerListStoreFailedToWriteServerList(error: eventError)
+                domainEvent = .networkProtectionServerListStoreFailedToWriteServerList(eventError)
             case .noServerListFound:
                 return
             case .couldNotCreateServerListDirectory:
                 return
             case .failedToReadServerList(let eventError):
-                domainEvent = .networkProtectionServerListStoreFailedToReadServerList(error: eventError)
+                domainEvent = .networkProtectionServerListStoreFailedToReadServerList(eventError)
             case .failedToCastKeychainValueToData(let field):
                 domainEvent = .networkProtectionKeychainErrorFailedToCastKeychainValueToData(field: field)
             case .keychainReadError(let field, let status):
@@ -109,7 +109,7 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .wireGuardDnsResolution:
                 domainEvent = .networkProtectionWireguardErrorFailedDNSResolution
             case .wireGuardSetNetworkSettings(let error):
-                domainEvent = .networkProtectionWireguardErrorCannotSetNetworkSettings(error: error)
+                domainEvent = .networkProtectionWireguardErrorCannotSetNetworkSettings(error)
             case .startWireGuardBackend(let code):
                 domainEvent = .networkProtectionWireguardErrorCannotStartWireguardBackend(code: code)
             case .noAuthTokenFound:
@@ -206,9 +206,8 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
                     includeAppVersionParameter: true)
             case .failure(let error):
                 PixelKit.fire(
-                    NetworkProtectionPixelEvent.networkProtectionRekeyFailure,
+                    NetworkProtectionPixelEvent.networkProtectionRekeyFailure(error),
                     frequency: .dailyAndContinuous,
-                    withError: error,
                     includeAppVersionParameter: true)
             case .success:
                 PixelKit.fire(
@@ -225,9 +224,8 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
                     includeAppVersionParameter: true)
             case .failure(let error):
                 PixelKit.fire(
-                    NetworkProtectionPixelEvent.networkProtectionTunnelStartFailure,
+                    NetworkProtectionPixelEvent.networkProtectionTunnelStartFailure(error),
                     frequency: .dailyAndContinuous,
-                    withError: error,
                     includeAppVersionParameter: true)
             case .success:
                 PixelKit.fire(
@@ -244,9 +242,8 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
                     includeAppVersionParameter: true)
             case .failure(let error):
                 PixelKit.fire(
-                    NetworkProtectionPixelEvent.networkProtectionTunnelUpdateFailure,
+                    NetworkProtectionPixelEvent.networkProtectionTunnelUpdateFailure(error),
                     frequency: .dailyAndContinuous,
-                    withError: error,
                     includeAppVersionParameter: true)
             case .success:
                 PixelKit.fire(
diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
index d428da60b2..20e8b1f4b2 100644
--- 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: "125.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "125.0.1"),
         .package(path: "../PixelKit"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
index 39f13d9fe0..baddd89369 100644
--- a/LocalPackages/NetworkProtectionMac/Package.swift
+++ b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -31,7 +31,7 @@ let package = Package(
         .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "125.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "125.0.1"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../LoginItems"),
diff --git a/LocalPackages/PixelKit/Sources/PixelKit/PixelKit+Parameters.swift b/LocalPackages/PixelKit/Sources/PixelKit/PixelKit+Parameters.swift
index ea08352d29..e368d38db5 100644
--- a/LocalPackages/PixelKit/Sources/PixelKit/PixelKit+Parameters.swift
+++ b/LocalPackages/PixelKit/Sources/PixelKit/PixelKit+Parameters.swift
@@ -20,7 +20,7 @@ import Foundation
 
 public extension PixelKit {
 
-    enum Parameters {
+    enum Parameters: Hashable {
         public static let duration = "duration"
         public static let test = "test"
         public static let appVersion = "appVersion"
diff --git a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/PixelFireExpectations.swift b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/PixelFireExpectations.swift
index 067eee091e..db56d6664b 100644
--- a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/PixelFireExpectations.swift
+++ b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/PixelFireExpectations.swift
@@ -17,6 +17,7 @@
 //
 
 import Foundation
+import PixelKit
 
 /// Structure containing information about a pixel fire event.
 ///
@@ -27,10 +28,35 @@ public struct PixelFireExpectations {
     let pixelName: String
     var error: Error?
     var underlyingError: Error?
+    var customFields: [String: String]?
 
-    public init(pixelName: String, error: Error? = nil, underlyingError: Error? = nil) {
+    /// Convenience initializer for cleaner semantics
+    ///
+    public static func expect(pixelName: String, error: Error? = nil, underlyingError: Error? = nil, customFields: [String: String]? = nil) -> PixelFireExpectations {
+
+        .init(pixelName: pixelName, error: error, underlyingError: underlyingError, customFields: customFields)
+    }
+
+    public init(pixelName: String, error: Error? = nil, underlyingError: Error? = nil, customFields: [String: String]? = nil) {
         self.pixelName = pixelName
         self.error = error
         self.underlyingError = underlyingError
+        self.customFields = customFields
+    }
+
+    public var parameters: [String: String] {
+        var parameters = customFields ?? [String: String]()
+
+        if let nsError = error as? NSError {
+            parameters[PixelKit.Parameters.errorCode] = String(nsError.code)
+            parameters[PixelKit.Parameters.errorDomain] = nsError.domain
+        }
+
+        if let nsUnderlyingError = underlyingError as? NSError {
+            parameters[PixelKit.Parameters.underlyingErrorCode] = String(nsUnderlyingError.code)
+            parameters[PixelKit.Parameters.underlyingErrorDomain] = nsUnderlyingError.domain
+        }
+
+        return parameters
     }
 }
diff --git a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/XCTestCase+PixelKit.swift b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/XCTestCase+PixelKit.swift
index 325b7414b3..6d742bd532 100644
--- a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/XCTestCase+PixelKit.swift
+++ b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/XCTestCase+PixelKit.swift
@@ -66,7 +66,13 @@ public extension XCTestCase {
 #endif
     }
 
-    func expectedParameters(for event: PixelKitEventV2) -> [String: String] {
+    /// These parameters are known to be expected just based on the event definition.
+    ///
+    /// They're not a complete list of parameters for the event, as the fire call may contain extra information
+    /// that results in additional parameters.  Ideally we want most (if not all) that information to eventually
+    /// make part of the pixel definition.
+    ///
+    func knownExpectedParameters(for event: PixelKitEventV2) -> [String: String] {
         var expectedParameters = [String: String]()
 
         if let error = event.error {
@@ -74,10 +80,9 @@ public extension XCTestCase {
             expectedParameters[PixelKit.Parameters.errorCode] = "\(nsError.code)"
             expectedParameters[PixelKit.Parameters.errorDomain] = nsError.domain
 
-            if let underlyingError = (error as? PixelKitEventErrorDetails)?.underlyingError {
-                let underlyingNSError = underlyingError as NSError
-                expectedParameters[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingNSError.code)"
-                expectedParameters[PixelKit.Parameters.underlyingErrorDomain] = underlyingNSError.domain
+            if let underlyingError = nsError.userInfo[NSUnderlyingErrorKey] as? NSError {
+                expectedParameters[PixelKit.Parameters.underlyingErrorCode] = "\(underlyingError.code)"
+                expectedParameters[PixelKit.Parameters.underlyingErrorDomain] = underlyingError.domain
             }
         }
 
@@ -92,14 +97,18 @@ public extension XCTestCase {
 
     // MARK: - Pixel Firing Expectations
 
+    func fire(_ event: PixelKitEventV2, and expectations: PixelFireExpectations, file: StaticString, line: UInt) {
+        verifyThat(event, meets: expectations, file: file, line: line)
+    }
+
     /// Provides some snapshot of a fired pixel so that external libraries can validate all the expected info is included.
     ///
     /// This method also checks that there is internal consistency in the expected fields.
     ///
     func verifyThat(_ event: PixelKitEventV2, meets expectations: PixelFireExpectations, file: StaticString, line: UInt) {
 
-        let expectedPixelName = Self.pixelPlatformPrefix + event.name
-        let expectedParameters = expectedParameters(for: event)
+        let expectedPixelName = event.name.hasPrefix(Self.pixelPlatformPrefix) ? event.name : Self.pixelPlatformPrefix + event.name
+        let knownExpectedParameters = knownExpectedParameters(for: event)
         let callbackExecutedExpectation = expectation(description: "The PixelKit callback has been executed")
 
         PixelKit.setUp(dryRun: false,
@@ -115,23 +124,14 @@ public extension XCTestCase {
             // Internal validations
 
             XCTAssertEqual(firedPixelName, expectedPixelName, file: file, line: line)
-            XCTAssertEqual(firedParameters, expectedParameters, file: file, line: line)
 
-            // Expectations
+            XCTAssertTrue(knownExpectedParameters.allSatisfy { (key, value) in
+                firedParameters[key] == value
+            })
 
+            // Expectations
             XCTAssertEqual(firedPixelName, expectations.pixelName)
-
-            if let error = expectations.error {
-                let nsError = error as NSError
-                XCTAssertEqual(firedParameters[PixelKit.Parameters.errorCode], String(nsError.code), file: file, line: line)
-                XCTAssertEqual(firedParameters[PixelKit.Parameters.errorDomain], nsError.domain, file: file, line: line)
-            }
-
-            if let underlyingError = expectations.underlyingError {
-                let nsError = underlyingError as NSError
-                XCTAssertEqual(firedParameters[PixelKit.Parameters.underlyingErrorCode], String(nsError.code), file: file, line: line)
-                XCTAssertEqual(firedParameters[PixelKit.Parameters.underlyingErrorDomain], nsError.domain, file: file, line: line)
-            }
+            XCTAssertEqual(firedParameters, expectations.parameters)
 
             completion(true, nil)
         }
diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
index 6ffb49191b..ef458f05c7 100644
--- 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: "125.0.0"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "125.0.1"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [
diff --git a/UnitTests/NetworkProtection/NetworkProtectionPixelEventTests.swift b/UnitTests/NetworkProtection/NetworkProtectionPixelEventTests.swift
new file mode 100644
index 0000000000..01a2cc72b1
--- /dev/null
+++ b/UnitTests/NetworkProtection/NetworkProtectionPixelEventTests.swift
@@ -0,0 +1,345 @@
+//
+//  NetworkProtectionPixelEventTests.swift
+//
+//  Copyright © 2024 DuckDuckGo. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#if NETWORK_PROTECTION
+
+import NetworkProtection
+import PixelKit
+import PixelKitTestingUtilities
+import XCTest
+@testable import DuckDuckGo_Privacy_Browser
+
+final class NetworkProtectionPixelEventTests: XCTestCase {
+
+    private enum TestError: CustomNSError {
+        case testError
+        case underlyingError
+
+        /// The domain of the error.
+        static var errorDomain: String {
+            "testDomain"
+        }
+
+        /// The error code within the given domain.
+        var errorCode: Int {
+            switch self {
+            case .testError: return 1
+            case .underlyingError: return 2
+            }
+        }
+
+        /// The user-info dictionary.
+        var errorUserInfo: [String: Any] {
+            switch self {
+            case .testError:
+                return [NSUnderlyingErrorKey: TestError.underlyingError]
+            case .underlyingError:
+                return [:]
+            }
+        }
+    }
+
+    // MARK: - Test Firing Pixels
+
+    /// This test verifies validates expectations when firing `NetworkProtectionPixelEvent`.
+    ///
+    /// This test verifies a few different things:
+    ///  - That the pixel name is not changed by mistake.
+    ///  - That when the pixel is fired its name and parameters are exactly what's expected.
+    ///
+    func testVPNPixelFireExpectations() {
+        fire(NetworkProtectionPixelEvent.networkProtectionActiveUser,
+             and: .expect(pixelName: "m_mac_netp_daily_active"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionNewUser,
+             and: .expect(pixelName: "m_mac_netp_daily_active_u"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionControllerStartAttempt,
+             and: .expect(pixelName: "m_mac_netp_controller_start_attempt"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionControllerStartFailure(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_controller_start_failure",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionControllerStartSuccess,
+             and: .expect(pixelName: "m_mac_netp_controller_start_success"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelStartAttempt,
+             and: .expect(pixelName: "m_mac_netp_tunnel_start_attempt"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelStartFailure(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_tunnel_start_failure",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelStartSuccess,
+             and: .expect(pixelName: "m_mac_netp_tunnel_start_success"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelUpdateAttempt,
+             and: .expect(pixelName: "m_mac_netp_tunnel_update_attempt"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelUpdateFailure(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_tunnel_update_failure",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelUpdateSuccess,
+             and: .expect(pixelName: "m_mac_netp_tunnel_update_success"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionEnableAttemptConnecting,
+             and: .expect(pixelName: "m_mac_netp_ev_enable_attempt"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionEnableAttemptSuccess,
+             and: .expect(pixelName: "m_mac_netp_ev_enable_attempt_success"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionEnableAttemptFailure,
+             and: .expect(pixelName: "m_mac_netp_ev_enable_attempt_failure"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelFailureDetected,
+             and: .expect(pixelName: "m_mac_netp_ev_tunnel_failure"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelFailureRecovered,
+             and: .expect(pixelName: "m_mac_netp_ev_tunnel_failure_recovered"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionLatency(quality: .excellent),
+             and: .expect(pixelName: "m_mac_netp_ev_\(NetworkProtectionLatencyMonitor.ConnectionQuality.excellent.rawValue)_latency"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionLatencyError,
+             and: .expect(pixelName: "m_mac_netp_ev_latency_error"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationNoServerRegistrationInfo,
+             and: .expect(pixelName: "m_mac_netp_tunnel_config_error_no_server_registration_info"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationCouldNotSelectClosestServer,
+             and: .expect(pixelName: "m_mac_netp_tunnel_config_error_could_not_select_closest_server"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationCouldNotGetPeerPublicKey,
+             and: .expect(pixelName: "m_mac_netp_tunnel_config_error_could_not_get_peer_public_key"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationCouldNotGetPeerHostName,
+             and: .expect(pixelName: "m_mac_netp_tunnel_config_error_could_not_get_peer_host_name"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationCouldNotGetInterfaceAddressRange,
+             and: .expect(pixelName: "m_mac_netp_tunnel_config_error_could_not_get_interface_address_range"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToFetchServerList(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_failed_to_fetch_server_list",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToParseServerListResponse,
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_parsing_server_list_response_failed"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToEncodeRegisterKeyRequest,
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_encoding_register_request_body_failed"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToFetchRegisteredServers(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_failed_to_fetch_registered_servers",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToParseRegisteredServersResponse,
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_parsing_device_registration_response_failed"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToEncodeRedeemRequest,
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_encoding_redeem_request_body_failed"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientInvalidInviteCode,
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_invalid_invite_code"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToRedeemInviteCode(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_failed_to_redeem_invite_code",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToParseRedeemResponse(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_parsing_redeem_response_failed",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToFetchLocations(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_failed_to_fetch_location_list",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToParseLocationsResponse(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_parsing_location_list_response_failed",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionClientInvalidAuthToken,
+             and: .expect(pixelName: "m_mac_netp_backend_api_error_invalid_auth_token"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionServerListStoreFailedToEncodeServerList,
+             and: .expect(pixelName: "m_mac_netp_storage_error_failed_to_encode_server_list"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionServerListStoreFailedToDecodeServerList,
+             and: .expect(pixelName: "m_mac_netp_storage_error_failed_to_decode_server_list"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionServerListStoreFailedToWriteServerList(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_storage_error_server_list_file_system_write_failed",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionServerListStoreFailedToReadServerList(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_storage_error_server_list_file_system_read_failed",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionKeychainErrorFailedToCastKeychainValueToData(field: "field"),
+             and: .expect(pixelName: "m_mac_netp_keychain_error_failed_to_cast_keychain_value_to_data",
+                          customFields: [
+                            PixelKit.Parameters.keychainFieldName: "field",
+                          ]),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionKeychainReadError(field: "field", status: 1),
+             and: .expect(pixelName: "m_mac_netp_keychain_error_read_failed",
+                          customFields: [
+                            PixelKit.Parameters.keychainFieldName: "field",
+                            PixelKit.Parameters.errorCode: "1",
+                          ]),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionKeychainWriteError(field: "field", status: 1),
+             and: .expect(pixelName: "m_mac_netp_keychain_error_write_failed",
+                          customFields: [
+                            PixelKit.Parameters.keychainFieldName: "field",
+                            PixelKit.Parameters.errorCode: "1",
+                          ]),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionKeychainUpdateError(field: "field", status: 1),
+             and: .expect(pixelName: "m_mac_netp_keychain_error_update_failed",
+                          customFields: [
+                            PixelKit.Parameters.keychainFieldName: "field",
+                            PixelKit.Parameters.errorCode: "1",
+                          ]),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionKeychainDeleteError(status: 1),
+             and: .expect(pixelName: "m_mac_netp_keychain_error_delete_failed",
+                          customFields: [
+                            PixelKit.Parameters.errorCode: "1"
+                          ]),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorCannotLocateTunnelFileDescriptor,
+             and: .expect(pixelName: "m_mac_netp_wireguard_error_cannot_locate_tunnel_file_descriptor"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorInvalidState(reason: "reason"),
+             and: .expect(pixelName: "m_mac_netp_wireguard_error_invalid_state",
+                          customFields: [
+                            PixelKit.Parameters.reason: "reason"
+                          ]),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorFailedDNSResolution,
+             and: .expect(pixelName: "m_mac_netp_wireguard_error_failed_dns_resolution"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorCannotSetNetworkSettings(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_wireguard_error_cannot_set_network_settings",
+                                 error: TestError.testError,
+                                 underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorCannotStartWireguardBackend(code: 1),
+             and: .expect(pixelName: "m_mac_netp_wireguard_error_cannot_start_wireguard_backend",
+                          customFields: [
+                            PixelKit.Parameters.errorCode: "1"
+                          ]),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionNoAuthTokenFoundError,
+             and: .expect(pixelName: "m_mac_netp_no_auth_token_found_error"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionRekeyAttempt,
+             and: .expect(pixelName: "m_mac_netp_rekey_attempt"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionRekeyCompleted,
+             and: .expect(pixelName: "m_mac_netp_rekey_completed"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionRekeyFailure(TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_rekey_failure",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionSystemExtensionActivationFailure,
+             and: .expect(pixelName: "m_mac_netp_system_extension_activation_failure"),
+             file: #filePath,
+             line: #line)
+        fire(NetworkProtectionPixelEvent.networkProtectionUnhandledError(function: "function", line: 1, error: TestError.testError),
+             and: .expect(pixelName: "m_mac_netp_unhandled_error",
+                          error: TestError.testError,
+                          underlyingError: TestError.underlyingError,
+                          customFields: [
+                            PixelKit.Parameters.function: "function",
+                            PixelKit.Parameters.line: "1",
+                          ]),
+             file: #filePath,
+             line: #line)
+    }
+}
+
+#endif

From db0c6e63f0ef4f8234cbc81d7b341e88f335c709 Mon Sep 17 00:00:00 2001
From: Sam Symons <sam@samsymons.com>
Date: Sun, 17 Mar 2024 18:44:31 -0700
Subject: [PATCH 30/30] Update wireguard-apple to 1.1.3 (#2428)

Task/Issue URL:
https://app.asana.com/0/414235014887631/1206848206360819/f
Tech Design URL:
CC:

**Description**:

Client PR for https://github.com/duckduckgo/BrowserServicesKit/pull/729.

**Steps to test this PR**:
1. Check that the app builds and NetP works

<!--
Tagging instructions
If this PR isn't ready to be merged for whatever reason it should be
marked with the `DO NOT MERGE` label (particularly if it's a draft)
If it's pending Product Review/PFR, please add the `Pending Product
Review` label.

If at any point it isn't actively being worked on/ready for
review/otherwise moving forward (besides the above PR/PFR exception)
strongly consider closing it (or not opening it in the first place). If
you decide not to close it, make sure it's labelled to make it clear the
PRs state and comment with more information.
-->

---
###### Internal references:
[Pull Request Review
Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f)
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
[Pull Request
Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)
---
 DuckDuckGo.xcodeproj/project.pbxproj                   |  2 +-
 .../xcshareddata/swiftpm/Package.resolved              | 10 +++++-----
 LocalPackages/DataBrokerProtection/Package.swift       |  2 +-
 LocalPackages/NetworkProtectionMac/Package.swift       |  2 +-
 LocalPackages/SubscriptionUI/Package.swift             |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index 9f4d19a784..7cb377c93b 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -13755,7 +13755,7 @@
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 125.0.1;
+				version = 125.0.2;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 23b4cce189..329893ae73 100644
--- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "eced8f93c945ff2fa4ff92bdd619514d4eff7131",
-        "version" : "125.0.1"
+        "revision" : "810bf41347ff437b5d0154405a238553537240a4",
+        "version" : "125.0.2"
       }
     },
     {
@@ -165,7 +165,7 @@
     {
       "identity" : "trackerradarkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/duckduckgo/TrackerRadarKit",
+      "location" : "https://github.com/duckduckgo/TrackerRadarKit.git",
       "state" : {
         "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff",
         "version" : "1.2.2"
@@ -176,8 +176,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/wireguard-apple",
       "state" : {
-        "revision" : "2d8172c11478ab11b0f5ad49bdb4f93f4b3d5e0d",
-        "version" : "1.1.1"
+        "revision" : "13fd026384b1af11048451061cc1b21434990668",
+        "version" : "1.1.3"
       }
     }
   ],
diff --git a/LocalPackages/DataBrokerProtection/Package.swift b/LocalPackages/DataBrokerProtection/Package.swift
index 20e8b1f4b2..8e19bc15eb 100644
--- 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: "125.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "125.0.2"),
         .package(path: "../PixelKit"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../XPCHelper"),
diff --git a/LocalPackages/NetworkProtectionMac/Package.swift b/LocalPackages/NetworkProtectionMac/Package.swift
index baddd89369..9d711dfba5 100644
--- a/LocalPackages/NetworkProtectionMac/Package.swift
+++ b/LocalPackages/NetworkProtectionMac/Package.swift
@@ -31,7 +31,7 @@ let package = Package(
         .library(name: "NetworkProtectionUI", targets: ["NetworkProtectionUI"])
     ],
     dependencies: [
-        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "125.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "125.0.2"),
         .package(path: "../XPCHelper"),
         .package(path: "../SwiftUIExtensions"),
         .package(path: "../LoginItems"),
diff --git a/LocalPackages/SubscriptionUI/Package.swift b/LocalPackages/SubscriptionUI/Package.swift
index ef458f05c7..cfe19e07ac 100644
--- 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: "125.0.1"),
+        .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "125.0.2"),
         .package(path: "../SwiftUIExtensions")
     ],
     targets: [