2 files changed, 7 insertions, 18 deletions

diff --git a/src/view/shell/Drawer.tsx b/src/view/shell/Drawer.tsx
index 226fe2496..ca2cbb3e0 100644
--- a/src/view/shell/Drawer.tsx
+++ b/src/view/shell/Drawer.tsx
@@ -14,7 +14,6 @@ import {msg, Plural, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {StackActions, useNavigation} from '@react-navigation/native'
 
-import {useAnalytics} from '#/lib/analytics/analytics'
 import {FEEDBACK_FORM_URL, HELP_DESK_URL} from '#/lib/constants'
 import {useNavigationTabState} from '#/lib/hooks/useNavigationTabState'
 import {usePalette} from '#/lib/hooks/usePalette'
@@ -146,7 +145,6 @@ let DrawerContent = ({}: {}): React.ReactNode => {
   const {_} = useLingui()
   const setDrawerOpen = useSetDrawerOpen()
   const navigation = useNavigation<NavigationProp>()
-  const {track} = useAnalytics()
   const {isAtHome, isAtSearch, isAtFeeds, isAtNotifications, isAtMyProfile} =
     useNavigationTabState()
   const {hasSession, currentAccount} = useSession()
@@ -157,7 +155,6 @@ let DrawerContent = ({}: {}): React.ReactNode => {
 
   const onPressTab = React.useCallback(
     (tab: string) => {
-      track('Menu:ItemClicked', {url: tab})
       const state = navigation.getState()
       setDrawerOpen(false)
       if (isWeb) {
@@ -180,7 +177,7 @@ let DrawerContent = ({}: {}): React.ReactNode => {
         }
       }
     },
-    [track, navigation, setDrawerOpen, currentAccount],
+    [navigation, setDrawerOpen, currentAccount],
   )
 
   const onPressHome = React.useCallback(() => onPressTab('Home'), [onPressTab])
@@ -200,37 +197,32 @@ let DrawerContent = ({}: {}): React.ReactNode => {
   }, [onPressTab])
 
   const onPressMyFeeds = React.useCallback(() => {
-    track('Menu:ItemClicked', {url: 'Feeds'})
     navigation.navigate('Feeds')
     setDrawerOpen(false)
-  }, [navigation, setDrawerOpen, track])
+  }, [navigation, setDrawerOpen])
 
   const onPressLists = React.useCallback(() => {
-    track('Menu:ItemClicked', {url: 'Lists'})
     navigation.navigate('Lists')
     setDrawerOpen(false)
-  }, [navigation, track, setDrawerOpen])
+  }, [navigation, setDrawerOpen])
 
   const onPressSettings = React.useCallback(() => {
-    track('Menu:ItemClicked', {url: 'Settings'})
     navigation.navigate('Settings')
     setDrawerOpen(false)
-  }, [navigation, track, setDrawerOpen])
+  }, [navigation, setDrawerOpen])
 
   const onPressFeedback = React.useCallback(() => {
-    track('Menu:FeedbackClicked')
     Linking.openURL(
       FEEDBACK_FORM_URL({
         email: currentAccount?.email,
         handle: currentAccount?.handle,
       }),
     )
-  }, [track, currentAccount])
+  }, [currentAccount])
 
   const onPressHelp = React.useCallback(() => {
-    track('Menu:HelpClicked')
     Linking.openURL(HELP_DESK_URL)
-  }, [track])
+  }, [])
 
   // rendering
   // =
diff --git a/src/view/shell/bottom-bar/BottomBar.tsx b/src/view/shell/bottom-bar/BottomBar.tsx
index f0e6ba339..9187b5321 100644
--- a/src/view/shell/bottom-bar/BottomBar.tsx
+++ b/src/view/shell/bottom-bar/BottomBar.tsx
@@ -7,7 +7,6 @@ import {useLingui} from '@lingui/react'
 import {BottomTabBarProps} from '@react-navigation/bottom-tabs'
 import {StackActions} from '@react-navigation/native'
 
-import {useAnalytics} from '#/lib/analytics/analytics'
 import {PressableScale} from '#/lib/custom-animations/PressableScale'
 import {useHaptics} from '#/lib/haptics'
 import {useDedupe} from '#/lib/hooks/useDedupe'
@@ -62,7 +61,6 @@ export function BottomBar({navigation}: BottomTabBarProps) {
   const pal = usePalette('default')
   const {_} = useLingui()
   const safeAreaInsets = useSafeAreaInsets()
-  const {track} = useAnalytics()
   const {footerHeight} = useShellLayout()
   const {isAtHome, isAtSearch, isAtNotifications, isAtMyProfile, isAtMessages} =
     useNavigationTabState()
@@ -90,7 +88,6 @@ export function BottomBar({navigation}: BottomTabBarProps) {
 
   const onPressTab = React.useCallback(
     (tab: TabOptions) => {
-      track(`MobileShell:${tab}ButtonPressed`)
       const state = navigation.getState()
       const tabState = getTabState(state, tab)
       if (tabState === TabState.InsideAtRoot) {
@@ -101,7 +98,7 @@ export function BottomBar({navigation}: BottomTabBarProps) {
         dedupe(() => navigation.navigate(`${tab}Tab`))
       }
     },
-    [track, navigation, dedupe],
+    [navigation, dedupe],
   )
   const onPressHome = React.useCallback(() => onPressTab('Home'), [onPressTab])
   const onPressSearch = React.useCallback(