diff --git a/src/Navigation.tsx b/src/Navigation.tsx index 3f6b5ba20c..24fbb0d818 100644 --- a/src/Navigation.tsx +++ b/src/Navigation.tsx @@ -182,7 +182,7 @@ function commonScreens(Stack: typeof HomeTab, unreadCountLabel?: string) { ProfileFeedScreen} - options={{title: title('Feed')}} + options={{title: title('Feed'), requireAuth: true}} /> - FeedsScreen} /> + FeedsScreen} + options={{requireAuth: true}} + /> {commonScreens(FeedsTab as typeof HomeTab)} ) diff --git a/src/view/screens/Profile.tsx b/src/view/screens/Profile.tsx index 3f2dd773e1..f1c648a672 100644 --- a/src/view/screens/Profile.tsx +++ b/src/view/screens/Profile.tsx @@ -153,7 +153,7 @@ function ProfileScreenLoaded({ const isMe = profile.did === currentAccount?.did const showRepliesTab = hasSession const showLikesTab = isMe - const showFeedsTab = isMe || extraInfoQuery.data?.hasFeedgens + const showFeedsTab = hasSession && (isMe || extraInfoQuery.data?.hasFeedgens) const showListsTab = hasSession && (isMe || extraInfoQuery.data?.hasLists) const sectionTitles = useMemo(() => { return [ diff --git a/src/view/shell/bottom-bar/BottomBar.tsx b/src/view/shell/bottom-bar/BottomBar.tsx index 7f1ba8a5f2..ef147f27e6 100644 --- a/src/view/shell/bottom-bar/BottomBar.tsx +++ b/src/view/shell/bottom-bar/BottomBar.tsx @@ -138,31 +138,31 @@ export function BottomBar({navigation}: BottomTabBarProps) { accessibilityLabel={_(msg`Search`)} accessibilityHint="" /> - - ) : ( - - ) - } - onPress={onPressFeeds} - accessibilityRole="tab" - accessibilityLabel={_(msg`Feeds`)} - accessibilityHint="" - /> {hasSession && ( <> + + ) : ( + + ) + } + onPress={onPressFeeds} + accessibilityRole="tab" + accessibilityLabel={_(msg`Feeds`)} + accessibilityHint="" + /> - - {({isActive}) => { - return ( - - ) - }} - {hasSession && ( <> + + {({isActive}) => { + return ( + + ) + }} + {({isActive}) => { const Icon = isActive ? BellIconSolid : BellIcon diff --git a/src/view/shell/desktop/LeftNav.tsx b/src/view/shell/desktop/LeftNav.tsx index e294431f31..8078df802a 100644 --- a/src/view/shell/desktop/LeftNav.tsx +++ b/src/view/shell/desktop/LeftNav.tsx @@ -314,27 +314,26 @@ export function DesktopLeftNav() { } label={_(msg`Search`)} /> - - } - iconFilled={ - - } - label={_(msg`Feeds`)} - /> - {hasSession && ( <> + + } + iconFilled={ + + } + label={_(msg`Feeds`)} + />