feat: notification store updated when new message arrive

TERITORI · Mar 15, 2024 · 4dafdb7 · 4dafdb7
1 parent 19ef8c1
commit 4dafdb7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -94,6 +94,7 @@ substreams-*/target
 /weshd/ios/Frameworks/
 /weshd/android/libs/
 /weshd/temp/
+temp/
 
 # eslint
 /.eslintcache

diff --git a/packages/screens/Mini/Notifications/MessengerNotificationCard.tsx b/packages/screens/Mini/Notifications/MessengerNotificationCard.tsx
@@ -40,11 +40,13 @@ export default function MessengerNotificationCard({
 
         // TODO: Change to appropriate routes
         if (item.type === "message") {
-          navigation.navigate("MiniChats", {});
+          navigation.navigate("Conversation", {
+            conversationId: item?.id,
+          });
         }
 
         if (item.type === "contact-request") {
-          navigation.navigate("MiniChats", {});
+          navigation.navigate("MiniFriend");
         }
 
         if (item.type === "group-join") {
@@ -124,7 +126,7 @@ interface NotiCardContentProps {
   id: string;
   isRead: boolean;
   title: string;
-  date: string;
+  date?: string;
   desc: string;
   link?: string;
   user?: { userAvatar?: string; username: string; id: string };

diff --git a/packages/store/slices/notification.ts b/packages/store/slices/notification.ts
@@ -18,10 +18,7 @@ export const Notification = z.object({
   timestamp: z.string().optional(),
   avatar: z.string().optional(),
   isRead: z.boolean(),
-  contactId: z.string().optional(),
-  rdvSeed: z.string().optional(),
   name: z.string().optional(),
-  peerId: z.string().optional(),
 });
 
 export type TypeNotification = z.infer<typeof Notification>;

diff --git a/packages/store/store.ts b/packages/store/store.ts
@@ -119,6 +119,7 @@ const rootPersistConfig = {
     "marketplaceCartItemsUI",
     "marketplaceFilters",
     "marketplaceFilterUI",
+    "notifications",
   ],
   blacklist: ["dAppsStore, marketplaceFilterUI", "message"],
 };

diff --git a/packages/weshnet/message/processEvent.ts b/packages/weshnet/message/processEvent.ts
@@ -16,6 +16,8 @@ import { weshConfig } from "../config";
 import { getConversationName } from "../messageHelpers";
 import { decodeJSON, stringFromBytes } from "../utils";
 
+import { setNotificationRequest } from "@/store/slices/notification";
+
 export const processMessage = async (
   data: GroupMessageEvent,
   groupPk: string,
@@ -79,6 +81,14 @@ export const processMessage = async (
           );
         }
 
+        store.dispatch(
+          setNotificationRequest({
+            id: groupPk,
+            type: "group-join",
+            isRead: false,
+          }),
+        );
+
         break;
       }
       case "group-join": {