Removed the VPN waitlist beta pixels (#2555)

diegoreymendez · web-flow · commit cf906c6590e4 · 2024-04-08T10:55:45.000+02:00
Task/Issue URL: https://app.asana.com/0/0/1207008939337649/f iOS PR: ## Description Removes all VPN waitlist beta pixels.
diff --git a/DuckDuckGo/Application/AppDelegate.swift b/DuckDuckGo/Application/AppDelegate.swift
@@ -586,7 +586,6 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
 #if NETWORK_PROTECTION
             if response.notification.request.identifier == NetworkProtectionWaitlist.notificationIdentifier {
                 if NetworkProtectionWaitlist().readyToAcceptTermsAndConditions {
-                    DailyPixel.fire(pixel: .networkProtectionWaitlistNotificationTapped, frequency: .dailyAndCount)
                     NetworkProtectionWaitlistViewControllerPresenter.show()
                 }
             }
diff --git a/DuckDuckGo/Fire/View/FireViewController.swift b/DuckDuckGo/Fire/View/FireViewController.swift
@@ -17,7 +17,7 @@
 //
 
 import Cocoa
-@preconcurrency import Lottie
+import Lottie
 import Combine
 
 @MainActor
diff --git a/DuckDuckGo/MainWindow/MainViewController.swift b/DuckDuckGo/MainWindow/MainViewController.swift
@@ -199,7 +199,6 @@ final class MainViewController: NSViewController {
         presentWaitlistThankYouPromptIfNecessary()
 
 #if NETWORK_PROTECTION
-        sendActiveNetworkProtectionWaitlistUserPixel()
         refreshNetworkProtectionMessages()
 #endif
 
@@ -450,14 +449,6 @@ final class MainViewController: NSViewController {
         NSApp.mainMenuTyped.stopMenuItem.isEnabled = selectedTabViewModel.isLoading
     }
 
-#if NETWORK_PROTECTION
-    private func sendActiveNetworkProtectionWaitlistUserPixel() {
-        if DefaultNetworkProtectionVisibility().waitlistIsOngoing {
-            DailyPixel.fire(pixel: .networkProtectionWaitlistUserActive, frequency: .dailyOnly)
-        }
-    }
-#endif
-
     func presentWaitlistThankYouPromptIfNecessary() {
         guard let window = self.view.window else {
             assertionFailure("Couldn't get main view controller's window")
diff --git a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
@@ -364,8 +364,6 @@ final class MoreOptionsMenu: NSMenu {
                 }
             }
 #endif
-
-            DailyPixel.fire(pixel: .networkProtectionWaitlistEntryPointMenuItemDisplayed, frequency: .dailyAndCount, includeAppVersionParameter: true)
         } else {
             networkProtectionFeatureVisibility.disableForWaitlistUsers()
         }
diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
@@ -344,12 +344,10 @@ final class NavigationBarViewController: NSViewController {
 
         if NetworkProtectionWaitlist().shouldShowWaitlistViewController {
             NetworkProtectionWaitlistViewControllerPresenter.show()
-            DailyPixel.fire(pixel: .networkProtectionWaitlistIntroDisplayed, frequency: .dailyAndCount)
         } else if NetworkProtectionKeychainTokenStore().isFeatureActivated {
             popovers.toggleNetworkProtectionPopover(usingView: networkProtectionButton, withDelegate: networkProtectionButtonModel)
         } else {
             NetworkProtectionWaitlistViewControllerPresenter.show()
-            DailyPixel.fire(pixel: .networkProtectionWaitlistIntroDisplayed, frequency: .dailyAndCount)
         }
     }
 #endif
diff --git a/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift b/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionNavBarButtonModel.swift
@@ -180,9 +180,6 @@ final class NetworkProtectionNavBarButtonModel: NSObject, ObservableObject {
         let networkProtectionVisibility = DefaultNetworkProtectionVisibility()
         if networkProtectionVisibility.isNetworkProtectionBetaVisible() {
             if NetworkProtectionWaitlist().readyToAcceptTermsAndConditions {
-                DailyPixel.fire(pixel: .networkProtectionWaitlistEntryPointToolbarButtonDisplayed,
-                                frequency: .dailyOnly,
-                                includeAppVersionParameter: true)
                 showButton = true
                 return
             }
diff --git a/DuckDuckGo/Statistics/PixelEvent.swift b/DuckDuckGo/Statistics/PixelEvent.swift
@@ -165,14 +165,6 @@ extension Pixel {
         case vpnBreakageReport(category: String, description: String, metadata: String)
 
         // VPN
-        case networkProtectionWaitlistUserActive
-        case networkProtectionWaitlistEntryPointMenuItemDisplayed
-        case networkProtectionWaitlistEntryPointToolbarButtonDisplayed
-        case networkProtectionWaitlistIntroDisplayed
-        case networkProtectionWaitlistNotificationShown
-        case networkProtectionWaitlistNotificationTapped
-        case networkProtectionWaitlistTermsAndConditionsDisplayed
-        case networkProtectionWaitlistTermsAndConditionsAccepted
         case networkProtectionRemoteMessageDisplayed(messageID: String)
         case networkProtectionRemoteMessageDismissed(messageID: String)
         case networkProtectionRemoteMessageOpened(messageID: String)
@@ -573,22 +565,6 @@ extension Pixel.Event {
         case .vpnBreakageReport:
             return "m_mac_vpn_breakage_report"
 
-        case .networkProtectionWaitlistUserActive:
-            return "m_mac_netp_waitlist_user_active"
-        case .networkProtectionWaitlistEntryPointMenuItemDisplayed:
-            return "m_mac_netp_imp_settings_entry_menu_item"
-        case .networkProtectionWaitlistEntryPointToolbarButtonDisplayed:
-            return "m_mac_netp_imp_settings_entry_toolbar_button"
-        case .networkProtectionWaitlistIntroDisplayed:
-            return "m_mac_netp_imp_intro_screen"
-        case .networkProtectionWaitlistNotificationShown:
-            return "m_mac_netp_ev_waitlist_notification_shown"
-        case .networkProtectionWaitlistNotificationTapped:
-            return "m_mac_netp_ev_waitlist_notification_launched"
-        case .networkProtectionWaitlistTermsAndConditionsDisplayed:
-            return "m_mac_netp_imp_terms"
-        case .networkProtectionWaitlistTermsAndConditionsAccepted:
-            return "m_mac_netp_ev_terms_accepted"
         case .networkProtectionRemoteMessageDisplayed(let messageID):
             return "m_mac_netp_remote_message_displayed_\(messageID)"
         case .networkProtectionRemoteMessageDismissed(let messageID):
diff --git a/DuckDuckGo/Statistics/PixelParameters.swift b/DuckDuckGo/Statistics/PixelParameters.swift
@@ -124,14 +124,6 @@ extension Pixel.Event {
              .duckPlayerSettingAlways,
              .duckPlayerSettingNever,
              .duckPlayerSettingBackToDefault,
-             .networkProtectionWaitlistEntryPointMenuItemDisplayed,
-             .networkProtectionWaitlistEntryPointToolbarButtonDisplayed,
-             .networkProtectionWaitlistNotificationShown,
-             .networkProtectionWaitlistNotificationTapped,
-             .networkProtectionWaitlistTermsAndConditionsDisplayed,
-             .networkProtectionWaitlistTermsAndConditionsAccepted,
-             .networkProtectionWaitlistUserActive,
-             .networkProtectionWaitlistIntroDisplayed,
              .networkProtectionRemoteMessageDisplayed,
              .networkProtectionRemoteMessageDismissed,
              .networkProtectionRemoteMessageOpened,
diff --git a/DuckDuckGo/Waitlist/Waitlist.swift b/DuckDuckGo/Waitlist/Waitlist.swift
@@ -222,9 +222,7 @@ struct NetworkProtectionWaitlist: Waitlist {
                     do {
                         try await networkProtectionCodeRedemption.redeem(inviteCode)
                         NotificationCenter.default.post(name: .networkProtectionWaitlistAccessChanged, object: nil)
-                        sendInviteCodeAvailableNotification {
-                            DailyPixel.fire(pixel: .networkProtectionWaitlistNotificationShown, frequency: .dailyAndCount)
-                        }
+                        sendInviteCodeAvailableNotification(completion: nil)
                         completion(nil)
                     } catch {
                         assertionFailure("Failed to redeem invite code")
diff --git a/DuckDuckGo/Waitlist/WaitlistTermsAndConditionsActionHandler.swift b/DuckDuckGo/Waitlist/WaitlistTermsAndConditionsActionHandler.swift
@@ -36,15 +36,13 @@ struct NetworkProtectionWaitlistTermsAndConditionsActionHandler: WaitlistTermsAn
     var acceptedTermsAndConditions: Bool
 
     func didShow() {
-        DailyPixel.fire(pixel: .networkProtectionWaitlistTermsAndConditionsDisplayed, frequency: .dailyAndCount)
+        // Intentional no-op
     }
 
     mutating func didAccept() {
         acceptedTermsAndConditions = true
         // Remove delivered NetP notifications in case the user didn't click them.
         UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: [NetworkProtectionWaitlist.notificationIdentifier])
-
-        DailyPixel.fire(pixel: .networkProtectionWaitlistTermsAndConditionsAccepted, frequency: .dailyAndCount)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,6 @@ extension AppDelegate: UNUserNotificationCenterDelegate {`
`586`	`586`	`#if NETWORK_PROTECTION`
`587`	`587`	`if response.notification.request.identifier == NetworkProtectionWaitlist.notificationIdentifier {`
`588`	`588`	`if NetworkProtectionWaitlist().readyToAcceptTermsAndConditions {`
`589`		`- DailyPixel.fire(pixel: .networkProtectionWaitlistNotificationTapped, frequency: .dailyAndCount)`
`590`	`589`	`NetworkProtectionWaitlistViewControllerPresenter.show()`
`591`	`590`	`}`
`592`	`591`	`}`
Original file line number	Diff line number	Diff line change
`@@ -364,8 +364,6 @@ final class MoreOptionsMenu: NSMenu {`
`364`	`364`	`}`
`365`	`365`	`}`
`366`	`366`	`#endif`
`367`		`-`
`368`		`- DailyPixel.fire(pixel: .networkProtectionWaitlistEntryPointMenuItemDisplayed, frequency: .dailyAndCount, includeAppVersionParameter: true)`
`369`	`367`	`} else {`
`370`	`368`	`networkProtectionFeatureVisibility.disableForWaitlistUsers()`
`371`	`369`	`}`
Original file line number	Diff line number	Diff line change
`@@ -344,12 +344,10 @@ final class NavigationBarViewController: NSViewController {`
`344`	`344`
`345`	`345`	`if NetworkProtectionWaitlist().shouldShowWaitlistViewController {`
`346`	`346`	`NetworkProtectionWaitlistViewControllerPresenter.show()`
`347`		`- DailyPixel.fire(pixel: .networkProtectionWaitlistIntroDisplayed, frequency: .dailyAndCount)`
`348`	`347`	`} else if NetworkProtectionKeychainTokenStore().isFeatureActivated {`
`349`	`348`	`popovers.toggleNetworkProtectionPopover(usingView: networkProtectionButton, withDelegate: networkProtectionButtonModel)`
`350`	`349`	`} else {`
`351`	`350`	`NetworkProtectionWaitlistViewControllerPresenter.show()`
`352`		`- DailyPixel.fire(pixel: .networkProtectionWaitlistIntroDisplayed, frequency: .dailyAndCount)`
`353`	`351`	`}`
`354`	`352`	`}`
`355`	`353`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -36,15 +36,13 @@ struct NetworkProtectionWaitlistTermsAndConditionsActionHandler: WaitlistTermsAn`
`36`	`36`	`var acceptedTermsAndConditions: Bool`
`37`	`37`
`38`	`38`	`func didShow() {`
`39`		`- DailyPixel.fire(pixel: .networkProtectionWaitlistTermsAndConditionsDisplayed, frequency: .dailyAndCount)`
	`39`	`+ // Intentional no-op`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`mutating func didAccept() {`
`43`	`43`	`acceptedTermsAndConditions = true`
`44`	`44`	`// Remove delivered NetP notifications in case the user didn't click them.`
`45`	`45`	`UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: [NetworkProtectionWaitlist.notificationIdentifier])`
`46`		`-`
`47`		`- DailyPixel.fire(pixel: .networkProtectionWaitlistTermsAndConditionsAccepted, frequency: .dailyAndCount)`
`48`	`46`	`}`
`49`	`47`	`}`
`50`	`48`