Onboarding analytics fixes (#3736)

Author: bjtitus

podcasts/Constants.swift

@@ -424,6 +424,7 @@ enum PlusUpgradeViewSource: String {
     case upNextShuffle
     case generatedTranscripts
     case onboarding
+    case onboardingRecommendations = "onboarding_recommendations"
     case suggestedFolders = "suggested_folders"
     case bannerAd = "banner_ad"
     case login

podcasts/NewEmailViewController.swift

@@ -114,7 +114,8 @@ class NewEmailViewController: PCViewController, UITextFieldDelegate {
         originalButtonConstant = nextButtonBottomConstraint.constant
 
         updateButtonState()
-        Analytics.track(.createAccountShown)
+
+        OnboardingFlow.shared.track(.createAccountShown)
     }
 
     override func viewDidAppear(_ animated: Bool) {

podcasts/Onboarding/LoginCoordinator.swift

@@ -75,7 +75,7 @@ class LoginCoordinator: NSObject, OnboardingModel {
     }
 
     func getStartedTapped() {
-        OnboardingFlow.shared.track(.setupAccountButtonTapped, properties: ["button": "get_started"])
+        OnboardingFlow.shared.updateAnalyticsSource(.onboardingRecommendations)
         let hostingController: UIViewController
         if FeatureFlag.newOnboardingRecommendationChanges.enabled {
             let view = InterestsView(continueCallback: { categories in
@@ -107,7 +107,6 @@ class LoginCoordinator: NSObject, OnboardingModel {
 
     func recommendationsContinueTapped() {
         socialAuthProvider = nil
-        OnboardingFlow.shared.track(.setupAccountButtonTapped, properties: ["button": "recommendations_continue"])
         let view = LoginLandingView(coordinator: self, fullScreenMode: true)
         let hostingController = LoginLandingHostingController(rootView: view.setupDefaultEnvironment())
         hostingController.viewModel = self

podcasts/Onboarding/PodcastSubscribeButton.swift

@@ -67,7 +67,7 @@ struct PodcastSubscribeButton: View {
         HapticsHelper.triggerSubscribedHaptic()
 
         let analyticsUuid = podcast.uuid ?? podcast.iTunesId ?? "unknown"
-        Analytics.track(.podcastSubscribed, properties: ["source": searchAnalyticsHelper.source, "uuid": analyticsUuid])
+        OnboardingFlow.shared.track(.podcastSubscribed, properties: ["source": searchAnalyticsHelper.source, "uuid": analyticsUuid])
     }
 
     private func unsubscribe() {
@@ -79,6 +79,6 @@ struct PodcastSubscribeButton: View {
 
         PodcastManager.shared.unsubscribe(podcast: podcast)
 
-        Analytics.track(.podcastUnsubscribed, properties: ["source": searchAnalyticsHelper.source, "uuid": podcast.uuid])
+        OnboardingFlow.shared.track(.podcastUnsubscribed, properties: ["source": searchAnalyticsHelper.source, "uuid": podcast.uuid])
     }
 }