3 files changed, 8 insertions, 38 deletions
diff --git a/src/screens/Onboarding/StepFinished.tsx b/src/screens/Onboarding/StepFinished.tsx
index bc765781a..fdc0a3eb7 100644
--- a/src/screens/Onboarding/StepFinished.tsx
+++ b/src/screens/Onboarding/StepFinished.tsx
@@ -7,27 +7,26 @@ import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useQueryClient} from '@tanstack/react-query'
 
-import {useAnalytics} from '#/lib/analytics/analytics'
+import {uploadBlob} from '#/lib/api'
 import {
   BSKY_APP_ACCOUNT_DID,
   DISCOVER_SAVED_FEED,
   TIMELINE_SAVED_FEED,
 } from '#/lib/constants'
+import {useRequestNotificationsPermission} from '#/lib/notifications/notifications'
 import {logEvent} from '#/lib/statsig/statsig'
 import {logger} from '#/logger'
+import {useSetHasCheckedForStarterPack} from '#/state/preferences/used-starter-packs'
+import {getAllListMembers} from '#/state/queries/list-members'
 import {preferencesQueryKey} from '#/state/queries/preferences'
 import {RQKEY as profileRQKey} from '#/state/queries/profile'
 import {useAgent} from '#/state/session'
 import {useOnboardingDispatch} from '#/state/shell'
 import {useProgressGuideControls} from '#/state/shell/progress-guide'
-import {uploadBlob} from 'lib/api'
-import {useRequestNotificationsPermission} from 'lib/notifications/notifications'
-import {useSetHasCheckedForStarterPack} from 'state/preferences/used-starter-packs'
-import {getAllListMembers} from 'state/queries/list-members'
 import {
   useActiveStarterPack,
   useSetActiveStarterPack,
-} from 'state/shell/starter-pack'
+} from '#/state/shell/starter-pack'
 import {
   DescriptionText,
   OnboardingControls,
@@ -48,7 +47,6 @@ import {Text} from '#/components/Typography'
 export function StepFinished() {
   const {_} = useLingui()
   const t = useTheme()
-  const {track} = useAnalytics()
   const {state, dispatch} = React.useContext(Context)
   const onboardDispatch = useOnboardingDispatch()
   const [saving, setSaving] = React.useState(false)
@@ -190,8 +188,6 @@ export function StepFinished() {
     startProgressGuide('like-10-and-follow-7')
     dispatch({type: 'finish'})
     onboardDispatch({type: 'finish'})
-    track('OnboardingV2:StepFinished:End')
-    track('OnboardingV2:Complete')
     logEvent('onboarding:finished:nextPressed', {
       usedStarterPack: Boolean(starterPack),
       starterPackName: AppBskyGraphStarterpack.isRecord(starterPack?.record)
@@ -214,7 +210,6 @@ export function StepFinished() {
     agent,
     dispatch,
     onboardDispatch,
-    track,
     activeStarterPack,
     state,
     requestNotificationsPermission,
@@ -223,10 +218,6 @@ export function StepFinished() {
     startProgressGuide,
   ])
 
-  React.useEffect(() => {
-    track('OnboardingV2:StepFinished:Start')
-  }, [track])
-
   return (
     <View style={[a.align_start]}>
       <IconCircle icon={Check} style={[a.mb_2xl]} />
diff --git a/src/screens/Onboarding/StepInterests/index.tsx b/src/screens/Onboarding/StepInterests/index.tsx
index ded473ff5..2f41433aa 100644
--- a/src/screens/Onboarding/StepInterests/index.tsx
+++ b/src/screens/Onboarding/StepInterests/index.tsx
@@ -4,7 +4,6 @@ import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useQuery} from '@tanstack/react-query'
 
-import {useAnalytics} from '#/lib/analytics/analytics'
 import {logEvent} from '#/lib/statsig/statsig'
 import {capitalize} from '#/lib/strings/capitalize'
 import {logger} from '#/logger'
@@ -36,7 +35,6 @@ export function StepInterests() {
   const {_} = useLingui()
   const t = useTheme()
   const {gtMobile} = useBreakpoints()
-  const {track} = useAnalytics()
   const interestsDisplayNames = useInterestsDisplayNames()
 
   const {state, dispatch} = React.useContext(Context)
@@ -90,7 +88,6 @@ export function StepInterests() {
           `onboarding: getTaggedSuggestions fetch or processing failed`,
         )
         logger.error(e)
-        track('OnboardingV2:StepInterests:Error')
 
         throw new Error(`a network error occurred`)
       }
@@ -108,11 +105,6 @@ export function StepInterests() {
         selectedInterests: interests,
       })
       dispatch({type: 'next'})
-
-      track('OnboardingV2:StepInterests:End', {
-        selectedInterests: interests,
-        selectedInterestsLength: interests.length,
-      })
       logEvent('onboarding:interests:nextPressed', {
         selectedInterests: interests,
         selectedInterestsLength: interests.length,
@@ -121,18 +113,12 @@ export function StepInterests() {
       logger.info(`onboading: error saving interests`)
       logger.error(e)
     }
-  }, [interests, data, setSaving, dispatch, track])
+  }, [interests, data, setSaving, dispatch])
 
   const skipOnboarding = React.useCallback(() => {
     onboardDispatch({type: 'finish'})
     dispatch({type: 'finish'})
-    track('OnboardingV2:Skip')
-  }, [onboardDispatch, dispatch, track])
-
-  React.useEffect(() => {
-    track('OnboardingV2:Begin')
-    track('OnboardingV2:StepInterests:Start')
-  }, [track])
+  }, [onboardDispatch, dispatch])
 
   const title = isError ? (
     <Trans>Oh no! Something went wrong.</Trans>
diff --git a/src/screens/Onboarding/StepProfile/index.tsx b/src/screens/Onboarding/StepProfile/index.tsx
index 79957da31..663418f22 100644
--- a/src/screens/Onboarding/StepProfile/index.tsx
+++ b/src/screens/Onboarding/StepProfile/index.tsx
@@ -9,7 +9,6 @@ import {
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
-import {useAnalytics} from '#/lib/analytics/analytics'
 import {usePhotoLibraryPermission} from '#/lib/hooks/usePermissions'
 import {compressIfNeeded} from '#/lib/media/manip'
 import {openCropper} from '#/lib/media/picker'
@@ -68,7 +67,6 @@ export function StepProfile() {
   const {_} = useLingui()
   const t = useTheme()
   const {gtMobile} = useBreakpoints()
-  const {track} = useAnalytics()
   const {requestPhotoAccessIfNeeded} = usePhotoLibraryPermission()
   const gate = useGate()
   const requestNotificationsPermission = useRequestNotificationsPermission()
@@ -88,10 +86,6 @@ export function StepProfile() {
   const canvasRef = React.useRef<PlaceholderCanvasRef>(null)
 
   React.useEffect(() => {
-    track('OnboardingV2:StepProfile:Start')
-  }, [track])
-
-  React.useEffect(() => {
     requestNotificationsPermission('StartOnboarding')
   }, [gate, requestNotificationsPermission])
 
@@ -155,9 +149,8 @@ export function StepProfile() {
     }
 
     dispatch({type: 'next'})
-    track('OnboardingV2:StepProfile:End')
     logEvent('onboarding:profile:nextPressed', {})
-  }, [avatar, dispatch, track])
+  }, [avatar, dispatch])
 
   const onDoneCreating = React.useCallback(() => {
     setAvatar(prev => ({