Remove Segment (#5518)

17 files changed, 70 insertions, 154 deletions

diff --git a/src/view/com/auth/LoggedOut.tsx b/src/view/com/auth/LoggedOut.tsx
index cc5723805..5b9e3932f 100644
--- a/src/view/com/auth/LoggedOut.tsx
+++ b/src/view/com/auth/LoggedOut.tsx
@@ -4,7 +4,6 @@ import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
-import {useAnalytics} from '#/lib/analytics/analytics'
 import {usePalette} from '#/lib/hooks/usePalette'
 import {logEvent} from '#/lib/statsig/statsig'
 import {s} from '#/lib/styles'
@@ -32,7 +31,6 @@ export function LoggedOut({onDismiss}: {onDismiss?: () => void}) {
   const {_} = useLingui()
   const pal = usePalette('default')
   const setMinimalShellMode = useSetMinimalShellMode()
-  const {screen} = useAnalytics()
   const {requestedAccountSwitchTo} = useLoggedOutView()
   const [screenState, setScreenState] = React.useState<ScreenState>(() => {
     if (requestedAccountSwitchTo === 'new') {
@@ -48,9 +46,8 @@ export function LoggedOut({onDismiss}: {onDismiss?: () => void}) {
   const {clearRequestedAccount} = useLoggedOutViewControls()
 
   React.useEffect(() => {
-    screen('Login')
     setMinimalShellMode(true)
-  }, [screen, setMinimalShellMode])
+  }, [setMinimalShellMode])
 
   const onPressDismiss = React.useCallback(() => {
     if (onDismiss) {
diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx
index 49ce0d442..ade37af1b 100644
--- a/src/view/com/composer/Composer.tsx
+++ b/src/view/com/composer/Composer.tsx
@@ -45,7 +45,6 @@ import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
-import {useAnalytics} from '#/lib/analytics/analytics'
 import * as apilib from '#/lib/api/index'
 import {until} from '#/lib/async/until'
 import {MAX_GRAPHEME_LENGTH} from '#/lib/constants'
@@ -147,7 +146,6 @@ export const ComposePost = ({
   const {data: currentProfile} = useProfileQuery({did: currentAccount!.did})
   const {isModalActive} = useModals()
   const {closeComposer} = useComposerControls()
-  const {track} = useAnalytics()
   const pal = usePalette('default')
   const {isMobile} = useWebMediaQueries()
   const {_} = useLingui()
@@ -310,7 +308,6 @@ export const ComposePost = ({
 
   const onPhotoPasted = useCallback(
     async (uri: string) => {
-      track('Composer:PastedPhotos')
       if (uri.startsWith('data:video/')) {
         selectVideo({uri, type: 'video', height: 0, width: 0})
       } else {
@@ -318,7 +315,7 @@ export const ComposePost = ({
         onImageAdd([res])
       }
     },
-    [track, selectVideo, onImageAdd],
+    [selectVideo, onImageAdd],
   )
 
   const isAltTextRequiredAndMissing = useMemo(() => {
@@ -446,10 +443,6 @@ export const ComposePost = ({
             logContext: 'Composer',
           })
         }
-        track('Create Post', {
-          imageCount: images.length,
-        })
-        if (replyTo && replyTo.uri) track('Post:Reply')
       }
       if (postUri && !replyTo) {
         emitPostCreated()
@@ -499,7 +492,6 @@ export const ComposePost = ({
       setExtLink,
       setLangPrefs,
       threadgateAllowUISettings,
-      track,
       videoAltText,
       videoUploadState.asset,
       videoUploadState.pendingPublish,
diff --git a/src/view/com/composer/photos/OpenCameraBtn.tsx b/src/view/com/composer/photos/OpenCameraBtn.tsx
index 2183ca790..79d59a92d 100644
--- a/src/view/com/composer/photos/OpenCameraBtn.tsx
+++ b/src/view/com/composer/photos/OpenCameraBtn.tsx
@@ -3,7 +3,6 @@ import * as MediaLibrary from 'expo-media-library'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
-import {useAnalytics} from '#/lib/analytics/analytics'
 import {POST_IMG_MAX} from '#/lib/constants'
 import {useCameraPermission} from '#/lib/hooks/usePermissions'
 import {openCamera} from '#/lib/media/picker'
@@ -20,7 +19,6 @@ type Props = {
 }
 
 export function OpenCameraBtn({disabled, onAdd}: Props) {
-  const {track} = useAnalytics()
   const {_} = useLingui()
   const {requestCameraAccessIfNeeded} = useCameraPermission()
   const [mediaPermissionRes, requestMediaPermission] =
@@ -28,7 +26,6 @@ export function OpenCameraBtn({disabled, onAdd}: Props) {
   const t = useTheme()
 
   const onPressTakePicture = useCallback(async () => {
-    track('Composer:CameraOpened')
     try {
       if (!(await requestCameraAccessIfNeeded())) {
         return
@@ -58,7 +55,6 @@ export function OpenCameraBtn({disabled, onAdd}: Props) {
     }
   }, [
     onAdd,
-    track,
     requestCameraAccessIfNeeded,
     mediaPermissionRes,
     requestMediaPermission,
diff --git a/src/view/com/composer/photos/SelectPhotoBtn.tsx b/src/view/com/composer/photos/SelectPhotoBtn.tsx
index 95d2df022..34ead3d9a 100644
--- a/src/view/com/composer/photos/SelectPhotoBtn.tsx
+++ b/src/view/com/composer/photos/SelectPhotoBtn.tsx
@@ -3,7 +3,6 @@ import React, {useCallback} from 'react'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
-import {useAnalytics} from '#/lib/analytics/analytics'
 import {usePhotoLibraryPermission} from '#/lib/hooks/usePermissions'
 import {openPicker} from '#/lib/media/picker'
 import {isNative} from '#/platform/detection'
@@ -19,14 +18,11 @@ type Props = {
 }
 
 export function SelectPhotoBtn({size, disabled, onAdd}: Props) {
-  const {track} = useAnalytics()
   const {_} = useLingui()
   const {requestPhotoAccessIfNeeded} = usePhotoLibraryPermission()
   const t = useTheme()
 
   const onPressSelectPhotos = useCallback(async () => {
-    track('Composer:GalleryOpened')
-
     if (isNative && !(await requestPhotoAccessIfNeeded())) {
       return
     }
@@ -41,7 +37,7 @@ export function SelectPhotoBtn({size, disabled, onAdd}: Props) {
     )
 
     onAdd(results)
-  }, [track, requestPhotoAccessIfNeeded, size, onAdd])
+  }, [requestPhotoAccessIfNeeded, size, onAdd])
 
   return (
     <Button
diff --git a/src/view/com/composer/threadgate/ThreadgateBtn.tsx b/src/view/com/composer/threadgate/ThreadgateBtn.tsx
index c4ce9a232..b0806180c 100644
--- a/src/view/com/composer/threadgate/ThreadgateBtn.tsx
+++ b/src/view/com/composer/threadgate/ThreadgateBtn.tsx
@@ -7,7 +7,6 @@ import {useLingui} from '@lingui/react'
 
 import {isNative} from '#/platform/detection'
 import {ThreadgateAllowUISetting} from '#/state/queries/threadgate'
-import {useAnalytics} from 'lib/analytics/analytics'
 import {atoms as a, useTheme} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
@@ -30,13 +29,11 @@ export function ThreadgateBtn({
 
   style?: StyleProp<AnimatedStyle<ViewStyle>>
 }) {
-  const {track} = useAnalytics()
   const {_} = useLingui()
   const t = useTheme()
   const control = Dialog.useDialogControl()
 
   const onPress = () => {
-    track('Composer:ThreadgateOpened')
     if (isNative && Keyboard.isVisible()) {
       Keyboard.dismiss()
     }
diff --git a/src/view/com/feeds/FeedPage.tsx b/src/view/com/feeds/FeedPage.tsx
index f1d03a7ca..d61a81498 100644
--- a/src/view/com/feeds/FeedPage.tsx
+++ b/src/view/com/feeds/FeedPage.tsx
@@ -6,8 +6,11 @@ import {useLingui} from '@lingui/react'
 import {NavigationProp, useNavigation} from '@react-navigation/native'
 import {useQueryClient} from '@tanstack/react-query'
 
+import {ComposeIcon2} from '#/lib/icons'
 import {getRootNavigation, getTabState, TabState} from '#/lib/routes/helpers'
+import {AllNavigatorParams} from '#/lib/routes/types'
 import {logEvent} from '#/lib/statsig/statsig'
+import {s} from '#/lib/styles'
 import {isNative} from '#/platform/detection'
 import {listenSoftReset} from '#/state/events'
 import {FeedFeedbackProvider, useFeedFeedback} from '#/state/feed-feedback'
@@ -17,10 +20,6 @@ import {truncateAndInvalidate} from '#/state/queries/util'
 import {useSession} from '#/state/session'
 import {useSetMinimalShellMode} from '#/state/shell'
 import {useComposerControls} from '#/state/shell/composer'
-import {useAnalytics} from 'lib/analytics/analytics'
-import {ComposeIcon2} from 'lib/icons'
-import {AllNavigatorParams} from 'lib/routes/types'
-import {s} from 'lib/styles'
 import {useHeaderOffset} from '#/components/hooks/useHeaderOffset'
 import {Feed} from '../posts/Feed'
 import {FAB} from '../util/fab/FAB'
@@ -54,7 +53,6 @@ export function FeedPage({
   const {openComposer} = useComposerControls()
   const [isScrolledDown, setIsScrolledDown] = React.useState(false)
   const setMinimalShellMode = useSetMinimalShellMode()
-  const {screen, track} = useAnalytics()
   const headerOffset = useHeaderOffset()
   const feedFeedback = useFeedFeedback(feed, hasSession)
   const scrollElRef = React.useRef<ListMethods>(null)
@@ -89,14 +87,12 @@ export function FeedPage({
     if (!isPageFocused) {
       return
     }
-    screen('Feed')
     return listenSoftReset(onSoftReset)
-  }, [onSoftReset, screen, isPageFocused])
+  }, [onSoftReset, isPageFocused])
 
   const onPressCompose = React.useCallback(() => {
-    track('HomeScreen:PressCompose')
     openComposer({})
-  }, [openComposer, track])
+  }, [openComposer])
 
   const onPressLoadLatest = React.useCallback(() => {
     scrollToTop()
diff --git a/src/view/com/lists/ListMembers.tsx b/src/view/com/lists/ListMembers.tsx
index 4f2b56426..cf7bb6b9e 100644
--- a/src/view/com/lists/ListMembers.tsx
+++ b/src/view/com/lists/ListMembers.tsx
@@ -7,21 +7,21 @@ import {
   ViewStyle,
 } from 'react-native'
 import {AppBskyActorDefs, AppBskyGraphDefs} from '@atproto/api'
-import {List, ListRef} from '../util/List'
-import {ProfileCardFeedLoadingPlaceholder} from '../util/LoadingPlaceholder'
-import {ErrorMessage} from '../util/error/ErrorMessage'
-import {LoadMoreRetryBtn} from '../util/LoadMoreRetryBtn'
-import {ProfileCard} from '../profile/ProfileCard'
-import {Button} from '../util/forms/Button'
-import {useAnalytics} from 'lib/analytics/analytics'
-import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
-import {useListMembersQuery} from '#/state/queries/list-members'
+import {msg} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
+
+import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
+import {cleanError} from '#/lib/strings/errors'
 import {logger} from '#/logger'
 import {useModalControls} from '#/state/modals'
+import {useListMembersQuery} from '#/state/queries/list-members'
 import {useSession} from '#/state/session'
-import {cleanError} from '#/lib/strings/errors'
-import {useLingui} from '@lingui/react'
-import {msg} from '@lingui/macro'
+import {ProfileCard} from '../profile/ProfileCard'
+import {ErrorMessage} from '../util/error/ErrorMessage'
+import {Button} from '../util/forms/Button'
+import {List, ListRef} from '../util/List'
+import {ProfileCardFeedLoadingPlaceholder} from '../util/LoadingPlaceholder'
+import {LoadMoreRetryBtn} from '../util/LoadMoreRetryBtn'
 
 const LOADING_ITEM = {_reactKey: '__loading__'}
 const EMPTY_ITEM = {_reactKey: '__empty__'}
@@ -51,7 +51,6 @@ export function ListMembers({
   headerOffset?: number
   desktopFixedHeightOffset?: number
 }) {
-  const {track} = useAnalytics()
   const {_} = useLingui()
   const [isRefreshing, setIsRefreshing] = React.useState(false)
   const {isMobile} = useWebMediaQueries()
@@ -98,7 +97,6 @@ export function ListMembers({
   // =
 
   const onRefresh = React.useCallback(async () => {
-    track('Lists:onRefresh')
     setIsRefreshing(true)
     try {
       await refetch()
@@ -106,17 +104,16 @@ export function ListMembers({
       logger.error('Failed to refresh lists', {message: err})
     }
     setIsRefreshing(false)
-  }, [refetch, track, setIsRefreshing])
+  }, [refetch, setIsRefreshing])
 
   const onEndReached = React.useCallback(async () => {
     if (isFetching || !hasNextPage || isError) return
-    track('Lists:onEndReached')
     try {
       await fetchNextPage()
     } catch (err) {
       logger.error('Failed to load more lists', {message: err})
     }
-  }, [isFetching, hasNextPage, isError, fetchNextPage, track])
+  }, [isFetching, hasNextPage, isError, fetchNextPage])
 
   const onPressRetryLoadMore = React.useCallback(() => {
     fetchNextPage()
diff --git a/src/view/com/lists/MyLists.tsx b/src/view/com/lists/MyLists.tsx
index b56fa6c75..363dd100d 100644
--- a/src/view/com/lists/MyLists.tsx
+++ b/src/view/com/lists/MyLists.tsx
@@ -11,15 +11,14 @@ import {AppBskyGraphDefs as GraphDefs} from '@atproto/api'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
+import {usePalette} from '#/lib/hooks/usePalette'
 import {cleanError} from '#/lib/strings/errors'
+import {s} from '#/lib/styles'
 import {logger} from '#/logger'
+import {isWeb} from '#/platform/detection'
+import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {MyListsFilter, useMyListsQuery} from '#/state/queries/my-lists'
-import {useAnalytics} from 'lib/analytics/analytics'
-import {usePalette} from 'lib/hooks/usePalette'
-import {s} from 'lib/styles'
-import {isWeb} from 'platform/detection'
-import {useModerationOpts} from 'state/preferences/moderation-opts'
-import {EmptyState} from 'view/com/util/EmptyState'
+import {EmptyState} from '#/view/com/util/EmptyState'
 import {atoms as a, useTheme} from '#/alf'
 import * as ListCard from '#/components/ListCard'
 import {ErrorMessage} from '../util/error/ErrorMessage'
@@ -44,7 +43,6 @@ export function MyLists({
 }) {
   const pal = usePalette('default')
   const t = useTheme()
-  const {track} = useAnalytics()
   const {_} = useLingui()
   const moderationOpts = useModerationOpts()
   const [isPTRing, setIsPTRing] = React.useState(false)
@@ -71,7 +69,6 @@ export function MyLists({
   // =
 
   const onRefresh = React.useCallback(async () => {
-    track('Lists:onRefresh')
     setIsPTRing(true)
     try {
       await refetch()
@@ -79,7 +76,7 @@ export function MyLists({
       logger.error('Failed to refresh lists', {message: err})
     }
     setIsPTRing(false)
-  }, [refetch, track, setIsPTRing])
+  }, [refetch, setIsPTRing])
 
   // rendering
   // =
diff --git a/src/view/com/lists/ProfileLists.tsx b/src/view/com/lists/ProfileLists.tsx
index 117164413..27b7f94df 100644
--- a/src/view/com/lists/ProfileLists.tsx
+++ b/src/view/com/lists/ProfileLists.tsx
@@ -10,7 +10,6 @@ import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useQueryClient} from '@tanstack/react-query'
 
-import {useAnalytics} from '#/lib/analytics/analytics'
 import {cleanError} from '#/lib/strings/errors'
 import {logger} from '#/logger'
 import {isNative, isWeb} from '#/platform/detection'
@@ -48,7 +47,6 @@ export const ProfileLists = React.forwardRef<SectionRef, ProfileListsProps>(
     ref,
   ) {
     const t = useTheme()
-    const {track} = useAnalytics()
     const {_} = useLingui()
     const [isPTRing, setIsPTRing] = React.useState(false)
     const opts = React.useMemo(() => ({enabled}), [enabled])
@@ -102,7 +100,6 @@ export const ProfileLists = React.forwardRef<SectionRef, ProfileListsProps>(
     }))
 
     const onRefresh = React.useCallback(async () => {
-      track('Lists:onRefresh')
       setIsPTRing(true)
       try {
         await refetch()
@@ -110,18 +107,16 @@ export const ProfileLists = React.forwardRef<SectionRef, ProfileListsProps>(
         logger.error('Failed to refresh lists', {message: err})
       }
       setIsPTRing(false)
-    }, [refetch, track, setIsPTRing])
+    }, [refetch, setIsPTRing])
 
     const onEndReached = React.useCallback(async () => {
       if (isFetching || !hasNextPage || isError) return
-
-      track('Lists:onEndReached')
       try {
         await fetchNextPage()
       } catch (err) {
         logger.error('Failed to load more lists', {message: err})
       }
-    }, [isFetching, hasNextPage, isError, fetchNextPage, track])
+    }, [isFetching, hasNextPage, isError, fetchNextPage])
 
     const onPressRetryLoadMore = React.useCallback(() => {
       fetchNextPage()
diff --git a/src/view/com/modals/ChangeHandle.tsx b/src/view/com/modals/ChangeHandle.tsx
index 54750acf2..2181a94aa 100644
--- a/src/view/com/modals/ChangeHandle.tsx
+++ b/src/view/com/modals/ChangeHandle.tsx
@@ -11,17 +11,16 @@ import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
+import {usePalette} from '#/lib/hooks/usePalette'
+import {cleanError} from '#/lib/strings/errors'
+import {createFullHandle, makeValidHandle} from '#/lib/strings/handles'
+import {s} from '#/lib/styles'
+import {useTheme} from '#/lib/ThemeContext'
 import {logger} from '#/logger'
 import {useModalControls} from '#/state/modals'
 import {useFetchDid, useUpdateHandleMutation} from '#/state/queries/handle'
 import {useServiceQuery} from '#/state/queries/service'
 import {SessionAccount, useAgent, useSession} from '#/state/session'
-import {useAnalytics} from 'lib/analytics/analytics'
-import {usePalette} from 'lib/hooks/usePalette'
-import {cleanError} from 'lib/strings/errors'
-import {createFullHandle, makeValidHandle} from 'lib/strings/handles'
-import {s} from 'lib/styles'
-import {useTheme} from 'lib/ThemeContext'
 import {ErrorMessage} from '../util/error/ErrorMessage'
 import {Button} from '../util/forms/Button'
 import {SelectableBtn} from '../util/forms/SelectableBtn'
@@ -67,7 +66,6 @@ export function Inner({
 }) {
   const {_} = useLingui()
   const pal = usePalette('default')
-  const {track} = useAnalytics()
   const {closeModal} = useModalControls()
   const {mutateAsync: updateHandle, isPending: isUpdateHandlePending} =
     useUpdateHandleMutation()
@@ -91,10 +89,7 @@ export function Inner({
     setHandle('')
     setCanSave(false)
     setCustom(!isCustom)
-    track(
-      isCustom ? 'EditHandle:ViewCustomForm' : 'EditHandle:ViewProvidedForm',
-    )
-  }, [setCustom, isCustom, track])
+  }, [setCustom, isCustom])
   const onPressSave = React.useCallback(async () => {
     if (!userDomain) {
       logger.error(`ChangeHandle: userDomain is undefined`, {
@@ -105,7 +100,6 @@ export function Inner({
     }
 
     try {
-      track('EditHandle:SetNewHandle')
       const newHandle = isCustom ? handle : createFullHandle(handle, userDomain)
       logger.debug(`Updating handle to ${newHandle}`)
       await updateHandle({
@@ -125,7 +119,6 @@ export function Inner({
     userDomain,
     isCustom,
     onChanged,
-    track,
     closeModal,
     updateHandle,
     serviceInfo,
diff --git a/src/view/com/modals/CreateOrEditList.tsx b/src/view/com/modals/CreateOrEditList.tsx
index 7717f597d..8f5487733 100644
--- a/src/view/com/modals/CreateOrEditList.tsx
+++ b/src/view/com/modals/CreateOrEditList.tsx
@@ -14,7 +14,6 @@ import {AppBskyGraphDefs, RichText as RichTextAPI} from '@atproto/api'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
-import {useAnalytics} from '#/lib/analytics/analytics'
 import {usePalette} from '#/lib/hooks/usePalette'
 import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
 import {compressIfNeeded} from '#/lib/media/manip'
@@ -54,7 +53,6 @@ export function Component({
   const [error, setError] = useState<string>('')
   const pal = usePalette('default')
   const theme = useTheme()
-  const {track} = useAnalytics()
   const {_} = useLingui()
   const listCreateMutation = useListCreateMutation()
   const listMetadataMutation = useListMetadataMutation()
@@ -120,7 +118,6 @@ export function Component({
         setAvatar(undefined)
         return
       }
-      track('CreateList:AvatarSelected')
       try {
         const finalImg = await compressIfNeeded(img, 1000000)
         setNewAvatar(finalImg)
@@ -129,15 +126,10 @@ export function Component({
         setError(cleanError(e))
       }
     },
-    [track, setNewAvatar, setAvatar, setError],
+    [setNewAvatar, setAvatar, setError],
   )
 
   const onPressSave = useCallback(async () => {
-    if (isCurateList) {
-      track('CreateList:SaveCurateList')
-    } else {
-      track('CreateList:SaveModList')
-    }
     const nameTrimmed = name.trim()
     if (!nameTrimmed) {
       setError(_(msg`Name is required`))
@@ -200,7 +192,6 @@ export function Component({
     }
     setProcessing(false)
   }, [
-    track,
     setProcessing,
     setError,
     error,
diff --git a/src/view/com/modals/EditProfile.tsx b/src/view/com/modals/EditProfile.tsx
index b4cb8e013..1e94f483e 100644
--- a/src/view/com/modals/EditProfile.tsx
+++ b/src/view/com/modals/EditProfile.tsx
@@ -15,7 +15,6 @@ import {AppBskyActorDefs} from '@atproto/api'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
-import {useAnalytics} from '#/lib/analytics/analytics'
 import {MAX_DESCRIPTION, MAX_DISPLAY_NAME} from '#/lib/constants'
 import {usePalette} from '#/lib/hooks/usePalette'
 import {compressIfNeeded} from '#/lib/media/manip'
@@ -47,7 +46,6 @@ export function Component({
 }) {
   const pal = usePalette('default')
   const theme = useTheme()
-  const {track} = useAnalytics()
   const {_} = useLingui()
   const {closeModal} = useModalControls()
   const updateMutation = useProfileUpdateMutation()
@@ -81,7 +79,6 @@ export function Component({
         setUserAvatar(null)
         return
       }
-      track('EditProfile:AvatarSelected')
       try {
         const finalImg = await compressIfNeeded(img, 1000000)
         setNewUserAvatar(finalImg)
@@ -90,7 +87,7 @@ export function Component({
         setImageError(cleanError(e))
       }
     },
-    [track, setNewUserAvatar, setUserAvatar, setImageError],
+    [setNewUserAvatar, setUserAvatar, setImageError],
   )
 
   const onSelectNewBanner = useCallback(
@@ -101,7 +98,6 @@ export function Component({
         setUserBanner(null)
         return
       }
-      track('EditProfile:BannerSelected')
       try {
         const finalImg = await compressIfNeeded(img, 1000000)
         setNewUserBanner(finalImg)
@@ -110,11 +106,10 @@ export function Component({
         setImageError(cleanError(e))
       }
     },
-    [track, setNewUserBanner, setUserBanner, setImageError],
+    [setNewUserBanner, setUserBanner, setImageError],
   )
 
   const onPressSave = useCallback(async () => {
-    track('EditProfile:Save')
     setImageError('')
     try {
       await updateMutation.mutateAsync({
@@ -133,7 +128,6 @@ export function Component({
       logger.error('Failed to update user profile', {message: String(e)})
     }
   }, [
-    track,
     updateMutation,
     profile,
     onUpdate,
diff --git a/src/view/com/post-thread/PostThreadFollowBtn.tsx b/src/view/com/post-thread/PostThreadFollowBtn.tsx
index 914ee3b66..b75731f6f 100644
--- a/src/view/com/post-thread/PostThreadFollowBtn.tsx
+++ b/src/view/com/post-thread/PostThreadFollowBtn.tsx
@@ -6,19 +6,18 @@ import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useNavigation} from '@react-navigation/native'
 
+import {usePalette} from '#/lib/hooks/usePalette'
+import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
+import {s} from '#/lib/styles'
 import {logger} from '#/logger'
-import {track} from 'lib/analytics/analytics'
-import {usePalette} from 'lib/hooks/usePalette'
-import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
-import {s} from 'lib/styles'
-import {Shadow, useProfileShadow} from 'state/cache/profile-shadow'
+import {Shadow, useProfileShadow} from '#/state/cache/profile-shadow'
 import {
   useProfileFollowMutationQueue,
   useProfileQuery,
-} from 'state/queries/profile'
-import {useRequireAuth} from 'state/session'
-import {Text} from 'view/com/util/text/Text'
-import * as Toast from 'view/com/util/Toast'
+} from '#/state/queries/profile'
+import {useRequireAuth} from '#/state/session'
+import {Text} from '#/view/com/util/text/Text'
+import * as Toast from '#/view/com/util/Toast'
 
 export function PostThreadFollowBtn({did}: {did: string}) {
   const {data: profile, isLoading} = useProfileQuery({did})
@@ -89,7 +88,6 @@ function PostThreadFollowBtnLoaded({
     if (!isFollowing) {
       requireAuth(async () => {
         try {
-          track('ProfileHeader:FollowButtonClicked')
           await queueFollow()
         } catch (e: any) {
           if (e?.name !== 'AbortError') {
@@ -101,7 +99,6 @@ function PostThreadFollowBtnLoaded({
     } else {
       requireAuth(async () => {
         try {
-          track('ProfileHeader:UnfollowButtonClicked')
           await queueUnfollow()
         } catch (e: any) {
           if (e?.name !== 'AbortError') {
diff --git a/src/view/com/posts/Feed.tsx b/src/view/com/posts/Feed.tsx
index 498ab48ee..905c1e0e0 100644
--- a/src/view/com/posts/Feed.tsx
+++ b/src/view/com/posts/Feed.tsx
@@ -14,7 +14,6 @@ import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useQueryClient} from '@tanstack/react-query'
 
-import {useAnalytics} from '#/lib/analytics/analytics'
 import {DISCOVER_FEED_URI, KNOWN_SHUTDOWN_FEEDS} from '#/lib/constants'
 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender'
 import {logEvent, useGate} from '#/lib/statsig/statsig'
@@ -196,7 +195,6 @@ let Feed = ({
   initialNumToRender?: number
 }): React.ReactNode => {
   const theme = useTheme()
-  const {track} = useAnalytics()
   const {_} = useLingui()
   const queryClient = useQueryClient()
   const {currentAccount, hasSession} = useSession()
@@ -405,7 +403,6 @@ let Feed = ({
   // =
 
   const onRefresh = React.useCallback(async () => {
-    track('Feed:onRefresh')
     logEvent('feed:refresh:sampled', {
       feedType: feedType,
       feedUrl: feed,
@@ -419,7 +416,7 @@ let Feed = ({
       logger.error('Failed to refresh posts feed', {message: err})
     }
     setIsPTRing(false)
-  }, [refetch, track, setIsPTRing, onHasNew, feed, feedType])
+  }, [refetch, setIsPTRing, onHasNew, feed, feedType])
 
   const onEndReached = React.useCallback(async () => {
     if (isFetching || !hasNextPage || isError) return
@@ -429,7 +426,6 @@ let Feed = ({
       feedUrl: feed,
       itemCount: feedItems.length,
     })
-    track('Feed:onEndReached')
     try {
       await fetchNextPage()
     } catch (err) {
@@ -440,7 +436,6 @@ let Feed = ({
     hasNextPage,
     isError,
     fetchNextPage,
-    track,
     feed,
     feedType,
     feedItems.length,
diff --git a/src/view/com/profile/ProfileMenu.tsx b/src/view/com/profile/ProfileMenu.tsx
index 451c07674..aaa8a93e6 100644
--- a/src/view/com/profile/ProfileMenu.tsx
+++ b/src/view/com/profile/ProfileMenu.tsx
@@ -6,23 +6,22 @@ import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useQueryClient} from '@tanstack/react-query'
 
+import {HITSLOP_10} from '#/lib/constants'
+import {makeProfileLink} from '#/lib/routes/links'
+import {shareUrl} from '#/lib/sharing'
+import {toShareUrl} from '#/lib/strings/url-helpers'
 import {logger} from '#/logger'
-import {useAnalytics} from 'lib/analytics/analytics'
-import {HITSLOP_10} from 'lib/constants'
-import {makeProfileLink} from 'lib/routes/links'
-import {shareUrl} from 'lib/sharing'
-import {toShareUrl} from 'lib/strings/url-helpers'
-import {Shadow} from 'state/cache/types'
-import {useModalControls} from 'state/modals'
+import {Shadow} from '#/state/cache/types'
+import {useModalControls} from '#/state/modals'
 import {
   RQKEY as profileQueryKey,
   useProfileBlockMutationQueue,
   useProfileFollowMutationQueue,
   useProfileMuteMutationQueue,
-} from 'state/queries/profile'
-import {useSession} from 'state/session'
-import {EventStopper} from 'view/com/util/EventStopper'
-import * as Toast from 'view/com/util/Toast'
+} from '#/state/queries/profile'
+import {useSession} from '#/state/session'
+import {EventStopper} from '#/view/com/util/EventStopper'
+import * as Toast from '#/view/com/util/Toast'
 import {atoms as a, useTheme} from '#/alf'
 import {ArrowOutOfBox_Stroke2_Corner0_Rounded as Share} from '#/components/icons/ArrowOutOfBox'
 import {Flag_Stroke2_Corner0_Rounded as Flag} from '#/components/icons/Flag'
@@ -49,7 +48,6 @@ let ProfileMenu = ({
   const t = useTheme()
   // TODO ALF this
   const alf = useTheme()
-  const {track} = useAnalytics()
   const {openModal} = useModalControls()
   const reportDialogControl = useReportDialogControl()
   const queryClient = useQueryClient()
@@ -83,12 +81,10 @@ let ProfileMenu = ({
   }, [queryClient, profile.did])
 
   const onPressShare = React.useCallback(() => {
-    track('ProfileHeader:ShareButtonClicked')
     shareUrl(toShareUrl(makeProfileLink(profile)))
-  }, [track, profile])
+  }, [profile])
 
   const onPressAddRemoveLists = React.useCallback(() => {
-    track('ProfileHeader:AddToListsButtonClicked')
     openModal({
       name: 'user-add-remove-lists',
       subject: profile.did,
@@ -97,11 +93,10 @@ let ProfileMenu = ({
       onAdd: invalidateProfileQuery,
       onRemove: invalidateProfileQuery,
     })
-  }, [track, profile, openModal, invalidateProfileQuery])
+  }, [profile, openModal, invalidateProfileQuery])
 
   const onPressMuteAccount = React.useCallback(async () => {
     if (profile.viewer?.muted) {
-      track('ProfileHeader:UnmuteAccountButtonClicked')
       try {
         await queueUnmute()
         Toast.show(_(msg`Account unmuted`))
@@ -112,7 +107,6 @@ let ProfileMenu = ({
         }
       }
     } else {
-      track('ProfileHeader:MuteAccountButtonClicked')
       try {
         await queueMute()
         Toast.show(_(msg`Account muted`))
@@ -123,11 +117,10 @@ let ProfileMenu = ({
         }
       }
     }
-  }, [profile.viewer?.muted, track, queueUnmute, _, queueMute])
+  }, [profile.viewer?.muted, queueUnmute, _, queueMute])
 
   const blockAccount = React.useCallback(async () => {
     if (profile.viewer?.blocking) {
-      track('ProfileHeader:UnblockAccountButtonClicked')
       try {
         await queueUnblock()
         Toast.show(_(msg`Account unblocked`))
@@ -138,7 +131,6 @@ let ProfileMenu = ({
         }
       }
     } else {
-      track('ProfileHeader:BlockAccountButtonClicked')
       try {
         await queueBlock()
         Toast.show(_(msg`Account blocked`))
@@ -149,10 +141,9 @@ let ProfileMenu = ({
         }
       }
     }
-  }, [profile.viewer?.blocking, track, _, queueUnblock, queueBlock])
+  }, [profile.viewer?.blocking, _, queueUnblock, queueBlock])
 
   const onPressFollowAccount = React.useCallback(async () => {
-    track('ProfileHeader:FollowButtonClicked')
     try {
       await queueFollow()
       Toast.show(_(msg`Account followed`))
@@ -162,10 +153,9 @@ let ProfileMenu = ({
         Toast.show(_(msg`There was an issue! ${e.toString()}`), 'xmark')
       }
     }
-  }, [_, queueFollow, track])
+  }, [_, queueFollow])
 
   const onPressUnfollowAccount = React.useCallback(async () => {
-    track('ProfileHeader:UnfollowButtonClicked')
     try {
       await queueUnfollow()
       Toast.show(_(msg`Account unfollowed`))
@@ -175,12 +165,11 @@ let ProfileMenu = ({
         Toast.show(_(msg`There was an issue! ${e.toString()}`), 'xmark')
       }
     }
-  }, [_, queueUnfollow, track])
+  }, [_, queueUnfollow])
 
   const onPressReportAccount = React.useCallback(() => {
-    track('ProfileHeader:ReportAccountButtonClicked')
     reportDialogControl.open()
-  }, [track, reportDialogControl])
+  }, [reportDialogControl])
 
   return (
     <EventStopper onKeyDown={false}>
diff --git a/src/view/com/util/SimpleViewHeader.tsx b/src/view/com/util/SimpleViewHeader.tsx
index dc14723d2..78b66a929 100644
--- a/src/view/com/util/SimpleViewHeader.tsx
+++ b/src/view/com/util/SimpleViewHeader.tsx
@@ -9,12 +9,11 @@ import {
 import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
 import {useNavigation} from '@react-navigation/native'
 
+import {usePalette} from '#/lib/hooks/usePalette'
+import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
+import {NavigationProp} from '#/lib/routes/types'
 import {isWeb} from '#/platform/detection'
 import {useSetDrawerOpen} from '#/state/shell'
-import {useAnalytics} from 'lib/analytics/analytics'
-import {usePalette} from 'lib/hooks/usePalette'
-import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
-import {NavigationProp} from 'lib/routes/types'
 import {Menu_Stroke2_Corner0_Rounded as Menu} from '#/components/icons/Menu'
 import {CenteredView} from './Views'
 
@@ -31,7 +30,6 @@ export function SimpleViewHeader({
   const pal = usePalette('default')
   const setDrawerOpen = useSetDrawerOpen()
   const navigation = useNavigation<NavigationProp>()
-  const {track} = useAnalytics()
   const {isMobile} = useWebMediaQueries()
   const canGoBack = navigation.canGoBack()
 
@@ -44,9 +42,8 @@ export function SimpleViewHeader({
   }, [navigation])
 
   const onPressMenu = React.useCallback(() => {
-    track('ViewHeader:MenuButtonClicked')
     setDrawerOpen(true)
-  }, [track, setDrawerOpen])
+  }, [setDrawerOpen])
 
   const Container = isMobile ? View : CenteredView
   return (
diff --git a/src/view/com/util/ViewHeader.tsx b/src/view/com/util/ViewHeader.tsx
index e5121b350..64fa504eb 100644
--- a/src/view/com/util/ViewHeader.tsx
+++ b/src/view/com/util/ViewHeader.tsx
@@ -6,7 +6,6 @@ import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useNavigation} from '@react-navigation/native'
 
-import {useAnalytics} from '#/lib/analytics/analytics'
 import {useMinimalShellHeaderTransform} from '#/lib/hooks/useMinimalShellTransform'
 import {usePalette} from '#/lib/hooks/usePalette'
 import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
@@ -42,7 +41,6 @@ export function ViewHeader({
   const {_} = useLingui()
   const setDrawerOpen = useSetDrawerOpen()
   const navigation = useNavigation<NavigationProp>()
-  const {track} = useAnalytics()
   const {isDesktop, isTablet} = useWebMediaQueries()
   const t = useTheme()
 
@@ -55,9 +53,8 @@ export function ViewHeader({
   }, [navigation])
 
   const onPressMenu = React.useCallback(() => {
-    track('ViewHeader:MenuButtonClicked')
     setDrawerOpen(true)
-  }, [track, setDrawerOpen])
+  }, [setDrawerOpen])
 
   if (isDesktop) {
     if (showOnDesktop) {