Subscription pixels refinements (#2472)

Task/Issue URL: https://app.asana.com/0/1205842942115003/1205469290776415/f **Description**: New pixels for Subscription Pro
duckduckgo · Mar 22, 2024 · 9c8a825 · 9c8a825
1 parent dbf4f36
commit 9c8a825
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 8 deletions.
diff --git a/DuckDuckGo/Application/URLEventHandler.swift b/DuckDuckGo/Application/URLEventHandler.swift
@@ -146,6 +146,7 @@ final class URLEventHandler {
 #if SUBSCRIPTION
         case AppLaunchCommand.showPrivacyPro.launchURL:
             WindowControllersManager.shared.showTab(with: .subscription(.subscriptionPurchase))
+            Pixel.fire(.privacyProOfferScreenImpression)
 #endif
 #if !APPSTORE && !DEBUG
         case AppLaunchCommand.moveAppToApplications.launchURL:

diff --git a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
@@ -251,7 +251,6 @@ final class MoreOptionsMenu: NSMenu {
 
 #if SUBSCRIPTION
     @objc func openSubscriptionPurchasePage(_ sender: NSMenuItem) {
-        Pixel.fire(.privacyProOfferScreenImpression)
         actionDelegate?.optionsButtonMenuRequestedSubscriptionPurchasePage(self)
     }
 

diff --git a/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift b/DuckDuckGo/NavigationBar/View/NavigationBarViewController.swift
@@ -1094,6 +1094,7 @@ extension NavigationBarViewController: OptionsButtonMenuDelegate {
 #if SUBSCRIPTION
     func optionsButtonMenuRequestedSubscriptionPurchasePage(_ menu: NSMenu) {
         WindowControllersManager.shared.showTab(with: .subscription(.subscriptionPurchase))
+        Pixel.fire(.privacyProOfferScreenImpression)
     }
 
     func optionsButtonMenuRequestedIdentityTheftRestoration(_ menu: NSMenu) {

diff --git a/DuckDuckGo/Statistics/PixelEvent.swift b/DuckDuckGo/Statistics/PixelEvent.swift
@@ -253,6 +253,7 @@ extension Pixel {
         case privacyProSubscriptionManagementEmail
         case privacyProSubscriptionManagementPlanBilling
         case privacyProSubscriptionManagementRemoval
+        case privacyProPurchaseStripeSuccess
         // Web pixels
         case privacyProOfferMonthlyPriceClick
         case privacyProOfferYearlyPriceClick
@@ -694,6 +695,7 @@ extension Pixel.Event {
         case .privacyProSubscriptionManagementEmail: return "m_mac_\(appDistribution)_privacy-pro_manage-email_edit_click"
         case .privacyProSubscriptionManagementPlanBilling: return "m_mac_\(appDistribution)_privacy-pro_settings_change-plan-or-billing_click"
         case .privacyProSubscriptionManagementRemoval: return "m_mac_\(appDistribution)_privacy-pro_settings_remove-from-device_click"
+        case .privacyProPurchaseStripeSuccess: return "m_mac_\(appDistribution)_privacy-pro_app_subscription-purchase_stripe_success"
             // Web
         case .privacyProOfferMonthlyPriceClick: return "m_mac_\(appDistribution)_privacy-pro_offer_monthly-price_click"
         case .privacyProOfferYearlyPriceClick: return "m_mac_\(appDistribution)_privacy-pro_offer_yearly-price_click"

diff --git a/DuckDuckGo/Statistics/PixelParameters.swift b/DuckDuckGo/Statistics/PixelParameters.swift
@@ -213,6 +213,7 @@ extension Pixel.Event {
              .privacyProOfferYearlyPriceClick,
              .privacyProAddEmailSuccess,
              .privacyProWelcomeFAQClick,
+             .privacyProPurchaseStripeSuccess,
              .passwordImportKeychainPrompt,
              .passwordImportKeychainPromptDenied:
             return nil

diff --git a/DuckDuckGo/Tab/UserScripts/SubscriptionPagesUserScript.swift b/DuckDuckGo/Tab/UserScripts/SubscriptionPagesUserScript.swift
@@ -398,10 +398,6 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
         if isBackendError {
             DailyPixel.fire(pixel: .privacyProPurchaseFailureBackendError, frequency: .dailyAndCount)
         }
-
-        if subscriptionActivationError != .hasActiveSubscription && subscriptionActivationError != .cancelledByUser {
-            DailyPixel.fire(pixel: .privacyProPurchaseFailure, frequency: .dailyAndCount)
-        }
     }
 
     func activateSubscription(params: Any, original: WKScriptMessage) async throws -> Encodable? {
@@ -511,7 +507,9 @@ final class SubscriptionPagesUseSubscriptionFeature: Subfeature {
         await StripePurchaseFlow.completeSubscriptionPurchase(subscriptionAppGroup: Bundle.main.appGroup(bundle: .subs))
         await mainViewController?.dismiss(progressViewController)
 
-        return [String: String]() // cannot be nil
+        DailyPixel.fire(pixel: .privacyProPurchaseStripeSuccess, frequency: .dailyAndCount)
+
+        return [String: String]() // cannot be nil, the web app expect something back before redirecting the user to the final page
     }
 
     // MARK: Pixel related actions
@@ -577,6 +575,7 @@ extension MainWindowController {
 
     @MainActor
     func showSomethingWentWrongAlert() {
+        DailyPixel.fire(pixel: .privacyProPurchaseFailure, frequency: .dailyAndCount)
         guard let window else { return }
 
         window.show(.somethingWentWrongAlert())
@@ -588,6 +587,7 @@ extension MainWindowController {
 
         window.show(.subscriptionNotFoundAlert(), firstButtonAction: {
             WindowControllersManager.shared.showTab(with: .subscription(.subscriptionPurchase))
+            Pixel.fire(.privacyProOfferScreenImpression)
         })
     }
 
@@ -597,6 +597,7 @@ extension MainWindowController {
 
         window.show(.subscriptionInactiveAlert(), firstButtonAction: {
             WindowControllersManager.shared.showTab(with: .subscription(.subscriptionPurchase))
+            Pixel.fire(.privacyProOfferScreenImpression)
         })
     }
 

diff --git a/...ages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionModel.swift b/...ages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionModel.swift
@@ -200,6 +200,7 @@ public final class PreferencesSubscriptionModel: ObservableObject {
 
     @MainActor
     func removeFromThisDeviceAction() {
+        userEventHandler(.removeSubscriptionClick)
         accountManager.signOut()
     }
 

diff --git a/...kages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionView.swift b/...kages/SubscriptionUI/Sources/SubscriptionUI/Preferences/PreferencesSubscriptionView.swift
@@ -125,7 +125,6 @@ public struct PreferencesSubscriptionView: View {
                     }
                 })
                 Button(UserText.removeFromThisDeviceButton, action: {
-                    model.userEventHandler(.removeSubscriptionClick)
                     showingRemoveConfirmationDialog.toggle()
                 })
             } label: {
@@ -190,7 +189,6 @@ public struct PreferencesSubscriptionView: View {
                 .buttonStyle(DefaultActionButtonStyle(enabled: true)) */
             Menu {
                 Button(UserText.removeFromThisDeviceButton, action: {
-                    model.userEventHandler(.removeSubscriptionClick)
                     showingRemoveConfirmationDialog.toggle()
                 })
             } label: {