Merge branch 'main' into sam/remove-apptp

duckduckgo · Apr 8, 2024 · c854d06 · c854d06
2 parents 4f762da + 75ae662
commit c854d06
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 81 deletions.
diff --git a/Core/PixelEvent.swift b/Core/PixelEvent.swift
@@ -320,15 +320,6 @@ extension Pixel {
 
         case networkProtectionUnhandledError
 
-        case networkProtectionWaitlistUserActive
-        case networkProtectionSettingsRowDisplayed
-        case networkProtectionWaitlistIntroScreenDisplayed
-        case networkProtectionWaitlistTermsDisplayed
-        case networkProtectionWaitlistTermsAccepted
-        case networkProtectionWaitlistNotificationShown
-        case networkProtectionWaitlistNotificationLaunched
-        case networkProtectionWaitlistRetriedInviteCodeRedemption
-
         case networkProtectionGeoswitchingOpened
         case networkProtectionGeoswitchingSetNearest
         case networkProtectionGeoswitchingSetCustom
@@ -881,15 +872,6 @@ extension Pixel.Event {
         case .networkProtectionMemoryCritical: return "m_netp_vpn_memory_critical"
         case .networkProtectionUnhandledError: return "m_netp_unhandled_error"
 
-        case .networkProtectionWaitlistUserActive: return "m_netp_waitlist_user_active"
-        case .networkProtectionSettingsRowDisplayed: return "m_netp_waitlist_settings_entry_viewed"
-        case .networkProtectionWaitlistIntroScreenDisplayed: return "m_netp_waitlist_intro_screen_viewed"
-        case .networkProtectionWaitlistTermsDisplayed: return "m_netp_waitlist_terms_viewed"
-        case .networkProtectionWaitlistTermsAccepted: return "m_netp_waitlist_terms_accepted"
-        case .networkProtectionWaitlistNotificationShown: return "m_netp_waitlist_notification_shown"
-        case .networkProtectionWaitlistNotificationLaunched: return "m_netp_waitlist_notification_launched"
-        case .networkProtectionWaitlistRetriedInviteCodeRedemption: return "m_netp_waitlist_retried_invite_code_redemption"
-
         case .networkProtectionGeoswitchingOpened: return "m_netp_imp_geoswitching"
         case .networkProtectionGeoswitchingSetNearest: return "m_netp_ev_geoswitching_set_nearest"
         case .networkProtectionGeoswitchingSetCustom: return "m_netp_ev_geoswitching_set_custom"

diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -9426,7 +9426,7 @@
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 132.0.1;
+				version = 132.0.2;
 			};
 		};
 		9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

diff --git 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" : "73f68ee1c0dda3cd4a0b0cc3cc38a6cc7e605829",
-        "version" : "132.0.1"
+        "revision" : "5199a6964e183c3d001b188286bbabeca93c8849",
+        "version" : "132.0.2"
       }
     },
     {

diff --git a/DuckDuckGo/AppDelegate+Waitlists.swift b/DuckDuckGo/AppDelegate+Waitlists.swift
@@ -46,9 +46,6 @@ extension AppDelegate {
 #if NETWORK_PROTECTION
     private func checkNetworkProtectionWaitlist() {
         let accessController = NetworkProtectionAccessController()
-        if accessController.isPotentialOrCurrentWaitlistUser {
-            DailyPixel.fire(pixel: .networkProtectionWaitlistUserActive)
-        }
 
         VPNWaitlist.shared.fetchInviteCodeIfAvailable { [weak self] error in
             guard error == nil else {
@@ -70,8 +67,6 @@ extension AppDelegate {
             do {
                 try await NetworkProtectionCodeRedemptionCoordinator().redeem(inviteCode)
                 VPNWaitlist.shared.sendInviteCodeAvailableNotification()
-
-                DailyPixel.fireDailyAndCount(pixel: .networkProtectionWaitlistNotificationShown)
             } catch {}
         }
     }

diff --git a/DuckDuckGo/AppDelegate.swift b/DuckDuckGo/AppDelegate.swift
@@ -950,7 +950,6 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
 
             if vpnFeatureVisibility.shouldKeepVPNAccessViaWaitlist(), identifier == VPNWaitlist.notificationIdentifier {
                 presentNetworkProtectionWaitlistModal()
-                DailyPixel.fire(pixel: .networkProtectionWaitlistNotificationLaunched)
             }
 
 #endif

diff --git a/DuckDuckGo/NetworkProtectionAccessController.swift b/DuckDuckGo/NetworkProtectionAccessController.swift
@@ -70,15 +70,6 @@ struct NetworkProtectionAccessController: NetworkProtectionAccess {
         return (regionCode ?? "US") == "US"
     }
 
-    var isPotentialOrCurrentWaitlistUser: Bool {
-        switch self.networkProtectionAccessType() {
-        case .none, .inviteCodeInvited:
-            return false
-        case .waitlistAvailable, .waitlistJoined, .waitlistInvitedPendingTermsAcceptance, .waitlistInvited:
-            return true
-        }
-    }
-
     init(
         networkProtectionActivation: NetworkProtectionFeatureActivation = NetworkProtectionKeychainTokenStore(),
         networkProtectionWaitlistStorage: WaitlistStorage = WaitlistKeychainStore(waitlistIdentifier: VPNWaitlist.identifier),

diff --git a/DuckDuckGo/VPNWaitlistTermsAndConditionsViewController.swift b/DuckDuckGo/VPNWaitlistTermsAndConditionsViewController.swift
@@ -40,17 +40,13 @@ final class VPNWaitlistTermsAndConditionsViewController: UIViewController {
 
         title = UserText.netPNavTitle
         addHostingControllerToViewHierarchy()
-
-        DailyPixel.fire(pixel: .networkProtectionWaitlistTermsDisplayed)
     }
 
     private func addHostingControllerToViewHierarchy() {
         let waitlistView = VPNWaitlistPrivacyPolicyView { _ in
             var termsAndConditionsStore = NetworkProtectionTermsAndConditionsUserDefaultsStore()
             termsAndConditionsStore.networkProtectionWaitlistTermsAndConditionsAccepted = true
 
-            DailyPixel.fire(pixel: .networkProtectionWaitlistTermsAccepted)
-
             self.navigationController?.popToRootViewController(animated: true)
             let networkProtectionViewController = NetworkProtectionRootViewController()
             self.navigationController?.pushViewController(networkProtectionViewController, animated: true)

diff --git a/DuckDuckGo/VPNWaitlistViewController.swift b/DuckDuckGo/VPNWaitlistViewController.swift
@@ -68,10 +68,6 @@ final class VPNWaitlistViewController: UIViewController {
     private func updateViewState() {
         Task {
             await self.viewModel.updateViewState()
-
-            if self.viewModel.viewState == .notJoinedQueue {
-                DailyPixel.fire(pixel: .networkProtectionWaitlistIntroScreenDisplayed)
-            }
         }
     }
 

diff --git a/DuckDuckGoTests/NetworkProtectionAccessControllerTests.swift b/DuckDuckGoTests/NetworkProtectionAccessControllerTests.swift
@@ -117,43 +117,6 @@ final class NetworkProtectionAccessControllerTests: XCTestCase {
         XCTAssertEqual(controller.networkProtectionAccessType(), .waitlistInvited)
     }
 
-    func testWhenUserHasWaitlistAccess_ThenWaitlistUserCheckIsTrue() {
-        let controller = createMockAccessController(
-            isInternalUser: true,
-            featureActivated: true,
-            termsAccepted: true,
-            featureFlagsEnabled: true,
-            hasJoinedWaitlist: true,
-            hasBeenInvited: true
-        )
-
-        XCTAssertTrue(controller.isPotentialOrCurrentWaitlistUser)
-    }
-
-    func testWhenUserDoesNotHaveWaitlistAccess_ThenWaitlistUserCheckIsFalse() {
-        let controller = createMockAccessController(
-            featureActivated: false,
-            termsAccepted: false,
-            featureFlagsEnabled: false,
-            hasJoinedWaitlist: false,
-            hasBeenInvited: false
-        )
-
-        XCTAssertFalse(controller.isPotentialOrCurrentWaitlistUser)
-    }
-
-    func testWhenUserIsInternal_ThenWaitlistUserCheckIsFalse() {
-        let controller = createMockAccessController(
-            featureActivated: true,
-            termsAccepted: false,
-            featureFlagsEnabled: false,
-            hasJoinedWaitlist: false,
-            hasBeenInvited: false
-        )
-
-        XCTAssertFalse(controller.isPotentialOrCurrentWaitlistUser)
-    }
-
     // MARK: - Mock Creation
 
     private func createMockAccessController(
-Original file line number
+Diff line change
@@ Expand Up / @@ -950,7 +950,6 @@ extension AppDelegate: UNUserNotificationCenterDelegate { @@
                 if vpnFeatureVisibility.shouldKeepVPNAccessViaWaitlist(), identifier == VPNWaitlist.notificationIdentifier {
                     presentNetworkProtectionWaitlistModal()
-                    DailyPixel.fire(pixel: .networkProtectionWaitlistNotificationLaunched)
                 }
     #endif
@@ Expand Down @@