diff --git a/apps/desktop/src/renderer/src/modules/entry-column/item.tsx b/apps/desktop/src/renderer/src/modules/entry-column/item.tsx
index 9596d64e4..c030d1535 100644
--- a/apps/desktop/src/renderer/src/modules/entry-column/item.tsx
+++ b/apps/desktop/src/renderer/src/modules/entry-column/item.tsx
@@ -63,26 +63,23 @@ const LoadingCircleFallback = (
export const EntryItemSkeleton: FC<{
view: FeedViewType
count?: number
-}> = memo(({ view, count }) => {
+}> = memo(({ view, count = 10 }) => {
const SkeletonItem = getSkeletonItemComponentByView(view)
+
+ if (!SkeletonItem) {
+ return LoadingCircleFallback
+ }
+
if (count === 1) {
return SkeletonItem
}
- return SkeletonItem ? (
+ return (
- {SkeletonItem}
- {SkeletonItem}
- {SkeletonItem}
- {SkeletonItem}
- {SkeletonItem}
- {SkeletonItem}
- {SkeletonItem}
- {SkeletonItem}
- {SkeletonItem}
- {SkeletonItem}
+ {Array.from({ length: count }).map((_, index) => (
+ // eslint-disable-next-line @eslint-react/no-array-index-key -- index is unique
+
{SkeletonItem}
+ ))}
- ) : (
- LoadingCircleFallback
)
})
diff --git a/apps/desktop/src/renderer/src/modules/profile/user-profile-modal.shared.tsx b/apps/desktop/src/renderer/src/modules/profile/user-profile-modal.shared.tsx
index 73fdc2537..fba486dc4 100644
--- a/apps/desktop/src/renderer/src/modules/profile/user-profile-modal.shared.tsx
+++ b/apps/desktop/src/renderer/src/modules/profile/user-profile-modal.shared.tsx
@@ -175,7 +175,7 @@ const SubscriptionItem: FC<{
) : (
<>
- {APP_NAME}
+ {t("feed_form.follow")}
>
)}
diff --git a/apps/desktop/src/renderer/src/modules/shared/ViewSelectorRadioGroup.tsx b/apps/desktop/src/renderer/src/modules/shared/ViewSelectorRadioGroup.tsx
index c0cfdeb43..cdb2a2983 100644
--- a/apps/desktop/src/renderer/src/modules/shared/ViewSelectorRadioGroup.tsx
+++ b/apps/desktop/src/renderer/src/modules/shared/ViewSelectorRadioGroup.tsx
@@ -1,11 +1,12 @@
import { Card, CardContent, CardHeader } from "@follow/components/ui/card/index.jsx"
-import { views } from "@follow/constants"
+import { FeedViewType, views } from "@follow/constants"
import type { EntryModelSimple, FeedModel } from "@follow/models"
import { cn } from "@follow/utils/utils"
import { cloneElement, forwardRef } from "react"
import { useI18n } from "~/hooks/common"
+import { EntryItemSkeleton } from "../entry-column/item"
import { EntryItemStateless } from "../entry-column/item-stateless"
export const ViewSelectorRadioGroup = forwardRef<
@@ -50,12 +51,14 @@ export const ViewSelectorRadioGroup = forwardRef<
))}
- {!!feed && !!entries && (
+ {!!feed && !!entries ? (
{entries.slice(0, 2).map((entry) => (
))}
+ ) : (
+
)}
)