From c245454486fb020dd20da4aa12e40a4c83abf884 Mon Sep 17 00:00:00 2001 From: QuickMythril Date: Tue, 3 Dec 2024 04:08:59 -0500 Subject: [PATCH 1/2] show group chats without secret key --- src/components/Chat/ChatGroup.tsx | 1 - src/components/Group/Group.tsx | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/Chat/ChatGroup.tsx b/src/components/Chat/ChatGroup.tsx index 9d38ce8..f5039c0 100644 --- a/src/components/Chat/ChatGroup.tsx +++ b/src/components/Chat/ChatGroup.tsx @@ -182,7 +182,6 @@ const [messageSize, setMessageSize] = useState(0) try { if(!secretKeyRef.current){ checkForFirstSecretKeyNotification(encryptedMessages) - return } return new Promise((res, rej)=> { window.sendMessage("decryptSingle", { diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx index df1f0c3..5cf00ef 100644 --- a/src/components/Group/Group.tsx +++ b/src/components/Group/Group.tsx @@ -2487,8 +2487,7 @@ export const Group = ({ handleNewEncryptionNotification={ setNewEncryptionNotification } - hide={groupSection !== "chat" || !secretKey || selectedDirect || newChat} - hideView={!(desktopViewMode === 'chat' && selectedGroup)} + hide={groupSection !== "chat" || selectedDirect || newChat} handleSecretKeyCreationInProgress={ handleSecretKeyCreationInProgress } @@ -2542,6 +2541,10 @@ export const Group = ({ Wait until an admin re-encrypts the keys. + + Only unencrypted messages will be displayed. + + Try notifying an admin from the list of admins below: From 6cf438708093b6a70580bd8c804001fd49936738 Mon Sep 17 00:00:00 2001 From: QuickMythril Date: Tue, 3 Dec 2024 04:14:01 -0500 Subject: [PATCH 2/2] restore unintentionally removed code --- src/components/Group/Group.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx index 5cf00ef..51cdc76 100644 --- a/src/components/Group/Group.tsx +++ b/src/components/Group/Group.tsx @@ -2488,6 +2488,7 @@ export const Group = ({ setNewEncryptionNotification } hide={groupSection !== "chat" || selectedDirect || newChat} + hideView={!(desktopViewMode === 'chat' && selectedGroup)} handleSecretKeyCreationInProgress={ handleSecretKeyCreationInProgress }