From d71c725201ae0ca5c1b539c52c70667a04ddc0c6 Mon Sep 17 00:00:00 2001
From: Sam Symons <sam@samsymons.com>
Date: Mon, 4 Nov 2024 18:44:26 -0800
Subject: [PATCH 1/2] Update pixel type.

---
 DuckDuckGo.xcodeproj/project.pbxproj          |  4 +-
 .../DataBrokerProtectionPixelsHandler.swift   |  6 +-
 DuckDuckGo/LoginItems/LoginItemsManager.swift |  2 +-
 .../EventMapping+NetworkProtectionError.swift |  4 +-
 .../NetworkProtectionTunnelController.swift   |  8 +-
 .../VPNLocation/VPNLocationViewModel.swift    |  6 +-
 ...NetworkProtectionIPCTunnelController.swift |  8 +-
 .../MacPacketTunnelProvider.swift             | 66 ++++++-------
 .../View/PreferencesRootView.swift            |  4 +-
 .../Preferences/View/PreferencesVPNView.swift |  6 +-
 .../SmarterEncryption/PrivacyFeatures.swift   |  4 +-
 ...riptionManager+StandardConfiguration.swift |  2 +-
 DuckDuckGo/Sync/SyncDiagnosisHelper.swift     |  2 +-
 ...workProtectionControllerTabExtension.swift |  2 +-
 .../SubscriptionAppStoreRestorer.swift        |  6 +-
 .../SubscriptionErrorReporter.swift           |  8 +-
 ...scriptionPagesUseSubscriptionFeature.swift | 14 +--
 .../UnifiedFeedbackSender.swift               |  6 +-
 DuckDuckGo/Waitlist/VPNUninstaller.swift      |  8 +-
 DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift  |  2 +-
 DuckDuckGoVPN/VPNUninstaller.swift            | 10 +-
 .../Pixels/DataBrokerProtectionPixels.swift   |  6 +-
 ...ansparentProxyControllerEventHandler.swift |  2 +-
 ...TransparentProxyProviderEventHandler.swift |  2 +-
 .../NetworkProtectionPixelEventTests.swift    | 94 +++++++++----------
 25 files changed, 141 insertions(+), 141 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index 731efbd4e7..12b86cd672 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -14833,8 +14833,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/duckduckgo/BareBonesBrowser.git";
 			requirement = {
-				kind = exactVersion;
-				version = 0.1.0;
+				branch = "sam/migrate-daily-and-count-type-to-legacy-status";
+				kind = branch;
 			};
 		};
 		FAE06B199CA1F209B55B34E9 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */ = {
diff --git a/DuckDuckGo/DBP/DataBrokerProtectionPixelsHandler.swift b/DuckDuckGo/DBP/DataBrokerProtectionPixelsHandler.swift
index cc4c928d89..223a57ee63 100644
--- a/DuckDuckGo/DBP/DataBrokerProtectionPixelsHandler.swift
+++ b/DuckDuckGo/DBP/DataBrokerProtectionPixelsHandler.swift
@@ -40,7 +40,7 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .ipcServerImmediateScansFinishedWithError(error: let error),
                     .ipcServerAppLaunchedXPCError(error: let error),
                     .ipcServerAppLaunchedScheduledScansFinishedWithError(error: let error):
-                PixelKit.fire(DebugEvent(event, error: error), frequency: .dailyAndCount, includeAppVersionParameter: true)
+                PixelKit.fire(DebugEvent(event, error: error), frequency: .legacyDailyAndCount, includeAppVersionParameter: true)
             case .ipcServerProfileSavedCalledByApp,
                     .ipcServerProfileSavedReceivedByAgent,
                     .ipcServerImmediateScansInterrupted,
@@ -50,7 +50,7 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .ipcServerAppLaunchedScheduledScansBlocked,
                     .ipcServerAppLaunchedScheduledScansInterrupted,
                     .ipcServerAppLaunchedScheduledScansFinishedWithoutError:
-                PixelKit.fire(event, frequency: .dailyAndCount, includeAppVersionParameter: true)
+                PixelKit.fire(event, frequency: .legacyDailyAndCount, includeAppVersionParameter: true)
             case .parentChildMatches,
                     .optOutStart,
                     .optOutEmailGenerate,
@@ -122,7 +122,7 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .entitlementCheckValid,
                     .entitlementCheckInvalid,
                     .entitlementCheckError:
-                PixelKit.fire(event, frequency: .dailyAndCount)
+                PixelKit.fire(event, frequency: .legacyDailyAndCount)
             }
         }
     }
diff --git a/DuckDuckGo/LoginItems/LoginItemsManager.swift b/DuckDuckGo/LoginItems/LoginItemsManager.swift
index 98688c4da2..38bd1427df 100644
--- a/DuckDuckGo/LoginItems/LoginItemsManager.swift
+++ b/DuckDuckGo/LoginItems/LoginItemsManager.swift
@@ -95,7 +95,7 @@ final class LoginItemsManager: LoginItemsManaging {
                                                       action: "enable",
                                                       buildType: AppVersion.shared.buildType,
                                                       osVersion: AppVersion.shared.osVersion)
-        PixelKit.fire(DebugEvent(event, error: error), frequency: .dailyAndCount)
+        PixelKit.fire(DebugEvent(event, error: error), frequency: .legacyDailyAndCount)
         Logger.networkProtection.error("Could not enable \(item.debugDescription, privacy: .public): \(error.debugDescription, privacy: .public)")
     }
 
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift
index 93107416d4..02d7e1c0f1 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/EventMapping+NetworkProtectionError.swift
@@ -62,10 +62,10 @@ extension EventMapping where Event == NetworkProtectionError {
             frequency = .standard
         case .failedToFetchLocationList(let error):
             domainEvent = .networkProtectionClientFailedToFetchLocations(error)
-            frequency = .dailyAndCount
+            frequency = .legacyDailyAndCount
         case .failedToParseLocationListResponse(let error):
             domainEvent = .networkProtectionClientFailedToParseLocationsResponse(error)
-            frequency = .dailyAndCount
+            frequency = .legacyDailyAndCount
         case .noServerRegistrationInfo,
                 .couldNotSelectClosestServer,
                 .couldNotGetPeerPublicKey,
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift
index 3a49d0dda0..72d6255c4b 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift
@@ -537,7 +537,7 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
     func start() async {
         VPNOperationErrorRecorder().beginRecordingControllerStart()
         PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionControllerStartAttempt,
-                      frequency: .dailyAndCount)
+                      frequency: .legacyDailyAndCount)
         controllerErrorStore.lastErrorMessage = nil
 
         do {
@@ -580,7 +580,7 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
                 // in the packet tunnel provider side that can be used to debug additional logic.
                 //
                 PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionControllerStartSuccess,
-                              frequency: .dailyAndCount)
+                              frequency: .legacyDailyAndCount)
             }
         } catch {
             VPNOperationErrorRecorder().recordControllerStartFailure(error)
@@ -588,11 +588,11 @@ final class NetworkProtectionTunnelController: TunnelController, TunnelSessionPr
 
             if case StartError.cancelled = error {
                 PixelKit.fire(
-                    NetworkProtectionPixelEvent.networkProtectionControllerStartCancelled, frequency: .dailyAndCount, includeAppVersionParameter: true
+                    NetworkProtectionPixelEvent.networkProtectionControllerStartCancelled, frequency: .legacyDailyAndCount, includeAppVersionParameter: true
                 )
             } else {
                 PixelKit.fire(
-                    NetworkProtectionPixelEvent.networkProtectionControllerStartFailure(error), frequency: .dailyAndCount, includeAppVersionParameter: true
+                    NetworkProtectionPixelEvent.networkProtectionControllerStartFailure(error), frequency: .legacyDailyAndCount, includeAppVersionParameter: true
                 )
             }
 
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationViewModel.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationViewModel.swift
index 3f9f0f86e4..7908ed6474 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationViewModel.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/VPNLocation/VPNLocationViewModel.swift
@@ -74,13 +74,13 @@ final class VPNLocationViewModel: ObservableObject {
     }
 
     func onNearestItemSelection() async {
-        PixelKit.fire(GeneralPixel.networkProtectionGeoswitchingSetNearest, frequency: .dailyAndCount)
+        PixelKit.fire(GeneralPixel.networkProtectionGeoswitchingSetNearest, frequency: .legacyDailyAndCount)
         selectedLocation = .nearest
         await reloadList()
     }
 
     func onCountryItemSelection(id: String, cityId: String? = nil) async {
-        PixelKit.fire(GeneralPixel.networkProtectionGeoswitchingSetCustom, frequency: .dailyAndCount)
+        PixelKit.fire(GeneralPixel.networkProtectionGeoswitchingSetCustom, frequency: .legacyDailyAndCount)
         let city = cityId == VPNCityItemModel.nearest.id ? nil : cityId
         let location = NetworkProtectionSelectedLocation(country: id, city: city)
         selectedLocation = .location(location)
@@ -95,7 +95,7 @@ final class VPNLocationViewModel: ObservableObject {
     private func reloadList() async {
         guard let locations = try? await locationListRepository.fetchLocationList().sortedByName() else { return }
         if locations.isEmpty {
-            PixelKit.fire(GeneralPixel.networkProtectionGeoswitchingNoLocations, frequency: .dailyAndCount)
+            PixelKit.fire(GeneralPixel.networkProtectionGeoswitchingNoLocations, frequency: .legacyDailyAndCount)
         }
         let isNearestSelected = selectedLocation == .nearest
         self.isNearestSelected = isNearestSelected
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
index 4bc5ec17c5..f9febc6a09 100644
--- a/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
+++ b/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
@@ -96,7 +96,7 @@ extension NetworkProtectionIPCTunnelController: TunnelController {
             knownFailureStore.lastKnownFailure = KnownFailure(error)
             errorRecorder.recordIPCStartFailure(error)
             log(error)
-            pixelKit?.fire(StartAttempt.failure(error), frequency: .dailyAndCount)
+            pixelKit?.fire(StartAttempt.failure(error), frequency: .legacyDailyAndCount)
         }
 
         do {
@@ -112,7 +112,7 @@ extension NetworkProtectionIPCTunnelController: TunnelController {
                 if let error {
                     handleFailure(error)
                 } else {
-                    pixelKit?.fire(StartAttempt.success, frequency: .dailyAndCount)
+                    pixelKit?.fire(StartAttempt.success, frequency: .legacyDailyAndCount)
                 }
             }
         } catch {
@@ -126,7 +126,7 @@ extension NetworkProtectionIPCTunnelController: TunnelController {
 
         func handleFailure(_ error: Error) {
             log(error)
-            pixelKit?.fire(StopAttempt.failure(error), frequency: .dailyAndCount)
+            pixelKit?.fire(StopAttempt.failure(error), frequency: .legacyDailyAndCount)
         }
 
         do {
@@ -136,7 +136,7 @@ extension NetworkProtectionIPCTunnelController: TunnelController {
                 if let error {
                     handleFailure(error)
                 } else {
-                    pixelKit?.fire(StopAttempt.success, frequency: .dailyAndCount)
+                    pixelKit?.fire(StopAttempt.success, frequency: .legacyDailyAndCount)
                 }
             }
         } catch {
diff --git a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
index 1b080d38df..e278820877 100644
--- a/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
+++ b/DuckDuckGo/NetworkProtection/NetworkExtensionTargets/NetworkExtensionTargets/MacPacketTunnelProvider.swift
@@ -133,7 +133,7 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
                 return
             }
 
-            PixelKit.fire(domainEvent, frequency: .dailyAndCount, includeAppVersionParameter: true)
+            PixelKit.fire(domainEvent, frequency: .legacyDailyAndCount, includeAppVersionParameter: true)
         }
     }
 
@@ -173,7 +173,7 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
 
                 PixelKit.fire(
                     pixel,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             case .recovered(let duration, let failureCount):
                 let pixel: NetworkProtectionPixelEvent = {
@@ -187,7 +187,7 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
 
                 PixelKit.fire(
                     pixel,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             }
         case .reportConnectionAttempt(attempt: let attempt):
@@ -197,17 +197,17 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .connecting:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionEnableAttemptConnecting,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             case .success:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionEnableAttemptSuccess,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             case .failure:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionEnableAttemptFailure,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             }
         case .reportTunnelFailure(result: let result):
@@ -217,12 +217,12 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .failureDetected:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelFailureDetected,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             case .failureRecovered:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelFailureRecovered,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             case .networkPathChanged:
                 break
@@ -240,7 +240,7 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
                 guard quality != .unknown else { return }
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionLatency(quality: quality),
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             }
         case .rekeyAttempt(let step):
@@ -250,17 +250,17 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .begin:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionRekeyAttempt,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             case .failure(let error):
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionRekeyFailure(error),
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             case .success:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionRekeyCompleted,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             }
         case .tunnelStartAttempt(let step):
@@ -270,17 +270,17 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .begin:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelStartAttempt,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             case .failure(let error):
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelStartFailure(error),
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             case .success:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelStartSuccess,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             }
         case .tunnelStopAttempt(let step):
@@ -295,12 +295,12 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .failure(let error):
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelStopFailure(error),
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             case .success:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelStopSuccess,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             }
         case .tunnelUpdateAttempt(let step):
@@ -310,17 +310,17 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .begin:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelUpdateAttempt,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             case .failure(let error):
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelUpdateFailure(error),
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             case .success:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelUpdateSuccess,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             }
         case .tunnelWakeAttempt(let step):
@@ -330,17 +330,17 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .begin:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelWakeAttempt,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             case .failure(let error):
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelWakeFailure(error),
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             case .success:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionTunnelWakeSuccess,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             }
         case .failureRecoveryAttempt(let step):
@@ -350,25 +350,25 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .started:
                 PixelKit.fire(
                     VPNFailureRecoveryPixel.vpnFailureRecoveryStarted,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true
                 )
             case .completed(.healthy):
                 PixelKit.fire(
                     VPNFailureRecoveryPixel.vpnFailureRecoveryCompletedHealthy,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true
                 )
             case .completed(.unhealthy):
                 PixelKit.fire(
                     VPNFailureRecoveryPixel.vpnFailureRecoveryCompletedUnhealthy,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true
                 )
             case .failed(let error):
                 PixelKit.fire(
                     VPNFailureRecoveryPixel.vpnFailureRecoveryFailed(error),
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true
                 )
             }
@@ -379,17 +379,17 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
             case .begin:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionServerMigrationAttempt,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             case .failure(let error):
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionServerMigrationFailure(error),
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             case .success:
                 PixelKit.fire(
                     NetworkProtectionPixelEvent.networkProtectionServerMigrationSuccess,
-                    frequency: .dailyAndCount,
+                    frequency: .legacyDailyAndCount,
                     includeAppVersionParameter: true)
             }
         case .tunnelStartOnDemandWithoutAccessToken:
@@ -397,12 +397,12 @@ final class MacPacketTunnelProvider: PacketTunnelProvider {
 
             PixelKit.fire(
                 NetworkProtectionPixelEvent.networkProtectionTunnelStartAttemptOnDemandWithoutAccessToken,
-                frequency: .dailyAndCount,
+                frequency: .legacyDailyAndCount,
                 includeAppVersionParameter: true)
         case .malformedErrorDetected(let error):
             PixelKit.fire(
                 NetworkProtectionPixelEvent.networkProtectionMalformedErrorDetected(error),
-                frequency: .dailyAndCount,
+                frequency: .legacyDailyAndCount,
                 includeAppVersionParameter: true)
         }
     }
@@ -670,6 +670,6 @@ extension MacPacketTunnelProvider: AccountManagerKeychainAccessDelegate {
 
     public func accountManagerKeychainAccessFailed(accessType: AccountKeychainAccessType, error: AccountKeychainAccessError) {
         PixelKit.fire(PrivacyProErrorPixel.privacyProKeychainAccessError(accessType: accessType, accessError: error),
-                      frequency: .dailyAndCount)
+                      frequency: .legacyDailyAndCount)
     }
 }
diff --git a/DuckDuckGo/Preferences/View/PreferencesRootView.swift b/DuckDuckGo/Preferences/View/PreferencesRootView.swift
index 2d2f4f6448..195309d2d8 100644
--- a/DuckDuckGo/Preferences/View/PreferencesRootView.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesRootView.swift
@@ -161,11 +161,11 @@ enum Preferences {
                     case .iHaveASubscriptionClick:
                         PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseClick)
                     case .activateAddEmailClick:
-                        PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseEmailStart, frequency: .dailyAndCount)
+                        PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseEmailStart, frequency: .legacyDailyAndCount)
                     case .postSubscriptionAddEmailClick:
                         PixelKit.fire(PrivacyProPixel.privacyProWelcomeAddDevice, frequency: .unique)
                     case .restorePurchaseStoreClick:
-                        PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseStoreStart, frequency: .dailyAndCount)
+                        PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseStoreStart, frequency: .legacyDailyAndCount)
                     case .addDeviceEnterEmail:
                         PixelKit.fire(PrivacyProPixel.privacyProAddDeviceEnterEmail)
                     case .activeSubscriptionSettingsClick:
diff --git a/DuckDuckGo/Preferences/View/PreferencesVPNView.swift b/DuckDuckGo/Preferences/View/PreferencesVPNView.swift
index 7d0c793bc2..02ea780844 100644
--- a/DuckDuckGo/Preferences/View/PreferencesVPNView.swift
+++ b/DuckDuckGo/Preferences/View/PreferencesVPNView.swift
@@ -139,7 +139,7 @@ extension Preferences {
                                 showsCustomDNSServerPageSheet.toggle()
                             } else {
                                 model.resetDNSSettings()
-                                PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionDNSUpdateDefault, frequency: .dailyAndCount)
+                                PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionDNSUpdateDefault, frequency: .legacyDailyAndCount)
                             }
                         }
                         .onChange(of: showsCustomDNSServerPageSheet) { showsCustomDNSServerPageSheet in
@@ -242,9 +242,9 @@ struct CustomDNSServerPageSheet: View {
         /// Updating `dnsSettings` does an IPv4 conversion before actually commiting the change,
         /// so we do a final check to see which outcome the user ends up with
         if settings.dnsSettings.usesCustomDNS {
-            PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionDNSUpdateCustom, frequency: .dailyAndCount)
+            PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionDNSUpdateCustom, frequency: .legacyDailyAndCount)
         } else {
-            PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionDNSUpdateDefault, frequency: .dailyAndCount)
+            PixelKit.fire(NetworkProtectionPixelEvent.networkProtectionDNSUpdateDefault, frequency: .legacyDailyAndCount)
         }
     }
 
diff --git a/DuckDuckGo/SmarterEncryption/PrivacyFeatures.swift b/DuckDuckGo/SmarterEncryption/PrivacyFeatures.swift
index 73fd8c7bf1..fd861aeb2b 100644
--- a/DuckDuckGo/SmarterEncryption/PrivacyFeatures.swift
+++ b/DuckDuckGo/SmarterEncryption/PrivacyFeatures.swift
@@ -66,14 +66,14 @@ final class AppPrivacyFeatures: PrivacyFeaturesProtocol {
 
         if dailyAndCount {
             PixelKit.fire(DebugEvent(domainEvent, error: error),
-                          frequency: .dailyAndCount,
+                          frequency: .legacyDailyAndCount,
                           withAdditionalParameters: parameters,
                           includeAppVersionParameter: true) { _, error in
                 onComplete(error)
             }
         } else {
             PixelKit.fire(DebugEvent(domainEvent, error: error),
-                          frequency: .dailyAndCount,
+                          frequency: .legacyDailyAndCount,
                           withAdditionalParameters: parameters) { _, error in
                 onComplete(error)
             }
diff --git a/DuckDuckGo/Subscription/SubscriptionManager+StandardConfiguration.swift b/DuckDuckGo/Subscription/SubscriptionManager+StandardConfiguration.swift
index c92a66516d..360ddb541e 100644
--- a/DuckDuckGo/Subscription/SubscriptionManager+StandardConfiguration.swift
+++ b/DuckDuckGo/Subscription/SubscriptionManager+StandardConfiguration.swift
@@ -63,6 +63,6 @@ extension DefaultSubscriptionManager: AccountManagerKeychainAccessDelegate {
 
     public func accountManagerKeychainAccessFailed(accessType: AccountKeychainAccessType, error: AccountKeychainAccessError) {
         PixelKit.fire(PrivacyProErrorPixel.privacyProKeychainAccessError(accessType: accessType, accessError: error),
-                      frequency: .dailyAndCount)
+                      frequency: .legacyDailyAndCount)
     }
 }
diff --git a/DuckDuckGo/Sync/SyncDiagnosisHelper.swift b/DuckDuckGo/Sync/SyncDiagnosisHelper.swift
index dcce535fe3..091f5939e3 100644
--- a/DuckDuckGo/Sync/SyncDiagnosisHelper.swift
+++ b/DuckDuckGo/Sync/SyncDiagnosisHelper.swift
@@ -46,7 +46,7 @@ struct SyncDiagnosisHelper {
             // Nil value means sync was never on in the first place. So don't fire in this case.
             if syncManuallyDisabled == false,
                !syncWasDisabledUnexpectedlyPixelFired {
-                PixelKit.fire(DebugEvent(GeneralPixel.syncDebugWasDisabledUnexpectedly), frequency: .dailyAndCount)
+                PixelKit.fire(DebugEvent(GeneralPixel.syncDebugWasDisabledUnexpectedly), frequency: .legacyDailyAndCount)
                 syncWasDisabledUnexpectedlyPixelFired = true
             }
         } else {
diff --git a/DuckDuckGo/Tab/TabExtensions/NetworkProtectionControllerTabExtension.swift b/DuckDuckGo/Tab/TabExtensions/NetworkProtectionControllerTabExtension.swift
index 7f86b0f766..b71ba50678 100644
--- a/DuckDuckGo/Tab/TabExtensions/NetworkProtectionControllerTabExtension.swift
+++ b/DuckDuckGo/Tab/TabExtensions/NetworkProtectionControllerTabExtension.swift
@@ -32,7 +32,7 @@ final class NetworkProtectionControllerTabExtension {
 extension NetworkProtectionControllerTabExtension: NavigationResponder {
     func navigationDidFinish(_ navigation: Navigation) {
         if navigation.url.isDuckDuckGoSearch, tunnelController.isConnected == true {
-            PixelKit.fire(GeneralPixel.networkProtectionEnabledOnSearch, frequency: .dailyAndCount)
+            PixelKit.fire(GeneralPixel.networkProtectionEnabledOnSearch, frequency: .legacyDailyAndCount)
         }
     }
 }
diff --git a/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionAppStoreRestorer.swift b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionAppStoreRestorer.swift
index 12a157cd95..2aa44c3e83 100644
--- a/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionAppStoreRestorer.swift
+++ b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionAppStoreRestorer.swift
@@ -72,12 +72,12 @@ struct DefaultSubscriptionAppStoreRestorer: SubscriptionAppStoreRestorer {
         await uiHandler.dismissProgressViewController()
         switch result {
         case .success:
-            PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseStoreSuccess, frequency: .dailyAndCount)
+            PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseStoreSuccess, frequency: .legacyDailyAndCount)
         case .failure(let error):
             switch error {
             case .missingAccountOrTransactions: break
             default:
-                PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseStoreFailureOther, frequency: .dailyAndCount)
+                PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseStoreFailureOther, frequency: .legacyDailyAndCount)
             }
             switch error {
             case .missingAccountOrTransactions:
@@ -96,7 +96,7 @@ struct DefaultSubscriptionAppStoreRestorer: SubscriptionAppStoreRestorer {
     // MARK: - UI interactions
 
     private func showSomethingWentWrongAlert() async {
-        PixelKit.fire(PrivacyProPixel.privacyProPurchaseFailure, frequency: .dailyAndCount)
+        PixelKit.fire(PrivacyProPixel.privacyProPurchaseFailure, frequency: .legacyDailyAndCount)
         await uiHandler.show(alertType: .somethingWentWrong)
     }
 
diff --git a/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionErrorReporter.swift b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionErrorReporter.swift
index c1d62a8033..ae370e03f4 100644
--- a/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionErrorReporter.swift
+++ b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionErrorReporter.swift
@@ -65,7 +65,7 @@ struct DefaultSubscriptionErrorReporter: SubscriptionErrorReporter {
         case .failedToRestorePastPurchase:
             isStoreError = true
         case .subscriptionNotFound:
-            PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseStoreFailureNotFound, frequency: .dailyAndCount)
+            PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseStoreFailureNotFound, frequency: .legacyDailyAndCount)
             isStoreError = true
         case .subscriptionExpired:
             isStoreError = true
@@ -74,17 +74,17 @@ struct DefaultSubscriptionErrorReporter: SubscriptionErrorReporter {
             isBackendError = true
         case .cancelledByUser: break
         case .accountCreationFailed:
-            PixelKit.fire(PrivacyProPixel.privacyProPurchaseFailureAccountNotCreated, frequency: .dailyAndCount)
+            PixelKit.fire(PrivacyProPixel.privacyProPurchaseFailureAccountNotCreated, frequency: .legacyDailyAndCount)
         case .activeSubscriptionAlreadyPresent: break
         case .generalError: break
         }
 
         if isStoreError {
-            PixelKit.fire(PrivacyProPixel.privacyProPurchaseFailureStoreError, frequency: .dailyAndCount)
+            PixelKit.fire(PrivacyProPixel.privacyProPurchaseFailureStoreError, frequency: .legacyDailyAndCount)
         }
 
         if isBackendError {
-            PixelKit.fire(PrivacyProPixel.privacyProPurchaseFailureBackendError, frequency: .dailyAndCount)
+            PixelKit.fire(PrivacyProPixel.privacyProPurchaseFailureBackendError, frequency: .legacyDailyAndCount)
         }
     }
 }
diff --git a/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionPagesUseSubscriptionFeature.swift b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionPagesUseSubscriptionFeature.swift
index a2d90a4a19..204d9228c5 100644
--- a/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionPagesUseSubscriptionFeature.swift
+++ b/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionPagesUseSubscriptionFeature.swift
@@ -136,7 +136,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
 
     func setSubscription(params: Any, original: WKScriptMessage) async throws -> Encodable? {
 
-        PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseEmailSuccess, frequency: .dailyAndCount)
+        PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseEmailSuccess, frequency: .legacyDailyAndCount)
 
         guard let subscriptionValues: SubscriptionValues = DecodableHelper.decode(from: params) else {
             assertionFailure("SubscriptionPagesUserScript: expected JSON representation of SubscriptionValues")
@@ -189,7 +189,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
     }
 
     func subscriptionSelected(params: Any, original: WKScriptMessage) async throws -> Encodable? {
-        PixelKit.fire(PrivacyProPixel.privacyProPurchaseAttempt, frequency: .dailyAndCount)
+        PixelKit.fire(PrivacyProPixel.privacyProPurchaseAttempt, frequency: .legacyDailyAndCount)
         struct SubscriptionSelection: Decodable {
             let id: String
         }
@@ -273,7 +273,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
                 switch completePurchaseResult {
                 case .success(let purchaseUpdate):
                     Logger.subscription.info("[Purchase] Purchase complete")
-                    PixelKit.fire(PrivacyProPixel.privacyProPurchaseSuccess, frequency: .dailyAndCount)
+                    PixelKit.fire(PrivacyProPixel.privacyProPurchaseSuccess, frequency: .legacyDailyAndCount)
                     sendFreemiumSubscriptionPixelIfFreemiumActivated()
                     saveSubscriptionUpgradeTimestampIfFreemiumActivated()
                     PixelKit.fire(PrivacyProPixel.privacyProSubscriptionActivated, frequency: .unique)
@@ -385,7 +385,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
         await stripePurchaseFlow.completeSubscriptionPurchase()
         await uiHandler.dismissProgressViewController()
 
-        PixelKit.fire(PrivacyProPixel.privacyProPurchaseStripeSuccess, frequency: .dailyAndCount)
+        PixelKit.fire(PrivacyProPixel.privacyProPurchaseStripeSuccess, frequency: .legacyDailyAndCount)
         sendFreemiumSubscriptionPixelIfFreemiumActivated()
         saveSubscriptionUpgradeTimestampIfFreemiumActivated()
         subscriptionSuccessPixelHandler.fireSuccessfulSubscriptionAttributionPixel()
@@ -457,7 +457,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
     // MARK: - UI interactions
 
     func showSomethingWentWrongAlert() async {
-        PixelKit.fire(PrivacyProPixel.privacyProPurchaseFailure, frequency: .dailyAndCount)
+        PixelKit.fire(PrivacyProPixel.privacyProPurchaseFailure, frequency: .legacyDailyAndCount)
         switch await uiHandler.dismissProgressViewAndShow(alertType: .somethingWentWrong, text: nil) {
         case .alertFirstButtonReturn:
             let url = subscriptionManager.url(for: .purchase)
@@ -478,7 +478,7 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
                                                                      authEndpointService: subscriptionManager.authEndpointService)
                 let result = await appStoreRestoreFlow.restoreAccountFromPastPurchase()
                 switch result {
-                case .success: PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseStoreSuccess, frequency: .dailyAndCount)
+                case .success: PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseStoreSuccess, frequency: .legacyDailyAndCount)
                 case .failure: break
                 }
                 Task { @MainActor in
@@ -529,7 +529,7 @@ extension SubscriptionPagesUseSubscriptionFeature: SubscriptionAccessActionHandl
     func subscriptionAccessActionHandleAction(event: SubscriptionAccessActionHandlingEvent) {
         switch event {
         case .activateAddEmailClick:
-            PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseEmailStart, frequency: .dailyAndCount)
+            PixelKit.fire(PrivacyProPixel.privacyProRestorePurchaseEmailStart, frequency: .legacyDailyAndCount)
         default: break
         }
     }
diff --git a/DuckDuckGo/UnifiedFeedbackForm/UnifiedFeedbackSender.swift b/DuckDuckGo/UnifiedFeedbackForm/UnifiedFeedbackSender.swift
index 79f86b8f68..98ba6100bc 100644
--- a/DuckDuckGo/UnifiedFeedbackForm/UnifiedFeedbackSender.swift
+++ b/DuckDuckGo/UnifiedFeedbackForm/UnifiedFeedbackSender.swift
@@ -111,7 +111,7 @@ struct DefaultFeedbackSender: UnifiedFeedbackSender {
     }
 
     func sendFormShowPixel() {
-        PixelKit.fire(GeneralPixel.pproFeedbackFormShow, frequency: .dailyAndCount)
+        PixelKit.fire(GeneralPixel.pproFeedbackFormShow, frequency: .legacyDailyAndCount)
     }
 
     func sendSubmitScreenShowPixel(source: UnifiedFeedbackSource, reportType: String, category: String, subcategory: String) {
@@ -119,7 +119,7 @@ struct DefaultFeedbackSender: UnifiedFeedbackSender {
                                                                 reportType: ReportType.from(reportType),
                                                                 category: Category.from(category),
                                                                 subcategory: Subcategory.from(subcategory)),
-                      frequency: .dailyAndCount)
+                      frequency: .legacyDailyAndCount)
     }
 
     func sendSubmitScreenFAQClickPixel(source: UnifiedFeedbackSource, reportType: String, category: String, subcategory: String) {
@@ -127,6 +127,6 @@ struct DefaultFeedbackSender: UnifiedFeedbackSender {
                                                                     reportType: ReportType.from(reportType),
                                                                     category: Category.from(category),
                                                                     subcategory: Subcategory.from(subcategory)),
-                      frequency: .dailyAndCount)
+                      frequency: .legacyDailyAndCount)
     }
 }
diff --git a/DuckDuckGo/Waitlist/VPNUninstaller.swift b/DuckDuckGo/Waitlist/VPNUninstaller.swift
index d164cf21b3..084f31e106 100644
--- a/DuckDuckGo/Waitlist/VPNUninstaller.swift
+++ b/DuckDuckGo/Waitlist/VPNUninstaller.swift
@@ -176,15 +176,15 @@ final class VPNUninstaller: VPNUninstalling {
             return
         }
 
-        pixelKit?.fire(IPCUninstallAttempt.begin, frequency: .dailyAndCount)
+        pixelKit?.fire(IPCUninstallAttempt.begin, frequency: .legacyDailyAndCount)
 
         do {
             try await executeUninstallSequence(removeSystemExtension: removeSystemExtension)
-            pixelKit?.fire(IPCUninstallAttempt.success, frequency: .dailyAndCount)
+            pixelKit?.fire(IPCUninstallAttempt.success, frequency: .legacyDailyAndCount)
         } catch UninstallError.cancelled(let reason) {
-            pixelKit?.fire(IPCUninstallAttempt.cancelled(reason), frequency: .dailyAndCount)
+            pixelKit?.fire(IPCUninstallAttempt.cancelled(reason), frequency: .legacyDailyAndCount)
         } catch {
-            pixelKit?.fire(IPCUninstallAttempt.failure(error), frequency: .dailyAndCount)
+            pixelKit?.fire(IPCUninstallAttempt.failure(error), frequency: .legacyDailyAndCount)
         }
     }
 
diff --git a/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift b/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift
index 40ecf9650b..b183d84e51 100644
--- a/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift
+++ b/DuckDuckGoVPN/DuckDuckGoVPNAppDelegate.swift
@@ -468,6 +468,6 @@ extension DuckDuckGoVPNAppDelegate: AccountManagerKeychainAccessDelegate {
 
     public func accountManagerKeychainAccessFailed(accessType: AccountKeychainAccessType, error: AccountKeychainAccessError) {
         PixelKit.fire(PrivacyProErrorPixel.privacyProKeychainAccessError(accessType: accessType, accessError: error),
-                      frequency: .dailyAndCount)
+                      frequency: .legacyDailyAndCount)
     }
 }
diff --git a/DuckDuckGoVPN/VPNUninstaller.swift b/DuckDuckGoVPN/VPNUninstaller.swift
index 1ae6a706cb..b6efdda308 100644
--- a/DuckDuckGoVPN/VPNUninstaller.swift
+++ b/DuckDuckGoVPN/VPNUninstaller.swift
@@ -48,7 +48,7 @@ final class VPNUninstaller: VPNUninstalling {
     }
 
     func uninstall(includingSystemExtension: Bool) async throws {
-        pixelKit?.fire(VPNUninstallAttempt.begin, frequency: .dailyAndCount)
+        pixelKit?.fire(VPNUninstallAttempt.begin, frequency: .legacyDailyAndCount)
 
         do {
             try await removeSystemExtension()
@@ -59,15 +59,15 @@ final class VPNUninstaller: VPNUninstalling {
             }
 
             defaults.networkProtectionShouldShowVPNUninstalledMessage = true
-            pixelKit?.fire(VPNUninstallAttempt.success, frequency: .dailyAndCount)
+            pixelKit?.fire(VPNUninstallAttempt.success, frequency: .legacyDailyAndCount)
         } catch {
             switch error {
             case OSSystemExtensionError.requestCanceled:
-                pixelKit?.fire(VPNUninstallAttempt.cancelled(.sysexInstallationCancelled), frequency: .dailyAndCount)
+                pixelKit?.fire(VPNUninstallAttempt.cancelled(.sysexInstallationCancelled), frequency: .legacyDailyAndCount)
             case OSSystemExtensionError.authorizationRequired:
-                pixelKit?.fire(VPNUninstallAttempt.cancelled(.sysexInstallationRequiresAuthorization), frequency: .dailyAndCount)
+                pixelKit?.fire(VPNUninstallAttempt.cancelled(.sysexInstallationRequiresAuthorization), frequency: .legacyDailyAndCount)
             default:
-                pixelKit?.fire(VPNUninstallAttempt.failure(error), frequency: .dailyAndCount)
+                pixelKit?.fire(VPNUninstallAttempt.failure(error), frequency: .legacyDailyAndCount)
             }
 
             throw error
diff --git a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
index f5fdcd9ce4..44f111e928 100644
--- a/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
+++ b/LocalPackages/DataBrokerProtection/Sources/DataBrokerProtection/Pixels/DataBrokerProtectionPixels.swift
@@ -550,7 +550,7 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .ipcServerImmediateScansFinishedWithError(error: let error),
                     .ipcServerAppLaunchedXPCError(error: let error),
                     .ipcServerAppLaunchedScheduledScansFinishedWithError(error: let error):
-                PixelKit.fire(DebugEvent(event, error: error), frequency: .dailyAndCount, includeAppVersionParameter: true)
+                PixelKit.fire(DebugEvent(event, error: error), frequency: .legacyDailyAndCount, includeAppVersionParameter: true)
             case .ipcServerProfileSavedCalledByApp,
                     .ipcServerProfileSavedReceivedByAgent,
                     .ipcServerImmediateScansInterrupted,
@@ -560,7 +560,7 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .ipcServerAppLaunchedScheduledScansBlocked,
                     .ipcServerAppLaunchedScheduledScansInterrupted,
                     .ipcServerAppLaunchedScheduledScansFinishedWithoutError:
-                PixelKit.fire(event, frequency: .dailyAndCount, includeAppVersionParameter: true)
+                PixelKit.fire(event, frequency: .legacyDailyAndCount, includeAppVersionParameter: true)
             case .parentChildMatches,
                     .optOutStart,
                     .optOutEmailGenerate,
@@ -629,7 +629,7 @@ public class DataBrokerProtectionPixelsHandler: EventMapping<DataBrokerProtectio
                     .entitlementCheckValid,
                     .entitlementCheckInvalid,
                     .entitlementCheckError:
-                PixelKit.fire(event, frequency: .dailyAndCount)
+                PixelKit.fire(event, frequency: .legacyDailyAndCount)
 
             }
         }
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Controller/TransparentProxyControllerEventHandler.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Controller/TransparentProxyControllerEventHandler.swift
index dabb490219..b038d21282 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Controller/TransparentProxyControllerEventHandler.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Controller/TransparentProxyControllerEventHandler.swift
@@ -36,7 +36,7 @@ public final class TransparentProxyControllerEventHandler: TransparentProxyContr
     public func handle(event: TransparentProxyController.Event) {
         switch event {
         case .startAttempt(let step):
-            pixelKit?.fire(step, frequency: .dailyAndCount)
+            pixelKit?.fire(step, frequency: .legacyDailyAndCount)
 
             switch step {
             case .prevented(let error):
diff --git a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Provider/TransparentProxyProviderEventHandler.swift b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Provider/TransparentProxyProviderEventHandler.swift
index 293bdddee5..bb49ae2c77 100644
--- a/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Provider/TransparentProxyProviderEventHandler.swift
+++ b/LocalPackages/NetworkProtectionMac/Sources/NetworkProtectionProxy/Provider/TransparentProxyProviderEventHandler.swift
@@ -39,7 +39,7 @@ public final class TransparentProxyProviderEventHandler: TransparentProxyProvide
         // Start and stop
 
         case .startAttempt(let step):
-            pixelKit?.fire(step, frequency: .dailyAndCount)
+            pixelKit?.fire(step, frequency: .legacyDailyAndCount)
 
             switch step {
             case .begin:
diff --git a/UnitTests/NetworkProtection/NetworkProtectionPixelEventTests.swift b/UnitTests/NetworkProtection/NetworkProtectionPixelEventTests.swift
index cd27726b43..fb338f2847 100644
--- a/UnitTests/NetworkProtection/NetworkProtectionPixelEventTests.swift
+++ b/UnitTests/NetworkProtection/NetworkProtectionPixelEventTests.swift
@@ -72,83 +72,83 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionControllerStartAttempt,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_controller_start_attempt"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionControllerStartFailure(TestError.testError),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_controller_start_failure",
                           error: TestError.testError,
                           underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionControllerStartSuccess,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_controller_start_success"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelStartAttempt,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_start_attempt"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelStartFailure(TestError.testError),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_start_failure",
                           error: TestError.testError,
                           underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelStartSuccess,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_start_success"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelUpdateAttempt,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_update_attempt"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelUpdateFailure(TestError.testError),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_update_failure",
                           error: TestError.testError,
                           underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelUpdateSuccess,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_update_success"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionEnableAttemptConnecting,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_ev_enable_attempt"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionEnableAttemptSuccess,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_ev_enable_attempt_success"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionEnableAttemptFailure,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_ev_enable_attempt_failure"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelFailureDetected,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_ev_tunnel_failure"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelFailureRecovered,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_ev_tunnel_failure_recovered"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionLatency(quality: .excellent),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_ev_\(NetworkProtectionLatencyMonitor.ConnectionQuality.excellent.rawValue)_latency"),
              file: #filePath,
              line: #line)
@@ -158,104 +158,104 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationNoServerRegistrationInfo,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_config_error_no_server_registration_info"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationCouldNotSelectClosestServer,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_config_error_could_not_select_closest_server"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationCouldNotGetPeerPublicKey,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_config_error_could_not_get_peer_public_key"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationCouldNotGetPeerHostName,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_config_error_could_not_get_peer_host_name"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionTunnelConfigurationCouldNotGetInterfaceAddressRange,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_tunnel_config_error_could_not_get_interface_address_range"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToFetchServerList(TestError.testError),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_failed_to_fetch_server_list",
                           error: TestError.testError,
                           underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToParseServerListResponse,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_parsing_server_list_response_failed"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToEncodeRegisterKeyRequest,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_encoding_register_request_body_failed"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToFetchRegisteredServers(TestError.testError),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_failed_to_fetch_registered_servers",
                           error: TestError.testError,
                           underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToParseRegisteredServersResponse,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_parsing_device_registration_response_failed"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToEncodeRedeemRequest,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_encoding_redeem_request_body_failed"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientInvalidInviteCode,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_invalid_invite_code"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToRedeemInviteCode(TestError.testError),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_failed_to_redeem_invite_code",
                           error: TestError.testError,
                           underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToParseRedeemResponse(TestError.testError),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_parsing_redeem_response_failed",
                           error: TestError.testError,
                           underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToFetchLocations(TestError.testError),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_failed_to_fetch_location_list",
                           error: TestError.testError,
                           underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientFailedToParseLocationsResponse(TestError.testError),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_parsing_location_list_response_failed",
                           error: TestError.testError,
                           underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionClientInvalidAuthToken,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_backend_api_error_invalid_auth_token"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionKeychainErrorFailedToCastKeychainValueToData(field: "field"),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_keychain_error_failed_to_cast_keychain_value_to_data",
                           customFields: [
                             PixelKit.Parameters.keychainFieldName: "field",
@@ -263,7 +263,7 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionKeychainReadError(field: "field", status: 1),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_keychain_error_read_failed",
                           customFields: [
                             PixelKit.Parameters.keychainFieldName: "field",
@@ -272,7 +272,7 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionKeychainWriteError(field: "field", status: 1),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_keychain_error_write_failed",
                           customFields: [
                             PixelKit.Parameters.keychainFieldName: "field",
@@ -281,7 +281,7 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionKeychainUpdateError(field: "field", status: 1),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_keychain_error_update_failed",
                           customFields: [
                             PixelKit.Parameters.keychainFieldName: "field",
@@ -290,7 +290,7 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionKeychainDeleteError(status: 1),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_keychain_error_delete_failed",
                           customFields: [
                             PixelKit.Parameters.errorCode: "1"
@@ -298,12 +298,12 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorCannotLocateTunnelFileDescriptor,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_wireguard_error_cannot_locate_tunnel_file_descriptor"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorInvalidState(reason: "reason"),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_wireguard_error_invalid_state",
                           customFields: [
                             PixelKit.Parameters.reason: "reason"
@@ -311,26 +311,26 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorFailedDNSResolution,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_wireguard_error_failed_dns_resolution"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorCannotSetNetworkSettings(TestError.testError),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_wireguard_error_cannot_set_network_settings",
                                  error: TestError.testError,
                                  underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorCannotStartWireguardBackend(TestError.testError),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_wireguard_error_cannot_start_wireguard_backend",
                           error: TestError.testError,
                           underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionWireguardErrorCannotSetWireguardConfig(TestError.testError),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_wireguard_error_cannot_set_wireguard_config",
                           error: TestError.testError,
                           underlyingErrors: [TestError.underlyingError]),
@@ -342,24 +342,24 @@ final class NetworkProtectionPixelEventTests: XCTestCase {
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionRekeyAttempt,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_rekey_attempt"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionRekeyCompleted,
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_rekey_completed"),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionRekeyFailure(TestError.testError),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_rekey_failure",
                           error: TestError.testError,
                           underlyingErrors: [TestError.underlyingError]),
              file: #filePath,
              line: #line)
         fire(NetworkProtectionPixelEvent.networkProtectionSystemExtensionActivationFailure(TestError.testError),
-             frequency: .dailyAndCount,
+             frequency: .legacyDailyAndCount,
              and: .expect(pixelName: "m_mac_netp_system_extension_activation_failure",
                           error: TestError.testError,
                           underlyingErrors: [TestError.underlyingError]),

From fe1095772782e7437a0771e0d0d2ac820671eb62 Mon Sep 17 00:00:00 2001
From: Sam Symons <sam@samsymons.com>
Date: Mon, 4 Nov 2024 18:48:06 -0800
Subject: [PATCH 2/2] Fix BSK reference.

---
 DuckDuckGo.xcodeproj/project.pbxproj                      | 8 ++++----
 .../xcshareddata/swiftpm/Package.resolved                 | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
index 12b86cd672..41d8257ac4 100644
--- a/DuckDuckGo.xcodeproj/project.pbxproj
+++ b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -14777,8 +14777,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
-				kind = exactVersion;
-				version = 203.1.0;
+				branch = "sam/migrate-daily-and-count-type-to-legacy-status";
+				kind = branch;
 			};
 		};
 		9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {
@@ -14833,8 +14833,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/duckduckgo/BareBonesBrowser.git";
 			requirement = {
-				branch = "sam/migrate-daily-and-count-type-to-legacy-status";
-				kind = branch;
+				kind = exactVersion;
+				version = 0.1.0;
 			};
 		};
 		FAE06B199CA1F209B55B34E9 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */ = {
diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 6c7c3d5617..153c80b9eb 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" : "19f1e5c945aa92562ad2d087e8d6c99801edf656",
-        "version" : "203.1.0"
+        "branch" : "sam/migrate-daily-and-count-type-to-legacy-status",
+        "revision" : "1915671f92f95f7e06870852787d96da9809a93c"
       }
     },
     {