Onboarding Design Experiment Setup (#6525)

### Description

This PR refactors the onboarding design experiment implementation by
introducing a new `OnboardingDesignExperimentManager` that centralizes
experiment-related logic. The manager handles enrollment, cohort
determination, and firing experiment-specific pixels for tracking user
interactions throughout the onboarding flow.

Key changes include:
- Added a data store to track site and SERP visit counts
- Implemented comprehensive pixel tracking for onboarding interactions
- Replaced direct toggle checks with manager methods for better
abstraction
- Added support for tracking user interactions with onboarding dialogs
and options

### Steps to test this PR

_Onboarding Experience_
- [ ] Verify new users see the appropriate onboarding experience based
on experiment cohort
- [ ] Confirm that navigating through onboarding flows works correctly
- [ ] Test that site suggestions and search options function properly
- [ ] Verify fire animations display correctly based on experiment
cohort

_Pixels_

Use Logcat to check for Pixels firing. 

When there are multiple options you'll need to clear data and get back
to the same position.

#### **Variant – Modified Control**

Filter logs using:
`experiment_metrics_onboardingDesignExperimentAug25_modifiedControl`

* [x] Intro screen shown → `introScreenDisplayed`
* [x] Comparison screen shown → `comparisonScreenDisplayed`
* [x] Tap **“Choose Browser”** → `chooseBrowser`
* [x] Accept system **Set as default** dialog → `setDefaultRate`

* [x] Address-bar-position sheet displayed → `setAddressBarDisplayed`
  * [x] Select **Top** → `addressBarSetTop`
  * [x] Select **Bottom** → `addressBarSetBottom`
  
* [x] “Try a search” bubble appears → `tryASearchDisplayed`
  * [x] Tap first suggestion → `firstSearchSuggestion`
  * [x] Tap second suggestion → `secondSearchSuggestion`
  * [x] Tap third suggestion → `thirdSearchSuggestion`
  * [x] Enter any other query → `searchOrNavCustom`
* [x] SERP message dialog appears → `messageOnSerpDisplayed`

* [x] Site-suggestion bubble (adjacent) appears →
`visitSitePromptDisplayedAdjacent`
  * [x] Tap first site → `firstSiteSuggestion`
  * [x] Tap second site → `secondSiteSuggestion`
  * [x] Tap third site → `thirdSiteSuggestion`
* [x] (Clear data, get back to "Try a search" dialog, dismiss and then
open a new tab) Site-suggestion bubble appears →
`visitSitePromptDisplayedNewTab`
  * [x] Tap first site → `firstSiteSuggestion`
  * [x] Tap second site → `secondSiteSuggestion`
  * [x] Tap third site → `thirdSiteSuggestion`

* [x] Trackers-blocked dialog shown → `trackersBlockedMessageDisplayed`
* [x] No-trackers dialog shown → `noTrackersMessageDisplayed`
* [x] Tracker-network dialog shown → `trackerNetworkMessageDisplayed`
* [x] From a blockers dialog, tap privacy-shield →
`privacyDashClickedFromOnboarding`
* [x] Fire-button education prompt displayed →
`fireButtonPromptDisplayed`

* [x] Trigger Fire action from that prompt →
`fireButtonClickedFromOnboarding`
* [x] End-of-journey screen shown → `finalOnboardingScreenDisplayed`
* [x] Second non-DDG site loads → `secondSiteVisit`
* [x] Second DDG SERP loads → `secondSerpVisit`

---

#### **Variant – Buck**

Filter logs using:
`experiment_metrics_onboardingDesignExperimentAug25_buck`

* [x] Intro screen shown → `introScreenDisplayed`
* [x] Comparison screen shown → `comparisonScreenDisplayed`
* [x] Tap **“Choose Browser”** → `chooseBrowser`
* [x] Accept system **Set as default** dialog → `setDefaultRate`

* [x] Address-bar-position sheet displayed → `setAddressBarDisplayed`
  * [x] Select **Top** → `addressBarSetTop`
  * [x] Select **Bottom** → `addressBarSetBottom`
  
* [x] “Try a search” bubble appears → `tryASearchDisplayed`
  * [x] Tap first suggestion → `firstSearchSuggestion`
  * [x] Tap second suggestion → `secondSearchSuggestion`
  * [x] Tap third suggestion → `thirdSearchSuggestion`
  * [x] Enter any other query → `searchOrNavCustom`
* [x] SERP message dialog appears → `messageOnSerpDisplayed`

* [x] Site-suggestion bubble (adjacent) appears →
`visitSitePromptDisplayedAdjacent`
  * [x] Tap first site → `firstSiteSuggestion`
  * [x] Tap second site → `secondSiteSuggestion`
  * [x] Tap third site → `thirdSiteSuggestion`
* [x] (Clear data, get back to "Try a search" dialog, dismiss and then
open a new tab) Site-suggestion bubble appears →
`visitSitePromptDisplayedNewTab`
  * [x] Tap first site → `firstSiteSuggestion`
  * [x] Tap second site → `secondSiteSuggestion`
  * [x] Tap third site → `thirdSiteSuggestion`

* [x] Trackers-blocked dialog shown → `trackersBlockedMessageDisplayed`
* [x] No-trackers dialog shown → `noTrackersMessageDisplayed`
* [x] Tracker-network dialog shown → `trackerNetworkMessageDisplayed`
* [x] From a blockers dialog, tap privacy-shield →
`privacyDashClickedFromOnboarding`
* [x] Fire-button education prompt displayed →
`fireButtonPromptDisplayed`

* [x] Trigger Fire action from that prompt →
`fireButtonClickedFromOnboarding`
* [x] End-of-journey screen shown → `finalOnboardingScreenDisplayed`
* [x] Second non-DDG site loads → `secondSiteVisit`
* [x] Second DDG SERP loads → `secondSerpVisit`

---

#### **Variant – BB**

Filter logs using:
`experiment_metrics_onboardingDesignExperimentAug25_bb`

* [x] Intro screen shown → `introScreenDisplayed`
* [x] Comparison screen shown → `comparisonScreenDisplayed`
* [x] Tap **“Choose Browser”** → `chooseBrowser`
* [x] Accept system **Set as default** dialog → `setDefaultRate`
* [x] Address-bar-position sheet displayed → `setAddressBarDisplayed`

  * [x] Select **Top** → `addressBarSetTop`
  * [x] Select **Bottom** → `addressBarSetBottom`
  
* [x] “Try a search” bubble appears → `tryASearchDisplayed`
  * [x] Tap first suggestion → `firstSearchSuggestion`
  * [x] Tap second suggestion → `secondSearchSuggestion`
  * [x] Tap third suggestion → `thirdSearchSuggestion`
  * [x] Enter any other query → `searchOrNavCustom`
* [x] SERP message dialog appears → `messageOnSerpDisplayed`

* [x] Site-suggestion bubble (adjacent) appears →
`visitSitePromptDisplayedAdjacent`
  * [x] Tap first site → `firstSiteSuggestion`
  * [x] Tap second site → `secondSiteSuggestion`
  * [x] Tap third site → `thirdSiteSuggestion`
* [x] (Clear data, get back to "Try a search" dialog, dismiss and then
open a new tab) Site-suggestion bubble appears →
`visitSitePromptDisplayedNewTab`
  * [x] Tap first site → `firstSiteSuggestion`
  * [x] Tap second site → `secondSiteSuggestion`
  * [x] Tap third site → `thirdSiteSuggestion`

* [x] Trackers-blocked dialog shown → `trackersBlockedMessageDisplayed`
* [x] No-trackers dialog shown → `noTrackersMessageDisplayed`
* [x] Tracker-network dialog shown → `trackerNetworkMessageDisplayed`
* [x] From a blockers dialog, tap privacy-shield →
`privacyDashClickedFromOnboarding`
* [x] Fire-button education prompt displayed →
`fireButtonPromptDisplayed`

* [x] Trigger Fire action from that prompt →
`fireButtonClickedFromOnboarding`
* [x] End-of-journey screen shown → `finalOnboardingScreenDisplayed`
* [x] Second non-DDG site loads → `secondSiteVisit`
* [x] Second DDG SERP loads → `secondSerpVisit`

### UI changes
No UI changes in this PR - this is an internal refactoring of the
experiment implementation.

Author: mikescamell

app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt

@@ -37,7 +37,7 @@ import com.duckduckgo.app.onboarding.store.AppStage
 import com.duckduckgo.app.onboarding.store.OnboardingStore
 import com.duckduckgo.app.onboarding.store.UserStageStore
 import com.duckduckgo.app.onboarding.ui.page.extendedonboarding.ExtendedOnboardingFeatureToggles
-import com.duckduckgo.app.onboardingdesignexperiment.OnboardingDesignExperimentToggles
+import com.duckduckgo.app.onboardingdesignexperiment.OnboardingDesignExperimentManager
 import com.duckduckgo.app.pixels.AppPixelName.*
 import com.duckduckgo.app.privacy.db.UserAllowListRepository
 import com.duckduckgo.app.privacy.model.HttpsStatus
@@ -125,7 +125,7 @@ class CtaViewModelTest {
     private val mockSenseOfProtectionExperiment: SenseOfProtectionExperiment = mock()
     private val mockOnboardingHomeScreenWidgetExperiment: OnboardingHomeScreenWidgetExperiment = mock()
 
-    private val mockOnboardingDesignExperimentToggles: OnboardingDesignExperimentToggles = mock()
+    private val mockOnboardingDesignExperimentManager: OnboardingDesignExperimentManager = mock()
 
     private val mockRebrandingFeatureToggle: SubscriptionRebrandingFeatureToggle = mock()
 
@@ -165,9 +165,9 @@ class CtaViewModelTest {
         whenever(mockBrokenSitePrompt.isFeatureEnabled()).thenReturn(false)
         whenever(mockBrokenSitePrompt.getUserRefreshPatterns()).thenReturn(emptySet())
         whenever(mockSubscriptions.isEligible()).thenReturn(false)
-        whenever(mockOnboardingDesignExperimentToggles.modifiedControl()).thenReturn(mockDisabledToggle)
-        whenever(mockOnboardingDesignExperimentToggles.buckOnboarding()).thenReturn(mockDisabledToggle)
-        whenever(mockOnboardingDesignExperimentToggles.bbOnboarding()).thenReturn(mockDisabledToggle)
+        whenever(mockOnboardingDesignExperimentManager.isModifiedControlEnrolledAndEnabled()).thenReturn(false)
+        whenever(mockOnboardingDesignExperimentManager.isBuckEnrolledAndEnabled()).thenReturn(false)
+        whenever(mockOnboardingDesignExperimentManager.isBbEnrolledAndEnabled()).thenReturn(false)
 
         testee = CtaViewModel(
             appInstallStore = mockAppInstallStore,
@@ -187,7 +187,7 @@ class CtaViewModelTest {
             brokenSitePrompt = mockBrokenSitePrompt,
             senseOfProtectionExperiment = mockSenseOfProtectionExperiment,
             onboardingHomeScreenWidgetExperiment = mockOnboardingHomeScreenWidgetExperiment,
-            onboardingDesignExperimentToggles = mockOnboardingDesignExperimentToggles,
+            onboardingDesignExperimentManager = mockOnboardingDesignExperimentManager,
             rebrandingFeatureToggle = mockRebrandingFeatureToggle,
         )
     }
@@ -276,7 +276,7 @@ class CtaViewModelTest {
     fun whenCtaDismissedAndAllDaxOnboardingCtasShownThenStageCompleted() = runTest {
         givenDaxOnboardingActive()
         givenShownDaxOnboardingCtas(requiredDaxOnboardingCtas)
-        testee.onUserDismissedCta(OnboardingDaxDialogCta.DaxSerpCta(mockOnboardingStore, mockAppInstallStore, mockOnboardingDesignExperimentToggles))
+        testee.onUserDismissedCta(OnboardingDaxDialogCta.DaxSerpCta(mockOnboardingStore, mockAppInstallStore, mockOnboardingDesignExperimentManager))
         verify(mockUserStageStore).stageCompleted(AppStage.DAX_ONBOARDING)
     }
 
@@ -828,14 +828,14 @@ class CtaViewModelTest {
 
     @Test
     fun whenCtaShownIfCtaIsNotMarkedAsReadOnShowThenCtaNotInsertedInDatabase() = runTest {
-        testee.onCtaShown(OnboardingDaxDialogCta.DaxSerpCta(mockOnboardingStore, mockAppInstallStore, mockOnboardingDesignExperimentToggles))
+        testee.onCtaShown(OnboardingDaxDialogCta.DaxSerpCta(mockOnboardingStore, mockAppInstallStore, mockOnboardingDesignExperimentManager))
 
         verify(mockDismissedCtaDao, never()).insert(DismissedCta(CtaId.DAX_DIALOG_SERP))
     }
 
     @Test
     fun whenCtaShownIfCtaIsMarkedAsReadOnShowThenCtaInsertedInDatabase() = runTest {
-        testee.onCtaShown(OnboardingDaxDialogCta.DaxEndCta(mockOnboardingStore, mockAppInstallStore, mockOnboardingDesignExperimentToggles))
+        testee.onCtaShown(OnboardingDaxDialogCta.DaxEndCta(mockOnboardingStore, mockAppInstallStore, mockOnboardingDesignExperimentManager))
 
         verify(mockDismissedCtaDao).insert(DismissedCta(CtaId.DAX_END))
     }
@@ -882,9 +882,7 @@ class CtaViewModelTest {
         whenever(mockSubscriptions.isEligible()).thenReturn(true)
         whenever(mockExtendedOnboardingFeatureToggles.noBrowserCtas()).thenReturn(mockEnabledToggle)
         whenever(mockExtendedOnboardingFeatureToggles.privacyProCta()).thenReturn(mockEnabledToggle)
-        whenever(mockOnboardingDesignExperimentToggles.modifiedControl()).thenReturn(mockDisabledToggle)
-        whenever(mockOnboardingDesignExperimentToggles.buckOnboarding()).thenReturn(mockDisabledToggle)
-        whenever(mockOnboardingDesignExperimentToggles.bbOnboarding()).thenReturn(mockDisabledToggle)
+        whenever(mockOnboardingDesignExperimentManager.isAnyExperimentEnrolledAndEnabled()).thenReturn(false)
         whenever(mockExtendedOnboardingFeatureToggles.freeTrialCopy()).thenReturn(mockDisabledToggle)
         whenever(mockDismissedCtaDao.exists(CtaId.DAX_INTRO)).thenReturn(true)
         whenever(mockDismissedCtaDao.exists(CtaId.DAX_INTRO_VISIT_SITE)).thenReturn(true)
@@ -896,48 +894,11 @@ class CtaViewModelTest {
     }
 
     @Test
-    fun givenPrivacyProCtaExperimentWhenRefreshCtaOnHomeTabAndModifiedControlOnboardingExperimentEnabledThenDoNotReturnPrivacyProCta() = runTest {
+    fun givenPrivacyProCtaExperimentWhenRefreshCtaOnHomeTabAndExperimentEnabledThenDoNotReturnPrivacyProCta() = runTest {
         givenDaxOnboardingActive()
-        whenever(mockOnboardingDesignExperimentToggles.modifiedControl()).thenReturn(mockEnabledToggle)
-        whenever(mockOnboardingDesignExperimentToggles.buckOnboarding()).thenReturn(mockDisabledToggle)
-        whenever(mockOnboardingDesignExperimentToggles.bbOnboarding()).thenReturn(mockDisabledToggle)
-        whenever(mockOnboardingHomeScreenWidgetExperiment.isOnboardingHomeScreenWidgetExperiment()).thenReturn(false)
-        whenever(mockSubscriptions.isEligible()).thenReturn(true)
-        whenever(mockExtendedOnboardingFeatureToggles.noBrowserCtas()).thenReturn(mockEnabledToggle)
-        whenever(mockExtendedOnboardingFeatureToggles.privacyProCta()).thenReturn(mockEnabledToggle)
-        whenever(mockDismissedCtaDao.exists(CtaId.DAX_INTRO)).thenReturn(true)
-        whenever(mockDismissedCtaDao.exists(CtaId.DAX_INTRO_VISIT_SITE)).thenReturn(true)
-        whenever(mockDismissedCtaDao.exists(CtaId.DAX_END)).thenReturn(true)
-        whenever(mockWidgetCapabilities.supportsAutomaticWidgetAdd).thenReturn(true)
-
-        val value = testee.refreshCta(coroutineRule.testDispatcher, isBrowserShowing = false, detectedRefreshPatterns = detectedRefreshPatterns)
-        assertFalse(value is DaxBubbleCta.DaxPrivacyProCta)
-    }
-
-    @Test
-    fun givenPrivacyProCtaExperimentWhenRefreshCtaOnHomeTabAndBuckOnboardingExperimentEnabledThenDoNotReturnPrivacyProCta() = runTest {
-        givenDaxOnboardingActive()
-        whenever(mockOnboardingDesignExperimentToggles.buckOnboarding()).thenReturn(mockEnabledToggle)
-        whenever(mockOnboardingDesignExperimentToggles.bbOnboarding()).thenReturn(mockDisabledToggle)
-        whenever(mockOnboardingHomeScreenWidgetExperiment.isOnboardingHomeScreenWidgetExperiment()).thenReturn(false)
-        whenever(mockSubscriptions.isEligible()).thenReturn(true)
-        whenever(mockExtendedOnboardingFeatureToggles.noBrowserCtas()).thenReturn(mockEnabledToggle)
-        whenever(mockExtendedOnboardingFeatureToggles.privacyProCta()).thenReturn(mockEnabledToggle)
-        whenever(mockDismissedCtaDao.exists(CtaId.DAX_INTRO)).thenReturn(true)
-        whenever(mockDismissedCtaDao.exists(CtaId.DAX_INTRO_VISIT_SITE)).thenReturn(true)
-        whenever(mockDismissedCtaDao.exists(CtaId.DAX_END)).thenReturn(true)
-        whenever(mockWidgetCapabilities.supportsAutomaticWidgetAdd).thenReturn(true)
-
-        val value = testee.refreshCta(coroutineRule.testDispatcher, isBrowserShowing = false, detectedRefreshPatterns = detectedRefreshPatterns)
-        assertFalse(value is DaxBubbleCta.DaxPrivacyProCta)
-    }
-
-    @Test
-    fun givenPrivacyProCtaExperimentWhenRefreshCtaOnHomeTabAndBBOnboardingExperimentEnabledThenDoNotReturnPrivacyProCta() = runTest {
-        givenDaxOnboardingActive()
-        whenever(mockOnboardingDesignExperimentToggles.bbOnboarding()).thenReturn(mockEnabledToggle)
-        whenever(mockOnboardingDesignExperimentToggles.buckOnboarding()).thenReturn(mockDisabledToggle)
+        whenever(mockOnboardingDesignExperimentManager.isAnyExperimentEnrolledAndEnabled()).thenReturn(true)
         whenever(mockOnboardingHomeScreenWidgetExperiment.isOnboardingHomeScreenWidgetExperiment()).thenReturn(false)
+        whenever(mockExtendedOnboardingFeatureToggles.freeTrialCopy()).thenReturn(mockDisabledToggle)
         whenever(mockSubscriptions.isEligible()).thenReturn(true)
         whenever(mockExtendedOnboardingFeatureToggles.noBrowserCtas()).thenReturn(mockEnabledToggle)
         whenever(mockExtendedOnboardingFeatureToggles.privacyProCta()).thenReturn(mockEnabledToggle)

app/src/androidTest/java/com/duckduckgo/app/cta/ui/CtaViewModelTest.kt

@@ -197,7 +197,7 @@ import com.duckduckgo.app.global.model.orderedTrackerBlockedEntities
 import com.duckduckgo.app.global.view.NonDismissibleBehavior
 import com.duckduckgo.app.global.view.launchDefaultAppActivity
 import com.duckduckgo.app.global.view.renderIfChanged
-import com.duckduckgo.app.onboardingdesignexperiment.OnboardingDesignExperimentToggles
+import com.duckduckgo.app.onboardingdesignexperiment.OnboardingDesignExperimentManager
 import com.duckduckgo.app.pixels.AppPixelName
 import com.duckduckgo.app.pixels.remoteconfig.AndroidBrowserConfigFeature
 import com.duckduckgo.app.settings.db.SettingsDataStore
@@ -572,7 +572,7 @@ class BrowserTabFragment :
     lateinit var senseOfProtectionExperiment: SenseOfProtectionExperiment
 
     @Inject
-    lateinit var onboardingDesignExperimentToggles: OnboardingDesignExperimentToggles
+    lateinit var onboardingDesignExperimentManager: OnboardingDesignExperimentManager
 
     @Inject
     lateinit var omnibarTypeResolver: OmnibarTypeResolver
@@ -2226,15 +2226,15 @@ class BrowserTabFragment :
     }
 
     private fun setOnboardingDialogBackgroundRes(backgroundRes: Int) {
-        if (onboardingDesignExperimentToggles.bbOnboarding().isEnabled()) {
+        if (onboardingDesignExperimentManager.isBbEnrolledAndEnabled()) {
             bbDialogInContext.onboardingDaxDialogBackground.setImageResource(backgroundRes)
         } else {
             daxDialogInContext.onboardingDaxDialogBackground.setImageResource(backgroundRes)
         }
     }
 
     private fun setOnboardingDialogBackgroundColor(@ColorRes colorRes: Int) {
-        if (onboardingDesignExperimentToggles.buckOnboarding().isEnabled()) {
+        if (onboardingDesignExperimentManager.isBuckEnrolledAndEnabled()) {
             buckDialogInContext.root.setBackgroundColor(getColor(requireContext(), colorRes))
         } else {
             daxDialogInContext.onboardingDaxDialogContainer.setBackgroundColor(getColor(requireContext(), colorRes))
@@ -2985,7 +2985,7 @@ class BrowserTabFragment :
 
     @SuppressLint("SetJavaScriptEnabled")
     private fun configureWebView() {
-        if (!onboardingDesignExperimentToggles.buckOnboarding().isEnabled()) {
+        if (!onboardingDesignExperimentManager.isBuckEnrolledAndEnabled()) {
             binding.daxDialogOnboardingCtaContent.layoutTransition = LayoutTransition()
             binding.daxDialogOnboardingCtaContent.layoutTransition.enableTransitionType(LayoutTransition.CHANGING)
 
@@ -3134,10 +3134,10 @@ class BrowserTabFragment :
 
     private fun hideOnboardingDaxDialog(onboardingCta: OnboardingDaxDialogCta) {
         when {
-            onboardingDesignExperimentToggles.buckOnboarding().isEnabled() -> {
+            onboardingDesignExperimentManager.isBuckEnrolledAndEnabled() -> {
                 onboardingCta.hideBuckOnboardingCta(binding)
             }
-            onboardingDesignExperimentToggles.bbOnboarding().isEnabled() -> {
+            onboardingDesignExperimentManager.isBbEnrolledAndEnabled() -> {
                 onboardingCta.hideBBOnboardingCta(binding)
             }
             else -> {
@@ -3153,7 +3153,7 @@ class BrowserTabFragment :
     private fun hideOnboardingDaxBubbleCta(daxBubbleCta: DaxBubbleCta) {
         daxBubbleCta.hideDaxBubbleCta(binding)
         hideDaxBubbleCta()
-        if (onboardingDesignExperimentToggles.buckOnboarding().isEnabled()) {
+        if (onboardingDesignExperimentManager.isBuckEnrolledAndEnabled()) {
             if (daxBubbleCta is DaxBubbleCta.DaxEndCta) {
                 hideBuckEndAnimation()
             }
@@ -3163,7 +3163,7 @@ class BrowserTabFragment :
     }
 
     private fun hideDaxBubbleCta() {
-        if (onboardingDesignExperimentToggles.buckOnboarding().isEnabled()) {
+        if (onboardingDesignExperimentManager.isBuckEnrolledAndEnabled()) {
             newBrowserTab.newTabLayout.setBackgroundColor(
                 requireContext().getColorFromAttr(CommonR.attr.daxColorSurface),
             )
@@ -4419,7 +4419,7 @@ class BrowserTabFragment :
 
                     viewState.isOnboardingCompleteInNewTabPage && !viewState.isErrorShowing -> {
                         hideDaxBubbleCta()
-                        if (onboardingDesignExperimentToggles.buckOnboarding().isEnabled()) {
+                        if (onboardingDesignExperimentManager.isBuckEnrolledAndEnabled()) {
                             hideBuckEndAnimation()
                         }
                         showNewTab()
@@ -4441,34 +4441,43 @@ class BrowserTabFragment :
             hideNewTab()
             configuration.apply {
                 when {
-                    onboardingDesignExperimentToggles.buckOnboarding().isEnabled() -> {
+                    onboardingDesignExperimentManager.isBuckEnrolledAndEnabled() -> {
                         showBuckCta(binding = buckDialogIntroBubble, configuration = configuration) {
                             setOnOptionClicked(
                                 onboardingExperimentEnabled = true,
                                 configuration = configuration,
-                            ) { userEnteredQuery(it.link) }
+                            ) { option, index ->
+                                userEnteredQuery(option.link)
+                                viewModel.onUserSelectedOnboardingDialogOption(configuration, index)
+                            }
                         }
                     }
-                    onboardingDesignExperimentToggles.bbOnboarding().isEnabled() -> {
+                    onboardingDesignExperimentManager.isBbEnrolledAndEnabled() -> {
                         showBBCta(binding = bbDialogIntroBubble, configuration = configuration) {
                             setOnOptionClicked(
                                 onboardingExperimentEnabled = true,
                                 configuration = configuration,
-                            ) { userEnteredQuery(it.link) }
+                            ) { option, index ->
+                                userEnteredQuery(option.link)
+                                viewModel.onUserSelectedOnboardingDialogOption(configuration, index)
+                            }
                         }
                     }
                     else -> {
                         showCta(daxDialogIntroBubble.daxCtaContainer) {
                             setOnOptionClicked(
-                                onboardingExperimentEnabled = onboardingDesignExperimentToggles.modifiedControl().isEnabled(),
+                                onboardingExperimentEnabled = onboardingDesignExperimentManager.isModifiedControlEnrolledAndEnabled(),
                                 configuration = configuration,
-                            ) { userEnteredQuery(it.link) }
+                            ) { option, index ->
+                                userEnteredQuery(option.link)
+                                viewModel.onUserSelectedOnboardingDialogOption(configuration, index)
+                            }
                         }
                     }
                 }
 
                 setOnPrimaryCtaClicked {
-                    if (onboardingDesignExperimentToggles.bbOnboarding().isEnabled() && configuration is DaxBubbleCta.DaxEndCta) {
+                    if (onboardingDesignExperimentManager.isBbEnrolledAndEnabled() && configuration is DaxBubbleCta.DaxEndCta) {
                         configuration.hideBBEndCta(
                             onAnimationEnd = {
                                 viewModel.onUserClickCtaOkButton(configuration)
@@ -4487,7 +4496,7 @@ class BrowserTabFragment :
                 }
             }
 
-            if (onboardingDesignExperimentToggles.buckOnboarding().isEnabled()) {
+            if (onboardingDesignExperimentManager.isBuckEnrolledAndEnabled()) {
                 if (configuration is DaxIntroVisitSiteOptionsCta && context?.resources?.getBoolean(R.bool.show_wing_animation) == true) {
                     lifecycleScope.launch {
                         with(newBrowserTab.wingAnimation) {
@@ -4662,7 +4671,7 @@ class BrowserTabFragment :
         }
 
         private fun hideDaxCta() {
-            if (onboardingDesignExperimentToggles.buckOnboarding().isEnabled()) {
+            if (onboardingDesignExperimentManager.isBuckEnrolledAndEnabled()) {
                 buckDialogInContext.root.gone()
             } else {
                 daxDialogInContext.dialogTextCta.cancelAnimation()