Merge pull request #4776 from RSSNext/hotfix/1.2.5

chore(desktop): Release v1.2.5 for hotfix

Author: DIYgod

apps/desktop/layer/renderer/package.json

@@ -51,7 +51,7 @@
     "@welldone-software/why-did-you-render": "10.0.1",
     "@xyflow/react": "12.9.2",
     "@yornaath/batshit": "0.11.1",
-    "ai": "5.0.87",
+    "ai": "5.0.115",
     "camelcase-keys": "10.0.1",
     "chrono-node": "2.9.0",
     "class-variance-authority": "0.7.1",

apps/desktop/layer/renderer/src/modules/ai-chat/store/transport.ts

@@ -62,6 +62,28 @@ export function createChatTransport({ onValue, titleHandler }: CreateChatTranspo
   })
 }
 
+const coerceFinishChunk = (chunk: ParseResult<UIMessageChunk>): UIMessageChunk | null => {
+  const { rawValue } = chunk
+  if (!rawValue || typeof rawValue !== "object" || Array.isArray(rawValue)) {
+    return null
+  }
+
+  if ((rawValue as { type?: unknown }).type !== "finish") {
+    return null
+  }
+
+  const { finishReason, messageMetadata } = rawValue as {
+    finishReason?: unknown
+    messageMetadata?: unknown
+  }
+
+  return {
+    type: "finish",
+    finishReason: typeof finishReason === "string" ? finishReason : undefined,
+    messageMetadata,
+  } as UIMessageChunk
+}
+
 class ExtendChatTransport extends HttpChatTransport<BizUIMessage> {
   constructor(
     private options: HttpChatTransportInitOptions<BizUIMessage> & {
@@ -83,13 +105,14 @@ class ExtendChatTransport extends HttpChatTransport<BizUIMessage> {
     }).pipeThrough(
       new TransformStream<ParseResult<UIMessageChunk>, UIMessageChunk>({
         async transform(chunk, controller) {
-          if (!chunk.success) {
+          const parsedChunk = chunk.success ? chunk.value : coerceFinishChunk(chunk)
+          if (!parsedChunk) {
             throw chunk.error
           }
 
-          await handleGeneratedTitle(chunk.value)
-          onValue?.(chunk.value)
-          controller.enqueue(chunk.value)
+          await handleGeneratedTitle(parsedChunk)
+          onValue?.(parsedChunk)
+          controller.enqueue(parsedChunk)
         },
       }),
     )

apps/desktop/layer/renderer/src/modules/auth/LoginModalContent.tsx

@@ -115,16 +115,6 @@ export const LoginModalContent = (props: LoginModalContentProps) => {
             transition={Spring.presets.smooth}
           >
             <h1 className="text-2xl font-semibold">{t("login.title")}</h1>
-            <p className="text-balance text-center text-sm text-text-secondary">
-              {t("login.subtitle")}
-            </p>
-            {/* Benefits - single line */}
-            <div className="mt-1 flex items-center gap-3 text-xs text-text-tertiary">
-              <span className="text-accent">✦</span>
-              <span>{t("login.benefit_1")}</span>
-              <span className="text-text-quaternary">·</span>
-              <span>{t("login.benefit_2")}</span>
-            </div>
           </m.div>
         ) : (
           <m.div
@@ -215,17 +205,6 @@ export const LoginModalContent = (props: LoginModalContentProps) => {
                     </button>
                   </m.div>
                 ))}
-            {/* Quick start hint */}
-            {isRegister && providers.length > 0 && !isLoading && (
-              <m.p
-                className="mt-1 text-center text-xs text-text-tertiary"
-                initial={{ opacity: 0 }}
-                animate={{ opacity: 1 }}
-                transition={{ ...Spring.presets.smooth, delay: 0.15 }}
-              >
-                {t("login.quick_start")}
-              </m.p>
-            )}
           </div>
 
           {/* Referral Form */}
@@ -284,18 +263,6 @@ export const LoginModalContent = (props: LoginModalContentProps) => {
             }}
           />
 
-          {/* View Demo Button */}
-          {isRegister && (
-            <m.button
-              className="mb-2 w-full cursor-pointer text-center text-xs text-text-tertiary transition-colors hover:text-text-secondary"
-              onClick={() => modal.dismiss()}
-              whileHover={{ scale: 1.02 }}
-              whileTap={{ scale: 0.98 }}
-            >
-              {t("login.view_demo")}
-            </m.button>
-          )}
-
           {/* Switch Account Type */}
           <m.button
             className="group w-full cursor-pointer pb-2 text-center text-sm font-medium transition-colors"

apps/desktop/layer/renderer/src/modules/discover/DiscoverForm.tsx

@@ -24,7 +24,6 @@ import { useTranslation } from "react-i18next"
 import { useSearchParams } from "react-router"
 import { z } from "zod"
 
-import { useIsInMASReview } from "~/atoms/server-configs"
 import { useModalStack } from "~/components/ui/modal/stacked/hooks"
 import { useRequireLogin } from "~/hooks/common/useRequireLogin"
 import { followClient } from "~/lib/api-client"
@@ -127,19 +126,15 @@ export function DiscoverForm({ type = "search" }: { type?: string }) {
   const target = watch("target")
   const atomKey = keywordFromSearch + target
   const { t } = useTranslation()
-  const isInMASReview = useIsInMASReview()
   const { ensureLogin } = useRequireLogin()
 
   const jotaiStore = useStore()
   const mutation = useMutation({
     mutationFn: async ({ keyword, target }: { keyword: string; target: "feeds" | "lists" }) => {
-      let { data } = await followClient.api.discover.discover({
+      const { data } = await followClient.api.discover.discover({
         keyword: keyword.trim(),
         target,
       })
-      if (isInMASReview) {
-        data = data.filter((item) => !item.list?.fee)
-      }
 
       jotaiStore.set(discoverSearchDataAtom, (prev) => ({
         ...prev,

apps/desktop/layer/renderer/src/modules/discover/ListForm.tsx

@@ -256,15 +256,7 @@ const ListInnerForm = ({
 
   return (
     <div className="flex flex-1 flex-col gap-y-4">
-      <FeedSummary
-        isLoading={isLoading}
-        feed={{
-          ...list,
-          fee: list.fee || 0,
-        }}
-        analytics={analytics}
-        showAnalytics
-      />
+      <FeedSummary isLoading={isLoading} feed={list} analytics={analytics} showAnalytics />
       <Form {...form}>
         <form onSubmit={form.handleSubmit(onSubmit)} className="flex flex-1 flex-col gap-y-4">
           <FormField
@@ -343,18 +335,6 @@ const ListInnerForm = ({
               </FormItem>
             )}
           />
-          {!!list.fee && !isSubscribed && (
-            <div>
-              <FormLabel className="flex items-center gap-1">
-                {t("feed_form.fee")}{" "}
-                <div className="ml-2 flex scale-[0.85] items-center gap-1">
-                  {list.fee}
-                  <i className="i-mgc-power size-4 text-folo" />
-                </div>
-              </FormLabel>
-              <FormDescription className="mt-0.5">{t("feed_form.fee_description")}</FormDescription>
-            </div>
-          )}
           <div className="flex flex-1 items-center justify-end gap-4">
             {isSubscribed && (
               <Button
@@ -369,13 +349,7 @@ const ListInnerForm = ({
               </Button>
             )}
             <Button ref={buttonRef} type="submit" isLoading={followMutation.isPending}>
-              {isSubscribed
-                ? t("feed_form.update")
-                : list.fee
-                  ? t("feed_form.follow_with_fee", {
-                      fee: list.fee,
-                    })
-                  : t("feed_form.follow")}
+              {isSubscribed ? t("feed_form.update") : t("feed_form.follow")}
             </Button>
           </div>
         </form>

apps/desktop/layer/renderer/src/modules/discover/UnifiedDiscoverForm.tsx

@@ -24,7 +24,6 @@ import { useTranslation } from "react-i18next"
 import { useSearchParams } from "react-router"
 import { z } from "zod"
 
-import { useIsInMASReview } from "~/atoms/server-configs"
 import { useModalStack } from "~/components/ui/modal/stacked/hooks"
 import { useRequireLogin } from "~/hooks/common/useRequireLogin"
 import { followClient } from "~/lib/api-client"
@@ -96,7 +95,6 @@ export function UnifiedDiscoverForm() {
   const [searchParams, setSearchParams] = useSearchParams()
   const keywordFromSearch = searchParams.get("keyword") || ""
   const { t } = useTranslation()
-  const isInMASReview = useIsInMASReview()
   const { ensureLogin } = useRequireLogin()
   const { present, dismissAll } = useModalStack()
   const isMobile = useMobile()
@@ -163,13 +161,10 @@ export function UnifiedDiscoverForm() {
       }
 
       // For search, perform discovery
-      let { data } = await followClient.api.discover.discover({
+      const { data } = await followClient.api.discover.discover({
         keyword: keyword.trim(),
         target,
       })
-      if (isInMASReview) {
-        data = data.filter((item) => !item.list?.fee)
-      }
 
       setDiscoverSearchData((prev) => ({
         ...prev,

apps/desktop/layer/renderer/src/modules/entry-content/EntryContent.tsx

@@ -8,6 +8,7 @@ import { useFeedById } from "@follow/store/feed/hooks"
 import type { FeedModel } from "@follow/store/feed/types"
 import { useIsInbox } from "@follow/store/inbox/hooks"
 import { useSubscriptionByFeedId } from "@follow/store/subscription/hooks"
+import { useEntryTranslation } from "@follow/store/translation/hooks"
 import { thenable } from "@follow/utils"
 import { stopPropagation } from "@follow/utils/dom"
 import { EventBus } from "@follow/utils/event-bus"
@@ -17,7 +18,9 @@ import { useAnimationControls } from "motion/react"
 import * as React from "react"
 import { memo, useEffect, useRef, useState } from "react"
 
+import { useShowAITranslation } from "~/atoms/ai-translation"
 import { useEntryIsInReadability } from "~/atoms/readability"
+import { useActionLanguage } from "~/atoms/settings/general"
 import { AppErrorBoundary } from "~/components/common/AppErrorBoundary"
 import { Focusable } from "~/components/common/Focusable"
 import { m } from "~/components/common/Motion"
@@ -40,6 +43,7 @@ import { EntryScrollingAndNavigationHandler } from "./components/entry-content/E
 import { EntryTitleMetaHandler } from "./components/entry-content/EntryTitleMetaHandler"
 import type { EntryContentProps } from "./components/entry-content/types"
 import { getEntryContentLayout } from "./components/layouts"
+import type { EntryLayoutProps } from "./components/layouts/types"
 import { SourceContentPanel } from "./components/SourceContentView"
 import { useEntryContent } from "./hooks"
 
@@ -71,6 +75,13 @@ const EntryContentImpl: Component<EntryContentProps> = ({
   const isInReadabilityMode = useEntryIsInReadability(entryId)
 
   const { error, content, isPending } = useEntryContent(entryId)
+  const enableTranslation = useShowAITranslation()
+  const actionLanguage = useActionLanguage()
+  const entryTranslation = useEntryTranslation({
+    entryId,
+    language: actionLanguage,
+    enabled: enableTranslation,
+  })
 
   const routeView = useRouteParamsSelector((route) => route.view)
   const subscriptionView = subscription?.view
@@ -133,6 +144,16 @@ const EntryContentImpl: Component<EntryContentProps> = ({
   }, [scrollerRef])
 
   const scrollerRefObject = React.useMemo(() => ({ current: scrollerRef }), [scrollerRef])
+  const layoutTranslation = React.useMemo(
+    () =>
+      entryTranslation
+        ? {
+            content: entryTranslation.content ?? undefined,
+            title: entryTranslation.title ?? undefined,
+          }
+        : undefined,
+    [entryTranslation?.content, entryTranslation?.title],
+  )
   return (
     <div className={cn(className, "flex flex-col @container")}>
       <EntryTitleMetaHandler entryId={entryId} />
@@ -219,6 +240,7 @@ const EntryContentImpl: Component<EntryContentProps> = ({
                   view={view}
                   compact={compact}
                   noMedia={noMedia}
+                  translation={layoutTranslation}
                 />
               )}
             </article>
@@ -269,8 +291,16 @@ const AdaptiveContentRenderer: React.FC<{
   view: FeedViewType
   compact?: boolean
   noMedia?: boolean
-}> = ({ entryId, view, compact = false, noMedia = false }) => {
+  translation?: EntryLayoutProps["translation"]
+}> = ({ entryId, view, compact = false, noMedia = false, translation }) => {
   const LayoutComponent = getEntryContentLayout(view)
 
-  return <LayoutComponent entryId={entryId} compact={compact} noMedia={noMedia} />
+  return (
+    <LayoutComponent
+      entryId={entryId}
+      compact={compact}
+      noMedia={noMedia}
+      translation={translation}
+    />
+  )
 }

apps/desktop/layer/renderer/src/modules/profile/user-profile-modal/UserProfileModalContent.tsx

@@ -98,27 +98,18 @@ const ListCard = memo(({ list }: { list: ListWithStats }) => {
         </div>
 
         {/* Stats Footer */}
-        {(typeof list.subscriptionCount === "number" ||
-          (typeof list.fee === "number" && list.fee > 0)) && (
+        {typeof list.subscriptionCount === "number" && (
           <div className="border-t border-fill-secondary px-4 py-2.5">
             <div className="flex items-center justify-between text-xs">
-              {typeof list.subscriptionCount === "number" && (
-                <div className="flex items-center gap-1.5 text-text-secondary">
-                  <i className="i-mingcute-group-2-line size-3" />
-                  <span>
-                    {list.subscriptionCount}
-                    <span className="ml-1 hidden sm:inline">
-                      {list.subscriptionCount > 1 ? "subscribers" : "subscriber"}
-                    </span>
+              <div className="flex items-center gap-1.5 text-text-secondary">
+                <i className="i-mingcute-group-2-line size-3" />
+                <span>
+                  {list.subscriptionCount}
+                  <span className="ml-1 hidden sm:inline">
+                    {list.subscriptionCount > 1 ? "subscribers" : "subscriber"}
                   </span>
-                </div>
-              )}
-              {typeof list.fee === "number" && list.fee > 0 && (
-                <div className="flex items-center gap-1.5">
-                  <i className="i-mgc-power size-3 text-folo" />
-                  <span className="font-medium">{list.fee}</span>
-                </div>
-              )}
+                </span>
+              </div>
             </div>
           </div>
         )}

apps/desktop/layer/renderer/src/modules/settings/tabs/lists/index.tsx

@@ -28,7 +28,6 @@ import { toast } from "sonner"
 import { useCurrentModal, useModalStack } from "~/components/ui/modal/stacked/hooks"
 import { useI18n } from "~/hooks/common"
 import { UrlBuilder } from "~/lib/url-builder"
-import { Balance } from "~/modules/wallet/balance"
 
 import { ListCreationModalContent, ListFeedsModalContent } from "./modals"
 
@@ -75,7 +74,6 @@ export const SettingLists = () => {
         acc[curr.id] = {
           id: curr.id,
           subscriptionCount: curr.subscriptionCount,
-          purchaseAmount: Number(curr.purchaseAmount || 0),
         }
         return acc
       },
@@ -84,7 +82,6 @@ export const SettingLists = () => {
         {
           id: string
           subscriptionCount: number | null | undefined
-          purchaseAmount: number | null | undefined
         }
       >,
     )
@@ -126,9 +123,7 @@ export const SettingLists = () => {
                     <TableRow className="[&_*]:!font-semibold">
                       <TableHead size="sm">{t.settings("lists.title")}</TableHead>
                       <TableHead size="sm">{t.settings("lists.view")}</TableHead>
-                      <TableHead size="sm">{t.settings("lists.fee.label")}</TableHead>
                       <TableHead size="sm">{t.settings("lists.subscriptions")}</TableHead>
-                      <TableHead size="sm">{t.settings("lists.earnings")}</TableHead>
                       <TableHead size="sm" className="center">
                         {t.common("words.actions")}
                       </TableHead>
@@ -172,18 +167,9 @@ export const SettingLists = () => {
                             </TooltipPortal>
                           </Tooltip>
                         </TableCell>
-                        <TableCell size="sm">
-                          <div className="flex items-center gap-1 tabular-nums">
-                            {row.fee}
-                            <i className="i-mgc-power shrink-0 text-lg text-folo" />
-                          </div>
-                        </TableCell>
                         <TableCell size="sm" className="tabular-nums">
                           {formatNumber(listDataMap[row.id]?.subscriptionCount || 0)}
                         </TableCell>
-                        <TableCell size="sm" className="tabular-nums">
-                          <Balance>{BigInt(listDataMap[row.id]?.purchaseAmount || 0n)}</Balance>
-                        </TableCell>
                         <TableCell size="sm" className="center">
                           <Tooltip>
                             <TooltipTrigger asChild>