From 6745813df6e5359550a9c6ebd36ec48a8168553c Mon Sep 17 00:00:00 2001
From: Raquel Smith <raquelmsmith@users.noreply.github.com>
Date: Wed, 15 Nov 2023 15:36:31 -0800
Subject: [PATCH] fix

---
 frontend/src/layout/navigation-3000/Navigation.tsx   |  3 +--
 frontend/src/layout/navigation/Navigation.tsx        |  6 ++----
 frontend/src/lib/utils/eventUsageLogic.ts            | 12 ++++++++++++
 frontend/src/scenes/App.tsx                          |  4 +---
 .../scenes/settings/project/AutocaptureSettings.tsx  |  8 ++++----
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/frontend/src/layout/navigation-3000/Navigation.tsx b/frontend/src/layout/navigation-3000/Navigation.tsx
index 851a3fe2b86ab..522dfc2bef618 100644
--- a/frontend/src/layout/navigation-3000/Navigation.tsx
+++ b/frontend/src/layout/navigation-3000/Navigation.tsx
@@ -8,7 +8,7 @@ import './Navigation.scss'
 import { themeLogic } from './themeLogic'
 import { navigation3000Logic } from './navigationLogic'
 import clsx from 'clsx'
-import { Scene, SceneConfig } from 'scenes/sceneTypes'
+import { SceneConfig } from 'scenes/sceneTypes'
 import { FlaggedFeature } from 'lib/components/FlaggedFeature'
 import { FEATURE_FLAGS } from 'lib/constants'
 import { SidePanel } from './sidepanel/SidePanel'
@@ -18,7 +18,6 @@ export function Navigation({
     sceneConfig,
 }: {
     children: ReactNode
-    scene: Scene | null
     sceneConfig: SceneConfig | null
 }): JSX.Element {
     useMountedLogic(themeLogic)
diff --git a/frontend/src/layout/navigation/Navigation.tsx b/frontend/src/layout/navigation/Navigation.tsx
index 57b29956bdde1..18ff8d9fed01f 100644
--- a/frontend/src/layout/navigation/Navigation.tsx
+++ b/frontend/src/layout/navigation/Navigation.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx'
 import { BillingAlertsV2 } from 'lib/components/BillingAlertsV2'
-import { Scene, SceneConfig } from 'scenes/sceneTypes'
+import { SceneConfig } from 'scenes/sceneTypes'
 import { Breadcrumbs } from './Breadcrumbs/Breadcrumbs'
 import { ProjectNotice } from './ProjectNotice'
 import { SideBar } from './SideBar/SideBar'
@@ -9,16 +9,14 @@ import { ReactNode } from 'react'
 
 export function Navigation({
     children,
-    scene,
     sceneConfig,
 }: {
     children: ReactNode
-    scene: Scene | null
     sceneConfig: SceneConfig | null
 }): JSX.Element {
     return (
         <div className="h-screen flex flex-col">
-            {scene !== Scene.Ingestion && <TopBar />}
+            <TopBar />
             <SideBar>
                 <div
                     className={clsx(
diff --git a/frontend/src/lib/utils/eventUsageLogic.ts b/frontend/src/lib/utils/eventUsageLogic.ts
index 23c4f0d53f14d..5ce1faefa6d13 100644
--- a/frontend/src/lib/utils/eventUsageLogic.ts
+++ b/frontend/src/lib/utils/eventUsageLogic.ts
@@ -438,6 +438,8 @@ export const eventUsageLogic = kea<eventUsageLogicType>([
         reportRecordingOpenedFromRecentRecordingList: true,
         reportPersonOpenedFromNewlySeenPersonsList: true,
         reportIngestionContinueWithoutVerifying: true,
+        reportAutocaptureToggled: (autocapture_opt_out: boolean) => ({ autocapture_opt_out }),
+        reportAutocaptureExceptionsToggled: (autocapture_opt_in: boolean) => ({ autocapture_opt_in }),
         reportFailedToCreateFeatureFlagWithCohort: (code: string, detail: string) => ({ code, detail }),
         reportInviteMembersButtonClicked: true,
         reportDashboardLoadingTime: (loadingMilliseconds: number, dashboardId: number) => ({
@@ -1029,6 +1031,16 @@ export const eventUsageLogic = kea<eventUsageLogicType>([
         reportIngestionContinueWithoutVerifying: () => {
             posthog.capture('ingestion continue without verifying')
         },
+        reportAutocaptureToggled: ({ autocapture_opt_out }) => {
+            posthog.capture('autocapture toggled', {
+                autocapture_opt_out,
+            })
+        },
+        reportAutocaptureExceptionsToggled: ({ autocapture_opt_in }) => {
+            posthog.capture('autocapture exceptions toggled', {
+                autocapture_opt_in,
+            })
+        },
         reportFailedToCreateFeatureFlagWithCohort: ({ detail, code }) => {
             posthog.capture('failed to create feature flag with cohort', { detail, code })
         },
diff --git a/frontend/src/scenes/App.tsx b/frontend/src/scenes/App.tsx
index bfeb6836c9ef0..225efc7dffeaa 100644
--- a/frontend/src/scenes/App.tsx
+++ b/frontend/src/scenes/App.tsx
@@ -165,9 +165,7 @@ function AppScene(): JSX.Element | null {
 
     return (
         <>
-            <Navigation scene={activeScene} sceneConfig={sceneConfig}>
-                {wrappedSceneElement}
-            </Navigation>
+            <Navigation sceneConfig={sceneConfig}>{wrappedSceneElement}</Navigation>
             {toastContainer}
             <GlobalModals />
         </>
diff --git a/frontend/src/scenes/settings/project/AutocaptureSettings.tsx b/frontend/src/scenes/settings/project/AutocaptureSettings.tsx
index e65c24e6f76b5..4a53145ff2c5b 100644
--- a/frontend/src/scenes/settings/project/AutocaptureSettings.tsx
+++ b/frontend/src/scenes/settings/project/AutocaptureSettings.tsx
@@ -11,7 +11,7 @@ export function AutocaptureSettings(): JSX.Element {
     const { userLoading } = useValues(userLogic)
     const { currentTeam } = useValues(teamLogic)
     const { updateCurrentTeam } = useActions(teamLogic)
-    const { reportIngestionAutocaptureToggled } = useActions(eventUsageLogic)
+    const { reportAutocaptureToggled } = useActions(eventUsageLogic)
 
     return (
         <>
@@ -33,7 +33,7 @@ export function AutocaptureSettings(): JSX.Element {
                         updateCurrentTeam({
                             autocapture_opt_out: !checked,
                         })
-                        reportIngestionAutocaptureToggled(!checked)
+                        reportAutocaptureToggled(!checked)
                     }}
                     checked={!currentTeam?.autocapture_opt_out}
                     disabled={userLoading}
@@ -49,7 +49,7 @@ export function ExceptionAutocaptureSettings(): JSX.Element {
     const { userLoading } = useValues(userLogic)
     const { currentTeam } = useValues(teamLogic)
     const { updateCurrentTeam } = useActions(teamLogic)
-    const { reportIngestionAutocaptureExceptionsToggled } = useActions(eventUsageLogic)
+    const { reportAutocaptureExceptionsToggled } = useActions(eventUsageLogic)
 
     const { errorsToIgnoreRules, rulesCharacters } = useValues(autocaptureExceptionsLogic)
     const { setErrorsToIgnoreRules } = useActions(autocaptureExceptionsLogic)
@@ -62,7 +62,7 @@ export function ExceptionAutocaptureSettings(): JSX.Element {
                     updateCurrentTeam({
                         autocapture_exceptions_opt_in: checked,
                     })
-                    reportIngestionAutocaptureExceptionsToggled(checked)
+                    reportAutocaptureExceptionsToggled(checked)
                 }}
                 checked={!!currentTeam?.autocapture_exceptions_opt_in}
                 disabled={userLoading}