diff --git a/apps/mobile/src/modules/feed/FollowFeed.tsx b/apps/mobile/src/modules/feed/FollowFeed.tsx index b60e34433..9a30ee1d0 100644 --- a/apps/mobile/src/modules/feed/FollowFeed.tsx +++ b/apps/mobile/src/modules/feed/FollowFeed.tsx @@ -43,7 +43,7 @@ const formSchema = z.object({ export function FollowFeed(props: { id: string }) { const { id } = props const feed = useFeedById(id as string) - usePrefetchFeed(id as string, { + const { data } = usePrefetchFeed(id as string, { enabled: !feed?.subscriptionCount, }) @@ -54,8 +54,7 @@ export function FollowFeed(props: { id: string }) { ) } - - return + return } export function FollowUrl(props: { url: string }) { @@ -75,14 +74,19 @@ export function FollowUrl(props: { url: string }) { return {error?.message} } - return + return ( + + ) } -function FollowImpl(props: { feedId: string }) { +function FollowImpl(props: { feedId: string; defaultView?: FeedViewType }) { const { t } = useTranslation() const { t: tCommon } = useTranslation("common") const textLabelColor = useColor("label") - const { feedId: id } = props + const { feedId: id, defaultView } = props const feed = useFeedById(id) const subscription = useSubscriptionByFeedId(feed?.id) @@ -94,7 +98,7 @@ function FollowImpl(props: { feedId: string }) { category: subscription?.category ?? "", isPrivate: subscription?.isPrivate ?? false, title: subscription?.title ?? "", - view: subscription?.view ?? FeedViewType.Articles, + view: subscription?.view ?? defaultView ?? FeedViewType.Articles, }, }) diff --git a/packages/internal/store/src/feed/store.ts b/packages/internal/store/src/feed/store.ts index 3fda0e2f1..9ed5a2240 100644 --- a/packages/internal/store/src/feed/store.ts +++ b/packages/internal/store/src/feed/store.ts @@ -156,7 +156,10 @@ class FeedSyncServices { } feedActions.upsertMany([finalData]) - return finalData + return { + responseData: res.data, + feed: finalData, + } } async claimFeed(feedId: string) {