diff --git a/src/background.ts b/src/background.ts index bdb1862..8d599fa 100644 --- a/src/background.ts +++ b/src/background.ts @@ -478,7 +478,7 @@ const handleNotification = async (groups) => { if(!isArray(mutedGroups)) mutedGroups = [] let isFocused; - const data = groups.filter((group) => group?.sender !== address && !mutedGroups.includes(group.groupId)); + const data = groups.filter((group) => group?.sender !== address && !mutedGroups.includes(group.groupId) && !group?.chatReference); try { if(isDisableNotifications) return if (!data || data?.length === 0) return; diff --git a/src/components/Chat/ChatGroup.tsx b/src/components/Chat/ChatGroup.tsx index 1022fa7..7a78ee1 100644 --- a/src/components/Chat/ChatGroup.tsx +++ b/src/components/Chat/ChatGroup.tsx @@ -128,7 +128,7 @@ export const ChatGroup = ({selectedGroup, secretKey, setSecretKey, getSecretKey, id: item.signature, text: item?.decryptedData?.message || "", repliedTo: item?.decryptedData?.repliedTo, - unread: item?.sender === myAddress ? false : true + unread: item?.sender === myAddress ? false : !!item?.chatReference ? false : true } } ) setMessages((prev)=> [...prev, ...formatted]) diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx index 098986f..0c9080e 100644 --- a/src/components/Group/Group.tsx +++ b/src/components/Group/Group.tsx @@ -621,7 +621,7 @@ export const Group = ({ isExtMsg(group?.data) && group?.sender !== myAddress && group?.timestamp && - ((!timestampEnterData[group?.groupId] && + ((!timestampEnterData[group?.groupId] && !group?.chatReference && Date.now() - group?.timestamp < timeDifferenceForNotificationChats) || timestampEnterData[group?.groupId] < group?.timestamp) ) { @@ -1102,7 +1102,7 @@ export const Group = ({ if (!findGroup) return false; if (!findGroup?.data || !isExtMsg(findGroup?.data)) return false; return ( - findGroup?.timestamp && + findGroup?.timestamp && !findGroup?.chatReference && ((!timestampEnterData[selectedGroup?.groupId] && Date.now() - findGroup?.timestamp < timeDifferenceForNotificationChats) || @@ -2101,7 +2101,7 @@ export const Group = ({ /> )} {group?.data && - isExtMsg(group?.data) && + isExtMsg(group?.data) && !group?.chatReference && group?.sender !== myAddress && group?.timestamp && ((!timestampEnterData[group?.groupId] && diff --git a/src/components/ReactionPicker.tsx b/src/components/ReactionPicker.tsx index c36f7b2..eb33021 100644 --- a/src/components/ReactionPicker.tsx +++ b/src/components/ReactionPicker.tsx @@ -2,6 +2,7 @@ import React, { useState, useRef, useEffect } from 'react'; import Picker, { Theme } from 'emoji-picker-react'; import './ReactionPicker.css'; // CSS for proper positioning import { ButtonBase } from '@mui/material'; +import { isMobile } from '../App'; export const ReactionPicker = ({ onReaction }) => { const [showPicker, setShowPicker] = useState(false); // Manage picker visibility @@ -51,6 +52,8 @@ export const ReactionPicker = ({ onReaction }) => { {showPicker && (