fix: Notifications channel

limanmys · Nov 18, 2024 · 15ffea9 · 15ffea9
1 parent 1e6f42e
commit 15ffea9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/components/navigation/notifications.tsx b/src/components/navigation/notifications.tsx
@@ -92,7 +92,7 @@ export default function Notifications() {
     })
 
     echo
-      .private(`App.User.${JSON.parse(currentUser).user.id}`)
+      .private(`App.Models.User.${JSON.parse(currentUser).user.id}`)
       .notification((notification: INotification) => {
         setNotifications([notification, ...tempNotifications])
 
@@ -108,7 +108,7 @@ export default function Notifications() {
       })
 
     return () => {
-      echo.leave(`App.User.${JSON.parse(currentUser).user.id}`)
+      echo.leave(`App.Models.User.${JSON.parse(currentUser).user.id}`)
       echo.disconnect()
     }
   }, [])

diff --git a/src/components/ui/notificationcreator.tsx b/src/components/ui/notificationcreator.tsx
@@ -1,12 +1,12 @@
 import { ToastProvider } from "@radix-ui/react-toast"
 import { useTranslation } from "react-i18next"
 
-import { INotification } from "@/types/notification"
 import {
   Notification,
   NotificationClose,
   NotificationViewport,
 } from "@/components/ui/notification"
+import { INotification } from "@/types/notification"
 
 import StatusBadge, { Status } from "./status-badge"
 import { useNotification } from "./use-notification"
@@ -17,7 +17,7 @@ export function NotificationCreator() {
 
   return (
     <ToastProvider>
-      {toasts.map(function (props: INotification) {
+      {Array.from(new Map(toasts.map(toast => [toast.notification_id, toast])).values()).map(function (props: INotification) {
         return (
           <Notification key={props.notification_id}>
             <div className="relative flex w-full flex-col gap-1">