From e11775a2e05d0e516ca3b28005d08afa8e2de2ca Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Thu, 14 Apr 2022 15:42:22 +1000
Subject: [PATCH] fix color of opengroup invitation

---
 stylesheets/_conversation.scss                  | 17 ++++++++++++-----
 ts/receiver/opengroup.ts                        |  2 +-
 .../opengroupV2/OpenGroupServerPoller.ts        |  8 +++++++-
 ts/test/session/unit/updater/updater_test.ts    |  2 +-
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index ce6881a59..32879b7fe 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -55,15 +55,10 @@
       flex-direction: column;
 
       padding: 0px 12px;
-      color: var(--color-text-opposite);
       .group-name {
         font-weight: bold;
         font-size: 18px;
       }
-
-      .group-address {
-        color: var(--color-text);
-      }
     }
 
     .session-icon-button {
@@ -79,3 +74,15 @@
     }
   }
 }
+
+.group-invitation {
+  .group-details {
+    color: var(--color-received-message-text);
+  }
+}
+
+.group-invitation.invitation-outgoing {
+  .group-details {
+    color: var(--color-sent-message-text);
+  }
+}
diff --git a/ts/receiver/opengroup.ts b/ts/receiver/opengroup.ts
index d18de80e2..48c7ce5ba 100644
--- a/ts/receiver/opengroup.ts
+++ b/ts/receiver/opengroup.ts
@@ -72,7 +72,7 @@ export async function handleOpenGroupV2Message(
       ? createPublicMessageSentFromUs(commonAttributes)
       : createPublicMessageSentFromNotUs(attributesForNotUs);
 
-    // Note, deduplication is made in filterDuplicatesFromDbAndIncoming now
+    // Note: deduplication is made in filterDuplicatesFromDbAndIncoming now
 
     await handleMessageJob(
       msgModel,
diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
index 696adef7a..b04ab019b 100644
--- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
+++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts
@@ -11,7 +11,7 @@ import {
   ParsedMemberCount,
   ParsedRoomCompactPollResults,
 } from './OpenGroupAPIV2CompactPoll';
-import _ from 'lodash';
+import _, { now } from 'lodash';
 import { ConversationModel } from '../../../../models/conversation';
 import { getMessageIdsFromServerIds, removeMessage } from '../../../../data/data';
 import { getV2OpenGroupRoom, saveV2OpenGroupRoom } from '../../../../data/opengroups';
@@ -423,6 +423,7 @@ const handleNewMessages = async (
     // this call filters duplicates based on the sender & senttimestamp from the incoming messages array and the database
     const filteredDuplicates = await filterDuplicatesFromDbAndIncoming(newMessages);
 
+    const startHandleOpengroupMessage = now();
     // tslint:disable-next-line: prefer-for-of
     for (let index = 0; index < filteredDuplicates.length; index++) {
       const newMessage = filteredDuplicates[index];
@@ -433,6 +434,11 @@ const handleNewMessages = async (
       }
     }
 
+    window.log.debug(
+      `[perf] handle ${filteredDuplicates.length} opengroupMessages took ${now() -
+        startHandleOpengroupMessage}ms.`
+    );
+
     // we need to update the timestamp even if we don't have a new MaxMessageServerId
     if (roomInfos) {
       roomInfos.lastMessageFetchedServerID = maxNewMessageId;
diff --git a/ts/test/session/unit/updater/updater_test.ts b/ts/test/session/unit/updater/updater_test.ts
index bce28eb9e..34511043a 100644
--- a/ts/test/session/unit/updater/updater_test.ts
+++ b/ts/test/session/unit/updater/updater_test.ts
@@ -1,4 +1,4 @@
 describe('Updater', () => {
   // tslint:disable-next-line: no-empty
-  it.skip('updater test', () => {});
+  it.skip('isUpdateAvailable', () => {});
 });