Cleanup

src/view/shell/Drawer.tsx

@@ -30,10 +30,6 @@ import {
   Bell_Stroke2_Corner0_Rounded as Bell,
 } from '#/components/icons/Bell'
 import {BulletList_Stroke2_Corner0_Rounded as List} from '#/components/icons/BulletList'
-import {
-  Gift1_Filled_Corner0_Rounded as GiftFilled,
-  Gift1_Stroke2_Corner0_Rounded as Gift,
-} from '#/components/icons/Gift1'
 import {
   Hashtag_Filled_Corner0_Rounded as HashtagFilled,
   Hashtag_Stroke2_Corner0_Rounded as Hashtag,
@@ -207,11 +203,6 @@ let DrawerContent = ({}: React.PropsWithoutRef<{}>): React.ReactNode => {
     setDrawerOpen(false)
   }, [navigation, setDrawerOpen])
 
-  const onPressSubscriptions = React.useCallback(() => {
-    navigation.navigate('Subscriptions')
-    setDrawerOpen(false)
-  }, [navigation, setDrawerOpen])
-
   const onPressFeedback = React.useCallback(() => {
     Linking.openURL(
       FEEDBACK_FORM_URL({
@@ -273,10 +264,6 @@ let DrawerContent = ({}: React.PropsWithoutRef<{}>): React.ReactNode => {
               onPress={onPressProfile}
             />
             <SettingsMenuItem onPress={onPressSettings} />
-            <SubscriptionsMenuItem
-              isActive={false}
-              onPress={onPressSubscriptions}
-            />
           </>
         ) : (
           <>
@@ -546,31 +533,6 @@ let SettingsMenuItem = ({onPress}: {onPress: () => void}): React.ReactNode => {
 }
 SettingsMenuItem = React.memo(SettingsMenuItem)
 
-let SubscriptionsMenuItem = ({
-  isActive,
-  onPress,
-}: {
-  isActive: boolean
-  onPress: () => void
-}): React.ReactNode => {
-  const {_} = useLingui()
-  const t = useTheme()
-  return (
-    <MenuItem
-      icon={
-        isActive ? (
-          <GiftFilled style={[t.atoms.text]} width={iconWidth} />
-        ) : (
-          <Gift style={[t.atoms.text]} width={iconWidth} />
-        )
-      }
-      label={_(msg`Support Bluesky`)}
-      onPress={onPress}
-    />
-  )
-}
-SubscriptionsMenuItem = React.memo(SubscriptionsMenuItem)
-
 function MenuItem({icon, label, count, bold, onPress}: MenuItemProps) {
   const t = useTheme()
   return (

src/view/shell/desktop/RightNav.tsx

@@ -6,7 +6,8 @@ import {useLingui} from '@lingui/react'
 import {FEEDBACK_FORM_URL, HELP_DESK_URL} from '#/lib/constants'
 import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
 import {useKawaiiMode} from '#/state/preferences/kawaii'
-import {useEntitlements} from '#/state/purchases/subscriptions/useEntitlements'
+import {usePurchases} from '#/state/purchases'
+import {EntitlementId} from '#/state/purchases/types'
 import {useSession} from '#/state/session'
 import {DesktopFeeds} from '#/view/shell/desktop/Feeds'
 import {DesktopSearch} from '#/view/shell/desktop/Search'
@@ -27,8 +28,10 @@ export function DesktopRightNav({routeName}: {routeName: string}) {
   const {_} = useLingui()
   const {hasSession, currentAccount} = useSession()
   const subscriptionsDialogControl = useDialogControl()
-  const {data: entitlements} = useEntitlements()
-  const isSubscribed = entitlements?.some(e => e.id === 'core')
+  const purchases = usePurchases()
+  const isSubscribed =
+    purchases.status === 'ready' &&
+    purchases.entitlements?.some(e => e.id === EntitlementId.Core)
 
   const kawaii = useKawaiiMode()