Remove remaining legacy events

Author: hichamboushaba

WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsEvent.kt

@@ -147,8 +147,6 @@ enum class AnalyticsEvent(override val siteless: Boolean = false) : IAnalyticsEv
     LOGIN_JETPACK_SITE_CREDENTIAL_RESET_PASSWORD_BUTTON_TAPPED(siteless = true),
     LOGIN_JETPACK_SITE_CREDENTIAL_DID_SHOW_ERROR_ALERT(siteless = true),
     LOGIN_JETPACK_SITE_CREDENTIAL_DID_FINISH_LOGIN(siteless = true),
-    LOGIN_JETPACK_SETUP_CANNOT_FIND_WPCOM_USER(siteless = true),
-    LOGIN_JETPACK_SETUP_GET_SUPPORT_BUTTON_TAPPED(siteless = true),
 
     // -- Dashboard
     DASHBOARD_PULLED_TO_REFRESH,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/JetpackActivationRepository.kt

@@ -2,7 +2,6 @@ package com.woocommerce.android.ui.login.jetpack
 
 import com.woocommerce.android.OnChangedException
 import com.woocommerce.android.WooException
-import com.woocommerce.android.analytics.AnalyticsEvent
 import com.woocommerce.android.analytics.AnalyticsTrackerWrapper
 import com.woocommerce.android.model.JetpackConnectionStatus
 import com.woocommerce.android.model.JetpackSiteRegistrationStatus
@@ -134,9 +133,6 @@ class JetpackActivationRepository @Inject constructor(
             }
 
             result.data?.currentUser?.wpcomEmail.isNullOrEmpty() -> {
-                analyticsTrackerWrapper.track(
-                    stat = AnalyticsEvent.LOGIN_JETPACK_SETUP_CANNOT_FIND_WPCOM_USER
-                )
                 WooLog.w(WooLog.T.LOGIN, "Cannot find Jetpack Email in response")
                 Result.failure(JetpackMissingConnectionEmailException())
             }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/jetpack/start/JetpackActivationStartViewModel.kt

@@ -59,11 +59,15 @@ class JetpackActivationStartViewModel @Inject constructor(
 
     fun onHelpButtonClick() {
         analyticsTrackerWrapper.track(
-            stat = AnalyticsEvent.LOGIN_JETPACK_SETUP_GET_SUPPORT_BUTTON_TAPPED,
+            stat = AnalyticsEvent.JETPACK_SETUP_FLOW,
             properties = mapOf(
-                AnalyticsTracker.KEY_JETPACK_INSTALLATION_STEP to
+                AnalyticsTracker.KEY_STEP to if (navArgs.jetpackStatus.isJetpackInstalled) {
                     JetpackActivationMainViewModel.StepType.Connection.analyticsName
-            ),
+                } else {
+                    JetpackActivationMainViewModel.StepType.Installation.analyticsName
+                },
+                AnalyticsTracker.KEY_TAP to AnalyticsTracker.VALUE_JETPACK_SETUP_TAP_SUPPORT,
+            )
         )
         triggerEvent(NavigateToHelpScreen(JETPACK_INSTALLATION))
     }