From cf9bea2954b8f7bdada94acf5c7432883bc74216 Mon Sep 17 00:00:00 2001
From: PhilReact <philliplangmartinez@gmail.com>
Date: Mon, 23 Sep 2024 20:05:27 +0300
Subject: [PATCH] notification fixes

---
 src/components/Desktop/DesktopHeader.tsx |  4 ++--
 src/components/Group/Group.tsx           |  4 ++++
 src/components/Group/GroupMenu.tsx       | 16 ++++++++--------
 src/qdn/encryption/group-encryption.ts   |  2 ++
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/components/Desktop/DesktopHeader.tsx b/src/components/Desktop/DesktopHeader.tsx
index 84dab09..929495e 100644
--- a/src/components/Desktop/DesktopHeader.tsx
+++ b/src/components/Desktop/DesktopHeader.tsx
@@ -194,7 +194,7 @@ export const DesktopHeader = ({
               height={25}
               width={20}
               color={
-                hasUnreadAnnouncements
+                isUnread
                   ? "var(--unread)"
                   : isAnnouncement
                   ? "black"
@@ -219,7 +219,7 @@ export const DesktopHeader = ({
               height={25}
               width={20}
               color={
-                hasUnreadChat
+                isUnreadChat
                   ? "var(--unread)"
                   : isChat
                   ? "black"
diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx
index 5f98782..9e4e6fc 100644
--- a/src/components/Group/Group.tsx
+++ b/src/components/Group/Group.tsx
@@ -2411,6 +2411,10 @@ export const Group = ({
                     setGroupSection={setGroupSection}
                     groupSection={groupSection}
                     setOpenManageMembers={setOpenManageMembers}
+                    goToAnnouncements={goToAnnouncements}
+                    goToChat={goToChat}
+                    hasUnreadAnnouncements={isUnread}
+                    hasUnreadChat={isUnreadChat}
                   />
                 </>
               )}
diff --git a/src/components/Group/GroupMenu.tsx b/src/components/Group/GroupMenu.tsx
index 49195c7..0e32c8a 100644
--- a/src/components/Group/GroupMenu.tsx
+++ b/src/components/Group/GroupMenu.tsx
@@ -16,7 +16,7 @@ import { ChatIcon } from "../../assets/Icons/ChatIcon";
 import { ThreadsIcon } from "../../assets/Icons/ThreadsIcon";
 import { MembersIcon } from "../../assets/Icons/MembersIcon";
 
-export const GroupMenu = ({ setGroupSection, groupSection, setOpenManageMembers }) => {
+export const GroupMenu = ({ setGroupSection, groupSection, setOpenManageMembers, goToAnnouncements, goToChat, hasUnreadChat, hasUnreadAnnouncements }) => {
   const [anchorEl, setAnchorEl] = useState(null);
   const open = Boolean(anchorEl);
 
@@ -73,13 +73,13 @@ export const GroupMenu = ({ setGroupSection, groupSection, setOpenManageMembers
             }}
           >
             {groupSection === "announcement" &&(
-                 <> <NotificationIcon2 /> {" Announcements"}</>
+                 <> <NotificationIcon2 color={hasUnreadAnnouncements || hasUnreadChat ? 'var(--unread)' : 'white'}  /> {" Announcements"}</>
             )}
              {groupSection === "chat" &&(
-                 <> <ChatIcon /> {" Hub Chats"}</>
+                 <> <ChatIcon color={hasUnreadAnnouncements || hasUnreadChat ? 'var(--unread)' : 'white'} /> {" Hub Chats"}</>
             )}
              {groupSection === "forum" &&(
-                 <> <ThreadsIcon /> {" Threads"}</>
+                 <> <ThreadsIcon color={hasUnreadAnnouncements || hasUnreadChat ? 'var(--unread)' : 'white'} /> {" Threads"}</>
             )}
           </Box>
           <ArrowDownIcon color="white" />
@@ -120,7 +120,7 @@ export const GroupMenu = ({ setGroupSection, groupSection, setOpenManageMembers
       >
         <MenuItem
           onClick={() => {
-            setGroupSection("chat");
+            goToChat()
             handleClose();
           }}
         >
@@ -128,7 +128,7 @@ export const GroupMenu = ({ setGroupSection, groupSection, setOpenManageMembers
             
             minWidth: '24px !important'
           }}>
-            <ChatIcon sx={{ color: "#fff" }} />
+            <ChatIcon sx={{ color: hasUnreadChat ? 'var(--unread)' : "#fff" }} />
           </ListItemIcon>
           <ListItemText sx={{
                   "& .MuiTypography-root": {
@@ -139,7 +139,7 @@ export const GroupMenu = ({ setGroupSection, groupSection, setOpenManageMembers
         </MenuItem>
         <MenuItem
           onClick={() => {
-            setGroupSection("announcement");
+            goToAnnouncements()
             handleClose();
           }}
         >
@@ -147,7 +147,7 @@ export const GroupMenu = ({ setGroupSection, groupSection, setOpenManageMembers
             
             minWidth: '24px !important'
           }}>
-          <NotificationIcon2 sx={{ color: "#fff" }} />
+          <NotificationIcon2 sx={{ color: hasUnreadAnnouncements ? 'var(--unread)' : "#fff" }} />
           </ListItemIcon>
           <ListItemText sx={{
                   "& .MuiTypography-root": {
diff --git a/src/qdn/encryption/group-encryption.ts b/src/qdn/encryption/group-encryption.ts
index 3c78b4f..910b2ee 100644
--- a/src/qdn/encryption/group-encryption.ts
+++ b/src/qdn/encryption/group-encryption.ts
@@ -215,6 +215,8 @@ export const decryptSingle = async ({ data64, secretKeyObject, skipDecodeBase64
 	  // New format: nonce is included in the message (first 32 characters)
 	  nonceBase64 = decodeForNumber.slice(10, 42); // First 32 characters for the nonce
 	  encryptedDataBase64 = decodeForNumber.slice(42); // The remaining part is the encrypted data
+	  
+
 	}
   
 	// Convert Base64 strings to Uint8Array