diff --git a/apps/desktop/layer/renderer/src/hooks/biz/useFollow.tsx b/apps/desktop/layer/renderer/src/hooks/biz/useFollow.tsx
index f560a7bba..26e821224 100644
--- a/apps/desktop/layer/renderer/src/hooks/biz/useFollow.tsx
+++ b/apps/desktop/layer/renderer/src/hooks/biz/useFollow.tsx
@@ -8,9 +8,11 @@ import {
import { useUserRole } from "@follow/store/user/hooks"
import { t } from "i18next"
import { useCallback } from "react"
+import { useNavigate } from "react-router"
import { withoutTrailingSlash, withTrailingSlash } from "ufo"
import { useEventCallback } from "usehooks-ts"
+import { previewBackPath } from "~/atoms/preview"
import { useServerConfigs } from "~/atoms/server-configs"
import { useModalStack } from "~/components/ui/modal/stacked/hooks"
import { CustomSafeError } from "~/errors/CustomSafeError"
@@ -67,6 +69,7 @@ export interface FollowOptions {
export const useFollow = () => {
const { present } = useModalStack()
const canFollowMoreInboxAndNotify = useCanFollowMoreInboxAndNotify()
+ const navigate = useNavigate()
return useCallback(
(options?: FollowOptions) => {
@@ -92,6 +95,9 @@ export const useFollow = () => {
content: ({ dismiss }) => {
const onSuccess = () => {
options?.onSuccess?.()
+ // If it's a preview, navigate to the back path
+ const backPath = previewBackPath()
+ backPath && navigate(backPath)
dismiss()
}
return options?.isList ? (
diff --git a/apps/desktop/layer/renderer/src/modules/subscription-column/FeedItem.tsx b/apps/desktop/layer/renderer/src/modules/subscription-column/FeedItem.tsx
index 422fc4234..33608a59a 100644
--- a/apps/desktop/layer/renderer/src/modules/subscription-column/FeedItem.tsx
+++ b/apps/desktop/layer/renderer/src/modules/subscription-column/FeedItem.tsx
@@ -207,7 +207,7 @@ const FeedItemImpl = ({ view, feedId, className, isPreview }: FeedItemProps) =>
)}
- {isPreview && (
+ {isPreview ? (
+ ) : (
+
)}
-
)
}
@@ -325,7 +326,7 @@ const ListItemImpl: Component = ({
)}
- {isPreview && (
+ {isPreview ? (
+ ) : (
+
)}
-
)
}
diff --git a/apps/desktop/layer/renderer/src/modules/subscription-column/subscription-list/EmptyFeedList.tsx b/apps/desktop/layer/renderer/src/modules/subscription-column/subscription-list/EmptyFeedList.tsx
index 38194a14e..4eb4cc52e 100644
--- a/apps/desktop/layer/renderer/src/modules/subscription-column/subscription-list/EmptyFeedList.tsx
+++ b/apps/desktop/layer/renderer/src/modules/subscription-column/subscription-list/EmptyFeedList.tsx
@@ -35,7 +35,9 @@ export const EmptyFeedList = memo(({ onClick }: { onClick?: (e: React.MouseEvent
onClick={handleClick}
>
- {t("sidebar.already_on_discover_page")}
+
+ {t("sidebar.already_on_discover_page")}
+
) : (