From 1076583547159441208d3c87bc5945c28f12365a Mon Sep 17 00:00:00 2001
From: DreVla <vlad.dreghici@gmail.com>
Date: Tue, 19 Sep 2023 15:39:55 +0300
Subject: [PATCH] Bug 1853707 - Send Search Widget telemetry when primary
 button tapped

Send the add search widget click telemetry when the primary
button has been clicked on the juno onboarding card.

(cherry picked from commit d5965e4427d3646c9cdece1e2b79cd654b9399d8)
---
 .../org/mozilla/fenix/onboarding/JunoOnboardingFragment.kt  | 4 ++++
 .../mozilla/fenix/onboarding/view/JunoOnboardingScreen.kt   | 6 ------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/JunoOnboardingFragment.kt b/app/src/main/java/org/mozilla/fenix/onboarding/JunoOnboardingFragment.kt
index 5f96d6005..9be2a6252 100644
--- a/app/src/main/java/org/mozilla/fenix/onboarding/JunoOnboardingFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/onboarding/JunoOnboardingFragment.kt
@@ -157,6 +157,10 @@ class JunoOnboardingFragment : Fragment() {
                 )
             },
             onAddFirefoxWidgetClick = {
+                telemetryRecorder.onAddSearchWidgetClick(
+                    pagesToDisplay.telemetrySequenceId(),
+                    pagesToDisplay.sequencePosition(OnboardingPageUiData.Type.ADD_SEARCH_WIDGET),
+                )
                 showAddSearchWidgetDialog()
             },
             onSkipFirefoxWidgetClick = {
diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/view/JunoOnboardingScreen.kt b/app/src/main/java/org/mozilla/fenix/onboarding/view/JunoOnboardingScreen.kt
index 5eea74fdc..f5e5f2376 100644
--- a/app/src/main/java/org/mozilla/fenix/onboarding/view/JunoOnboardingScreen.kt
+++ b/app/src/main/java/org/mozilla/fenix/onboarding/view/JunoOnboardingScreen.kt
@@ -39,7 +39,6 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.components.components
 import org.mozilla.fenix.compose.PagerIndicator
 import org.mozilla.fenix.compose.annotation.LightDarkPreview
-import org.mozilla.fenix.onboarding.JunoOnboardingTelemetryRecorder
 import org.mozilla.fenix.onboarding.WidgetPinnedReceiver.WidgetPinnedState
 import org.mozilla.fenix.theme.FirefoxTheme
 
@@ -80,7 +79,6 @@ fun JunoOnboardingScreen(
     val pagerState = rememberPagerState()
     val isSignedIn: State<Boolean?> = components.backgroundServices.syncStore
         .observeAsComposableState { it.account != null }
-    val telemetryRecorder by lazy { JunoOnboardingTelemetryRecorder() }
     val widgetPinnedFlow: StateFlow<Boolean> = WidgetPinnedState.isPinned
     val isWidgetPinnedState by widgetPinnedFlow.collectAsState()
 
@@ -115,10 +113,6 @@ fun JunoOnboardingScreen(
     LaunchedEffect(isWidgetPinnedState) {
         if (isWidgetPinnedState) {
             scrollToNextPageOrDismiss()
-            telemetryRecorder.onAddSearchWidgetClick(
-                pagesToDisplay.telemetrySequenceId(),
-                pagesToDisplay.sequencePosition(OnboardingPageUiData.Type.ADD_SEARCH_WIDGET),
-            )
         }
     }