RSSNext
diff --git a/‎apps/desktop/layer/renderer/src/atoms/app.ts
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/atoms/app.ts
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/modules/action/target-action-list.tsx
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎apps/desktop/layer/renderer/src/modules/action/target-action-list.tsx
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/desktop/layer/renderer/src/modules/settings/tabs/notifications.tsx
Copy file name to clipboard
+115Lines changed: 115 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/modules/settings/tabs/notifications.tsx
Copy file name to clipboard
+115Lines changed: 115 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/pages/settings/(settings)/notifications.tsx
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/pages/settings/(settings)/notifications.tsx
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/push-notification.ts
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/push-notification.ts
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎apps/desktop/layer/renderer/src/queries/messaging.ts
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions b/‎apps/desktop/layer/renderer/src/queries/messaging.ts
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions
diff --git a/‎apps/mobile/src/icons/bell_ringing_cute_fi.tsx
Copy file name to clipboard
-24Lines changed: 0 additions & 24 deletions b/‎apps/mobile/src/icons/bell_ringing_cute_fi.tsx
Copy file name to clipboard
-24Lines changed: 0 additions & 24 deletions
diff --git a/‎apps/mobile/src/icons/bell_ringing_cute_re.tsx
Copy file name to clipboard
-24Lines changed: 0 additions & 24 deletions b/‎apps/mobile/src/icons/bell_ringing_cute_re.tsx
Copy file name to clipboard
-24Lines changed: 0 additions & 24 deletions
diff --git a/‎apps/mobile/src/icons/fire_cute_re.tsx
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions b/‎apps/mobile/src/icons/fire_cute_re.tsx
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions
diff --git a/‎apps/mobile/src/icons/notification_cute_re.tsx
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions b/‎apps/mobile/src/icons/notification_cute_re.tsx
Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions
@@ -4,6 +4,8 @@ import { atom } from "jotai"
 import { createAtomHooks } from "~/lib/jotai"
 
 export const [, , useAppIsReady, , appIsReady, setAppIsReady] = createAtomHooks(atom(false))
+export const [, , useAppMessagingToken, , appMessagingToken, setAppMessagingToken] =
+  createAtomHooks(atom<string | null>(null))
 
 export const [, , useAppSearchOpen, , , setAppSearchOpen] = createAtomHooks(atom(false))
 
 
@@ -119,7 +119,7 @@ export const TargetActionList = ({ index }: { index: number }) => {
       },
       {
         title: t("actions.action_card.new_entry_notification"),
-        icon: <i className="i-mgc-bell-ringing-cute-re" />,
+        icon: <i className="i-mgc-notification-cute-re" />,
         enabled: !!newEntryNotification,
         onInit: (data) => {
           data.result.newEntryNotification = true
 
@@ -0,0 +1,115 @@
+import { Button } from "@follow/components/ui/button/index.js"
+import { Divider } from "@follow/components/ui/divider/index.js"
+import { LoadingCircle } from "@follow/components/ui/loading/index.jsx"
+import { ScrollArea } from "@follow/components/ui/scroll-area/index.js"
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from "@follow/components/ui/table/index.jsx"
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipPortal,
+  TooltipTrigger,
+} from "@follow/components/ui/tooltip/index.jsx"
+import { Trans } from "react-i18next"
+import { Link } from "react-router"
+import { toast } from "sonner"
+
+import { useAppMessagingToken } from "~/atoms/app"
+import { useCurrentModal } from "~/components/ui/modal/stacked/hooks"
+import { useI18n } from "~/hooks/common"
+import { useMessaging, useTestMessaging } from "~/queries/messaging"
+
+export const SettingNotifications = () => {
+  const t = useI18n()
+  const { isLoading, data } = useMessaging()
+  const { dismiss } = useCurrentModal()
+
+  const token = useAppMessagingToken()
+
+  const testMessaging = useTestMessaging()
+
+  return (
+    <section className="mt-4">
+      <div className="mb-4 space-y-2 text-sm">
+        <p>
+          <Trans
+            ns="settings"
+            i18nKey="notifications.info"
+            components={{
+              ActionsLink: (
+                <Link
+                  className="underline"
+                  to="/action"
+                  onClick={() => {
+                    dismiss()
+                  }}
+                />
+              ),
+            }}
+          />
+        </p>
+      </div>
+      <Divider className="mb-6 mt-8" />
+      <div className="flex flex-1 flex-col">
+        {isLoading && <LoadingCircle size="large" className="center absolute inset-0" />}
+
+        <ScrollArea.ScrollArea viewportClassName="max-h-[380px]">
+          <div className="overflow-auto">
+            <Table className="mt-4">
+              <TableHeader>
+                <TableRow className="[&_*]:!font-semibold">
+                  <TableHead size="sm">{t.settings("notifications.channel")}</TableHead>
+                  <TableHead size="sm">{t.settings("notifications.token")}</TableHead>
+                  <TableHead size="sm" className="center">
+                    {t.common("words.actions")}
+                  </TableHead>
+                </TableRow>
+              </TableHeader>
+              <TableBody className="border-t-[12px] border-transparent [&_td]:!px-3">
+                {data?.data?.map((row) => (
+                  <TableRow key={row.channel} className="h-8">
+                    <TableCell size="sm">{row.channel}</TableCell>
+                    <TableCell size="sm" className="truncate">
+                      {row.token.slice(0, 6)}...{row.token.slice(-6)}
+                      {row.token === token && ` ${t.settings("notifications.current")}`}
+                    </TableCell>
+                    <TableCell size="sm" className="center">
+                      <Tooltip>
+                        <TooltipTrigger asChild>
+                          <Button
+                            variant="ghost"
+                            onClick={() =>
+                              testMessaging.mutate(
+                                { channel: row.channel },
+                                {
+                                  onSuccess: () => {
+                                    toast.success(t.settings("notifications.test_success"))
+                                  },
+                                },
+                              )
+                            }
+                          >
+                            <i className="i-mgc-finger-press-cute-re" />
+                          </Button>
+                        </TooltipTrigger>
+                        <TooltipPortal>
+                          <TooltipContent>{t.settings("notifications.test")}</TooltipContent>
+                        </TooltipPortal>
+                      </Tooltip>
+                    </TableCell>
+                  </TableRow>
+                ))}
+              </TableBody>
+            </Table>
+          </div>
+        </ScrollArea.ScrollArea>
+      </div>
+    </section>
+  )
+}
@@ -0,0 +1,24 @@
+import { UserRole } from "@follow/constants"
+
+import { SettingNotifications } from "~/modules/settings/tabs/notifications"
+import { SettingsTitle } from "~/modules/settings/title"
+import { defineSettingPageData, DisableWhy } from "~/modules/settings/utils"
+
+const iconName = "i-mgc-notification-cute-re"
+const priority = 1040
+
+export const loader = defineSettingPageData({
+  icon: iconName,
+  name: "titles.notifications",
+  priority,
+  disableIf: (ctx) => [ctx.role === UserRole.Trial, DisableWhy.NotActivation],
+})
+
+export function Component() {
+  return (
+    <>
+      <SettingsTitle />
+      <SettingNotifications />
+    </>
+  )
+}
@@ -2,6 +2,7 @@ import { env } from "@follow/shared/env.desktop"
 import { initializeApp } from "firebase/app"
 import { getMessaging, getToken } from "firebase/messaging"
 
+import { setAppMessagingToken } from "./atoms/app"
 import { apiClient } from "./lib/api-fetch"
 import { router } from "./router"
 
@@ -52,6 +53,8 @@ export async function registerWebPushNotifications() {
 
     registerPushNotificationPostMessage()
 
+    setAppMessagingToken(token)
+
     return token
   } catch (error) {
     if (error instanceof Error) {
 
@@ -0,0 +1,24 @@
+import { useMutation } from "@tanstack/react-query"
+
+import { useAuthQuery } from "~/hooks/common"
+import { apiClient } from "~/lib/api-fetch"
+import { defineQuery } from "~/lib/defineQuery"
+
+export const messaging = {
+  list: () =>
+    defineQuery(["messaging"], () => apiClient.messaging.$get(), {
+      rootKey: ["messaging"],
+    }),
+}
+
+export const useMessaging = () => useAuthQuery(messaging.list())
+
+export const useTestMessaging = () =>
+  useMutation({
+    mutationFn: ({ channel }: { channel: string }) =>
+      apiClient.messaging.test.$get({
+        query: {
+          channel,
+        },
+      }),
+  })
@@ -0,0 +1,24 @@
+import * as React from "react"
+import Svg, { Path } from "react-native-svg"
+
+interface FireCuteReIconProps {
+  width?: number
+  height?: number
+  color?: string
+}
+
+export const FireCuteReIcon = ({
+  width = 24,
+  height = 24,
+  color = "#10161F",
+}: FireCuteReIconProps) => {
+  return (
+    <Svg width={width} height={height} fill="none" viewBox="0 0 24 24">
+      <Path
+        d="M11 2.771c-.682.247-1.043.641-1.422 1.553-.66 1.59-1.744 3.07-3.247 4.436-1.351 1.227-2.122 2.184-2.711 3.37-.816 1.642-.988 3.211-.525 4.793.648 2.213 2.547 4.052 4.934 4.78.394.12.517.141.751.128a1.454 1.454 0 0 0 1.252-.862c.154-.331.151-.814-.006-1.289-.399-1.205-.264-2.124.449-3.068.246-.326.98-1.052 1.063-1.052.024 0 .124.129.223.286.098.158.392.576.652.93.489.666.7 1.045.792 1.424.076.318.067 1.133-.02 1.76-.072.511-.072.554-.009.799a1.48 1.48 0 0 0 1.224 1.124c.289.047.624-.004 1.46-.222 1.381-.36 2.464-.97 3.329-1.876 1.074-1.123 1.621-2.508 1.774-4.485.134-1.732-.214-3.256-1.182-5.181a17.995 17.995 0 0 0-1.106-1.888c-.327-.489-.937-1.291-1.124-1.479a1.779 1.779 0 0 0-2.071-.313 1.465 1.465 0 0 0-.251.153c-.09.079-.115.05-.226-.272-.144-.413-.533-1.187-.802-1.597a7.477 7.477 0 0 0-1.091-1.331c-.305-.303-.46-.422-.698-.54-.288-.142-.332-.152-.729-.163-.362-.01-.46.002-.683.082m.918 2.259c.619.675 1.012 1.375 1.342 2.391.241.743.35.951.659 1.262.259.26.569.423.908.478.527.085 1.091-.155 1.359-.579a.847.847 0 0 1 .134-.179c.028 0 .468.594.712.962.948 1.423 1.595 2.837 1.849 4.04.162.772.146 1.891-.04 2.775-.314 1.487-1.025 2.455-2.274 3.094-.316.161-1.195.486-1.316.486-.017 0-.02-.193-.006-.43.05-.844-.059-1.63-.313-2.25-.182-.444-.335-.695-.867-1.419a18.193 18.193 0 0 1-.656-.948c-.367-.597-.888-1.001-1.438-1.115a3.002 3.002 0 0 0-.594-.031c-.326.014-.402.033-.666.164-.373.184-1.066.772-1.497 1.27-.717.83-1.115 1.584-1.318 2.499-.082.372-.098 1.522-.025 1.819a.595.595 0 0 1 .03.194c-.028.027-.577-.28-.888-.496-.886-.617-1.58-1.47-1.893-2.327-.442-1.208-.36-2.349.26-3.63.401-.829.877-1.452 1.756-2.3 1.836-1.771 2.375-2.376 3.124-3.5.549-.824.957-1.598 1.239-2.35.04-.104.086-.19.103-.19s.16.139.316.31"
+        fill={color}
+        fillRule="evenodd"
+      />
+    </Svg>
+  )
+}
@@ -0,0 +1,24 @@
+import * as React from "react"
+import Svg, { Path } from "react-native-svg"
+
+interface NotificationCuteReIconProps {
+  width?: number
+  height?: number
+  color?: string
+}
+
+export const NotificationCuteReIcon = ({
+  width = 24,
+  height = 24,
+  color = "#10161F",
+}: NotificationCuteReIconProps) => {
+  return (
+    <Svg width={width} height={height} fill="none" viewBox="0 0 24 24">
+      <Path
+        d="M11.204 2.043A7.587 7.587 0 0 0 5.993 5.02a7.874 7.874 0 0 0-1.239 2.554c-.19.731-.201.862-.235 2.766-.042 2.377-.053 2.432-.738 3.86-.433.9-.485 1.043-.521 1.422-.037.388.031.738.219 1.131.273.567.743.965 1.382 1.169.111.035.628.058 1.712.074l1.553.024.094.268a4.044 4.044 0 0 0 1.94 2.248c.451.231.77.335 1.235.406.484.072.726.072 1.21 0a4.015 4.015 0 0 0 3.175-2.654l.094-.268 1.553-.024c1.084-.016 1.601-.039 1.712-.074.639-.204 1.109-.602 1.382-1.169.188-.393.256-.743.219-1.131-.036-.376-.088-.517-.522-1.422-.682-1.423-.7-1.516-.739-3.88-.032-1.886-.043-2.013-.233-2.746-.228-.88-.709-1.854-1.3-2.633-.318-.42-1.004-1.104-1.406-1.402-1.008-.747-2.088-1.219-3.26-1.423-.536-.093-1.574-.13-2.076-.073m1.576 2.016c1.99.289 3.716 1.689 4.379 3.551.294.828.323 1.076.359 3.11.034 1.894.048 2.041.267 2.808.136.477.326.936.677 1.636.164.327.298.621.298.653 0 .031-.028.086-.063.12-.056.057-.719.063-6.697.063s-6.641-.006-6.697-.063c-.035-.034-.063-.089-.063-.12 0-.032.134-.326.298-.653.351-.7.541-1.159.677-1.636.219-.767.233-.914.267-2.808.017-.99.051-1.895.077-2.04.219-1.253.688-2.169 1.559-3.043.731-.734 1.463-1.166 2.442-1.442a5.559 5.559 0 0 1 2.22-.136m.94 13.982c0 .022-.13.173-.29.335-.309.313-.566.467-.938.564a2.073 2.073 0 0 1-1.423-.165c-.2-.101-.789-.649-.789-.734 0-.027.578-.041 1.72-.041s1.72.014 1.72.041"
+        fill={color}
+        fillRule="evenodd"
+      />
+    </Svg>
+  )
+}
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ export const TargetActionList = ({ index }: { index: number }) => {`
`119`	`119`	`},`
`120`	`120`	`{`
`121`	`121`	`title: t("actions.action_card.new_entry_notification"),`
`122`		`- icon: <i className="i-mgc-bell-ringing-cute-re" />,`
	`122`	`+ icon: <i className="i-mgc-notification-cute-re" />,`
`123`	`123`	`enabled: !!newEntryNotification,`
`124`	`124`	`onInit: (data) => {`
`125`	`125`	`data.result.newEntryNotification = true`