Fixed issue where group messages got marked as unread

kryptokrona · Mar 2, 2024 · b3ea7d9 · b3ea7d9
1 parent fc0be97
commit b3ea7d9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/Database.js b/src/Database.js
@@ -677,7 +677,7 @@ export async function deleteKnownTransaction(txhash) {
 
 export async function saveGroupMessage(group, type, message, timestamp, nickname, address, reply, hash) {
 
-  const read = (address == Globals.wallet.getPrimaryAddress() ? 1 : 0);
+  const read = (address == Globals?.wallet.getPrimaryAddress() || Globals?.activeGroup == group ? 1 : 0);
 
   console.log('Saving group message', group, type, message, timestamp, nickname, address, read);
 

diff --git a/src/Globals.js b/src/Globals.js
@@ -92,7 +92,7 @@ class globals {
 
         this.activeChat = '';
 
-        this.activeBoard = '';
+        this.activeGroup = '';
 
         this.language = 'en-US';
 

diff --git a/src/Groups.js b/src/Groups.js
@@ -833,13 +833,13 @@ export class GroupChatScreenNoTranslation extends React.Component {
           messages: messages
         });
 
-        Globals.activeChat = this.state.key;
+        Globals.activeGroup = this.state.key;
 
     }
 
     async componentWillUnmount() {
 
-        Globals.activeChat = '';
+        Globals.activeGroup = '';
         Globals.updateGroupsFunctions.pop();
 
     }

diff --git a/src/HuginUtilities.js b/src/HuginUtilities.js
@@ -811,7 +811,7 @@ async function getGroupMessage(tx) {
 
   const groupname = await getGroupName(key);
 
-    if (Globals.activeChat != key && !from_myself) {
+    if (Globals.activeGroup != key && !from_myself) {
 
       Globals.notificationQueue.push({
         title: `${nickname} in ${groupname}`,//'Incoming transaction received!',