feat(power): restrict power usage to wallet

Author: DIYgod

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

@@ -117,7 +117,7 @@ export const FeedForm: Component<{
         isError: feedQuery.isError,
       })
     }
-  }, [feedQuery.isLoading])
+  }, [feedQuery.data?.feed.url, feedQuery.isError, feedQuery.isLoading, id, url])
 
   return (
     <div
@@ -250,7 +250,7 @@ const FeedInnerForm = ({
 
   useEffect(() => {
     setClickOutSideToDismiss(!form.formState.isDirty)
-  }, [form.formState.isDirty])
+  }, [form.formState.isDirty, setClickOutSideToDismiss])
 
   useEffect(() => {
     if (subscription) {
@@ -262,7 +262,7 @@ const FeedInnerForm = ({
         form.setValue("hideFromTimeline", subscription.hideFromTimeline)
       subscription?.title && form.setValue("title", subscription.title)
     }
-  }, [subscription])
+  }, [form, subscription])
 
   useEffect(() => {
     if (
@@ -272,7 +272,7 @@ const FeedInnerForm = ({
     ) {
       form.setValue("view", `${analytics.view}`)
     }
-  }, [analytics, subscription, defaultValues?.view])
+  }, [analytics, defaultValues?.view, form, subscription])
 
   const followMutation = useMutation({
     mutationFn: async (values: z.infer<typeof formSchema>) => {

apps/desktop/layer/renderer/src/modules/power/my-wallet-section/withdraw.tsx

@@ -31,6 +31,8 @@ import { useTOTPModalWrapper } from "~/modules/profile/hooks"
 import { Balance } from "~/modules/wallet/balance"
 import { useWallet, wallet as walletActions } from "~/queries/wallet"
 
+const RSS3_CONVERSION_RATE = 0.043
+
 export const WithdrawButton = () => {
   const { t } = useTranslation("settings")
   const { present } = useModalStack()
@@ -54,18 +56,22 @@ const WithdrawModalContent = ({ dismiss }: { dismiss: () => void }) => {
   const wallet = useWallet()
   const cashablePowerTokenBigInt = [BigInt(wallet.data?.[0]!.cashablePowerToken || 0n), 18] as const
   const cashablePowerTokenNumber = toNumber(cashablePowerTokenBigInt)
+  const walletAddress = wallet.data?.[0]?.address ?? "-"
 
   const formSchema = z.object({
     address: z.string().startsWith("0x").length(42),
     amount: z.number().positive().max(cashablePowerTokenNumber),
-    toRss3: z.boolean().optional(),
+    toRss3: z.boolean(),
   })
 
   const form = useForm<z.infer<typeof formSchema>>({
     resolver: zodResolver(formSchema),
+    defaultValues: {
+      toRss3: true,
+    },
   })
-
-  const rss3ConversionRate: number | null = null
+  const withdrawAmount = form.watch("amount")
+  const receiveAmount = Number.isFinite(withdrawAmount) ? withdrawAmount * RSS3_CONVERSION_RATE : 0
 
   const mutation = useMutation({
     mutationFn: async ({
@@ -91,7 +97,7 @@ const WithdrawModalContent = ({ dismiss }: { dismiss: () => void }) => {
   const present = useTOTPModalWrapper(mutation.mutateAsync, { force: true })
 
   const onSubmit = (values: z.infer<typeof formSchema>) => {
-    present(values)
+    present({ ...values, toRss3: true })
   }
 
   useEffect(() => {
@@ -126,6 +132,9 @@ const WithdrawModalContent = ({ dismiss }: { dismiss: () => void }) => {
       </div>
       <Form {...form}>
         <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4 lg:w-96">
+          <div className="rounded-md border border-orange/20 bg-orange/10 p-3 text-xs leading-relaxed text-text-secondary">
+            {t("wallet.withdraw.gasFeeNotice", { address: walletAddress })}
+          </div>
           <FormField
             control={form.control}
             name="address"
@@ -161,7 +170,7 @@ const WithdrawModalContent = ({ dismiss }: { dismiss: () => void }) => {
           <FormField
             control={form.control}
             name="toRss3"
-            render={({ field }) => (
+            render={() => (
               <FormItem>
                 <div className="flex items-center gap-2">
                   <FormLabel className="flex items-center gap-1">
@@ -173,25 +182,23 @@ const WithdrawModalContent = ({ dismiss }: { dismiss: () => void }) => {
                       <TooltipPortal>
                         <TooltipContent>
                           <span className="text-xs text-gray-500">
-                            <span>1 POWER = {rss3ConversionRate ?? "-"} RSS3</span>
+                            <span>1 POWER = {RSS3_CONVERSION_RATE} RSS3</span>
                           </span>
                         </TooltipContent>
                       </TooltipPortal>
                     </Tooltip>
                   </FormLabel>
                   <FormControl className="!mt-0">
                     <span className="inline-flex">
-                      <Switch checked={field.value} onCheckedChange={field.onChange} />
+                      <Switch checked={true} disabled />
                     </span>
                   </FormControl>
                 </div>
-                {field.value && rss3ConversionRate !== null && (
-                  <span className="text-xs text-gray-500">
-                    {t("wallet.withdraw.receiveRSS3", {
-                      amount: ((form.watch("amount") || 0) * rss3ConversionRate).toFixed(4),
-                    })}
-                  </span>
-                )}
+                <span className="text-xs text-gray-500">
+                  {t("wallet.withdraw.receiveRSS3", {
+                    amount: receiveAmount.toFixed(4),
+                  })}
+                </span>
                 <FormMessage />
               </FormItem>
             )}

apps/desktop/layer/renderer/src/modules/rsshub/add-modal-content.tsx

@@ -55,7 +55,7 @@ export function AddModalContent({
     if (addRSSHubMutation.isSuccess) {
       dismiss()
     }
-  }, [addRSSHubMutation.isSuccess])
+  }, [addRSSHubMutation.isSuccess, dismiss])
 
   useEffect(() => {
     if (details.data?.instance.baseUrl) {
@@ -64,12 +64,11 @@ export function AddModalContent({
         accessKey: details.data.instance.accessKey || undefined,
       })
     }
-  }, [details.data])
+  }, [details.data, form])
 
   const codes = [
     `FOLLOW_OWNER_USER_ID=${me?.handle || me?.id}      # User id or handle of your follow account`,
     `FOLLOW_DESCRIPTION=${instance?.description || `${me?.name}'s instance`} # The description of your instance`,
-    `FOLLOW_PRICE=${instance?.price || 100}                 # The monthly price of your instance, set to 0 means free.`,
     `FOLLOW_USER_LIMIT=${instance?.userLimit || 1000}           # The user limit of your instance, set it to 0 or 1 can make your instance private, leaving it empty means no restriction`,
   ]
 

apps/desktop/layer/renderer/src/modules/rsshub/set-modal-content.tsx

@@ -1,25 +1,10 @@
 import { Button } from "@follow/components/ui/button/index.js"
 import { Card, CardContent } from "@follow/components/ui/card/index.js"
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from "@follow/components/ui/form/index.jsx"
-import { Input } from "@follow/components/ui/input/Input.js"
-import { whoami } from "@follow/store/user/getters"
 import type { RSSHubListItem } from "@follow-app/client-sdk"
-import { zodResolver } from "@hookform/resolvers/zod"
 import { useEffect } from "react"
-import { useForm } from "react-hook-form"
-import { Trans, useTranslation } from "react-i18next"
-import { z } from "zod"
+import { useTranslation } from "react-i18next"
 
-import { useAuthQuery } from "~/hooks/common"
 import { UserAvatar } from "~/modules/user/UserAvatar"
-import { Queries } from "~/queries"
 import { useSetRSSHubMutation } from "~/queries/rsshub"
 
 import { useTOTPModalWrapper } from "../profile/hooks"
@@ -34,35 +19,12 @@ export function SetModalContent({
   const { t } = useTranslation("settings")
   const setRSSHubMutation = useSetRSSHubMutation()
   const preset = useTOTPModalWrapper(setRSSHubMutation.mutateAsync)
-  const details = useAuthQuery(Queries.rsshub.get({ id: instance.id }))
-  const hasPurchase = !!details.data?.purchase
-  const price = instance.ownerUserId === whoami()?.id ? 0 : instance.price
-
-  const formSchema = z.object({
-    months: z.coerce
-      .number()
-      .min(hasPurchase ? 0 : 1)
-      .max(12),
-  })
-
-  const form = useForm<z.infer<typeof formSchema>>({
-    resolver: zodResolver(formSchema),
-    defaultValues: {
-      months: hasPurchase ? 0 : 1,
-    },
-  })
-
-  const months = form.watch("months")
-
-  const onSubmit = (data: z.infer<typeof formSchema>) => {
-    preset({ id: instance.id, durationInMonths: data.months })
-  }
 
   useEffect(() => {
     if (setRSSHubMutation.isSuccess) {
       dismiss()
     }
-  }, [setRSSHubMutation.isSuccess])
+  }, [setRSSHubMutation.isSuccess, dismiss])
 
   return (
     <div className="max-w-[550px] space-y-4 lg:min-w-[550px]">
@@ -85,12 +47,6 @@ export function SetModalContent({
                 <td className="text-sm text-text-secondary">{t("rsshub.table.description")}</td>
                 <td className="line-clamp-2">{instance.description}</td>
               </tr>
-              <tr>
-                <td className="text-sm text-text-secondary">{t("rsshub.table.price")}</td>
-                <td className="flex items-center gap-1">
-                  {instance.price} <i className="i-mgc-power text-folo" />
-                </td>
-              </tr>
               <tr>
                 <td className="text-sm text-text-secondary">{t("rsshub.table.userCount")}</td>
                 <td>{instance.userCount}</td>
@@ -103,64 +59,15 @@ export function SetModalContent({
           </table>
         </CardContent>
       </Card>
-      {details.data?.purchase && (
-        <div>
-          <div className="text-sm text-text-secondary">
-            {t("rsshub.useModal.purchase_expires_at")}
-          </div>
-          <div className="line-clamp-2">
-            {new Date(details.data.purchase.expiresAt).toLocaleString()}
-          </div>
-        </div>
-      )}
-      <Form {...form}>
-        <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-          {price > 0 && (
-            <FormField
-              control={form.control}
-              name="months"
-              render={({ field }) => (
-                <FormItem className="flex flex-row items-center gap-4">
-                  <FormLabel>{t("rsshub.useModal.months_label")}</FormLabel>
-                  <FormControl className="!mt-0">
-                    <div className="flex items-center gap-10">
-                      <div className="space-x-2">
-                        <Input
-                          className="w-24"
-                          type="number"
-                          inputMode="numeric"
-                          pattern="[0-9]*"
-                          max={12}
-                          min={hasPurchase ? 0 : 1}
-                          {...field}
-                        />
-                        <span className="text-sm text-text-secondary">
-                          {t("rsshub.useModal.month")}
-                        </span>
-                      </div>
-                    </div>
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-          )}
-          <div className="flex items-center justify-end">
-            <Button type="submit" isLoading={setRSSHubMutation.isPending}>
-              {price ? (
-                <Trans
-                  ns="settings"
-                  i18nKey={"rsshub.useModal.useWith"}
-                  components={{ Power: <i className="i-mgc-power ml-1 text-white" /> }}
-                  values={{ amount: price * months }}
-                />
-              ) : (
-                t("rsshub.table.use")
-              )}
-            </Button>
-          </div>
-        </form>
-      </Form>
+      <div className="flex items-center justify-end">
+        <Button
+          type="button"
+          isLoading={setRSSHubMutation.isPending}
+          onClick={() => preset({ id: instance.id })}
+        >
+          {t("rsshub.table.use")}
+        </Button>
+      </div>
     </div>
   )
 }

apps/desktop/layer/renderer/src/modules/settings/control.tsx

@@ -47,8 +47,12 @@ export const PaidBadge: Component<{
       </TooltipTrigger>
       <TooltipPortal>
         <TooltipContent>
-          {paidLevel === SettingPaidLevels.FreeLimited && t("control.paid_badge.free_limited")}
-          {paidLevel === SettingPaidLevels.Basic && t("control.paid_badge.basic_or_higher")}
+          {paidLevel === SettingPaidLevels.FreeLimited && (
+            <span>{t("control.paid_badge.free_limited")}</span>
+          )}
+          {paidLevel === SettingPaidLevels.Basic && (
+            <span>{t("control.paid_badge.basic_or_higher")}</span>
+          )}
         </TooltipContent>
       </TooltipPortal>
     </Tooltip>

apps/desktop/layer/renderer/src/modules/user/ProfileButton.tsx

@@ -139,7 +139,7 @@ export const ProfileButton: FC<ProfileButtonProps> = memo((props) => {
             }}
             icon={<i className="i-mgc-power-outline" />}
           >
-            {t("user_button.power")}
+            {t("user_button.wallet")}
           </DropdownMenuItem>
         )}
         <DropdownMenuItem

apps/desktop/layer/renderer/src/pages/(main)/(layer)/(subview)/rsshub/index.tsx

@@ -2,7 +2,7 @@ import { Logo } from "@follow/components/icons/logo.jsx"
 import { Button } from "@follow/components/ui/button/index.js"
 import { RSSHubLogo } from "@follow/components/ui/platform-icon/icons.js"
 import { whoami } from "@follow/store/user/getters"
-import { cn, formatNumber } from "@follow/utils/utils"
+import { cn } from "@follow/utils/utils"
 import type { RSSHubListItem } from "@follow-app/client-sdk"
 import { memo, useCallback, useEffect } from "react"
 import { useTranslation } from "react-i18next"
@@ -110,7 +110,6 @@ const InstanceCard = memo(({ item }: { item: InstanceItem }) => {
   )
 
   const title = isOfficial ? "Folo Official" : ""
-  const price = isOfficial ? 0 : instance.price
   const description = isOfficial ? "Folo Built-in RSSHub" : instance.description
 
   const usersStat = isOfficial ? "*" : instance.userCount || 0
@@ -166,11 +165,6 @@ const InstanceCard = memo(({ item }: { item: InstanceItem }) => {
             <div className="flex items-center gap-1">{tags}</div>
           </div>
         </div>
-        <div className="text-right">
-          <div className="flex items-center gap-1 text-sm font-medium">
-            {formatNumber(price ?? 0)} <i className="i-mgc-power size-3 text-folo" />
-          </div>
-        </div>
       </div>
 
       <p className="mb-3 line-clamp-1 text-xs text-text-secondary">{description}</p>
@@ -276,7 +270,7 @@ function List({ data }: { data?: RSSHubListItem[] }) {
 
       // full load last
       if (loadA === 1 && loadB === 1) {
-        return a.price - b.price
+        return 0
       }
       if (loadA === 1) {
         return 1
@@ -285,7 +279,7 @@ function List({ data }: { data?: RSSHubListItem[] }) {
         return -1
       }
 
-      return a.price - b.price || loadA - loadB
+      return loadA - loadB
     }) || []),
   ]
 

apps/desktop/vite.config.ts

@@ -108,7 +108,7 @@ export default ({ mode }) => {
       host: true,
       port: 2233,
       watch: {
-        ignored: ["**/dist/**", "**/out/**", "**/public/**", ".git/**"],
+        ignored: ["**/dist/**", "**/out/**", "**/public/**", ".git/**", "**/.env", "**/.env.*"],
       },
       cors: true,
       headers: {

apps/landing/src/components/widgets/landing/SocialProof.tsx

@@ -7,7 +7,7 @@ import { MagicCard } from '~/components/ui/magic-card'
 const tweetList = [
   {
     id: '1833056589135442345',
-    text: "Very nice news aggregation, and it gives 2 power token everyday, so far I just try move front end people I followed in, haven't done yet, will try move more rss subscribe.",
+    text: "Very nice news aggregation. So far I just try move front end people I followed in, haven't done yet, will try move more rss subscribe.",
     name: '🦋 AnneInCoding',
     screenName: '@anneincoding',
     profileImageUrl: