diff --git a/apps/renderer/src/modules/entry-column/templates/grid-item-template.tsx b/apps/renderer/src/modules/entry-column/templates/grid-item-template.tsx index 4b4e235f8..ebe373530 100644 --- a/apps/renderer/src/modules/entry-column/templates/grid-item-template.tsx +++ b/apps/renderer/src/modules/entry-column/templates/grid-item-template.tsx @@ -79,7 +79,7 @@ export const GridItemFooter = ({
- + ยท diff --git a/apps/renderer/src/modules/feed-column/item.tsx b/apps/renderer/src/modules/feed-column/item.tsx index 9ecab1a96..d92cc1a30 100644 --- a/apps/renderer/src/modules/feed-column/item.tsx +++ b/apps/renderer/src/modules/feed-column/item.tsx @@ -16,7 +16,6 @@ import { memo, useCallback, useState } from "react" import { useTranslation } from "react-i18next" import { getMainContainerElement } from "~/atoms/dom" -import { useUISettingKey } from "~/atoms/settings/ui" import { useFeedActions, useInboxActions, useListActions } from "~/hooks/biz/useFeedActions" import { useNavigateEntry } from "~/hooks/biz/useNavigateEntry" import { useRouteParamsSelector } from "~/hooks/biz/useRouteParams" @@ -94,7 +93,6 @@ const FeedItemImpl = ({ view, feedId, className }: FeedItemProps) => { useAnyPointDown(() => { isContextMenuOpen && setIsContextMenuOpen(false) }) - const hideExtraBadge = useUISettingKey("hideExtraBadge") if (!feed) return null const isFeed = feed.type === "feed" || !feed.type diff --git a/apps/renderer/src/modules/feed/feed-title.tsx b/apps/renderer/src/modules/feed/feed-title.tsx index 008bf89df..635695882 100644 --- a/apps/renderer/src/modules/feed/feed-title.tsx +++ b/apps/renderer/src/modules/feed/feed-title.tsx @@ -1,6 +1,7 @@ import type { FeedOrListRespModel } from "@follow/models/types" import { cn } from "@follow/utils/utils" +import { useUISettingKey } from "~/atoms/settings/ui" import { BoostCertification } from "~/modules/boost/boost-certification" import { FeedCertification } from "~/modules/feed/feed-certification" import { getPreferredTitle } from "~/store/feed/store" @@ -10,15 +11,23 @@ export const FeedTitle = ({ className, title, }: { - feed: FeedOrListRespModel + feed: FeedOrListRespModel | null className?: string title?: string | null }) => { + const hideExtraBadge = useUISettingKey("hideExtraBadge") + + if (!feed) return null + return (
{title || getPreferredTitle(feed)}
- - + {!hideExtraBadge && ( + <> + + + + )}
) }