Merge remote-tracking branch 'origin/fenix/118.1.1' into iceraven

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 = {

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),
-            )
         }
     }