From 71ae492316dcceaa5eb77ba48a22c9ebd326551d Mon Sep 17 00:00:00 2001
From: Kristina <kristin.fefelova@gmail.com>
Date: Tue, 13 Feb 2024 19:12:45 +0400
Subject: [PATCH] UBERF-5323: fix new messages marker (#4614)

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
---
 .../src/components/ChannelScrollView.svelte     | 17 +++++++----------
 .../chat/navigator/ChatNavGroup.svelte          |  7 ++-----
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/plugins/chunter-resources/src/components/ChannelScrollView.svelte b/plugins/chunter-resources/src/components/ChannelScrollView.svelte
index e4fbe1e643..2bfa5e3f69 100644
--- a/plugins/chunter-resources/src/components/ChannelScrollView.svelte
+++ b/plugins/chunter-resources/src/components/ChannelScrollView.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Class, Doc, Ref, isOtherDay, Timestamp, getCurrentAccount } from '@hcengineering/core'
+  import { Class, Doc, getCurrentAccount, isOtherDay, Ref, Timestamp } from '@hcengineering/core'
   import { getClient } from '@hcengineering/presentation'
   import activity, {
     ActivityExtension,
@@ -27,8 +27,8 @@
   import { get } from 'svelte/store'
   import { Scroller, ScrollParams } from '@hcengineering/ui'
   import {
-    ActivityMessagePresenter,
-    ActivityExtension as ActivityExtensionComponent
+    ActivityExtension as ActivityExtensionComponent,
+    ActivityMessagePresenter
   } from '@hcengineering/activity-resources'
 
   import ActivityMessagesSeparator from './ChannelMessagesSeparator.svelte'
@@ -293,20 +293,17 @@
       return 0
     }
 
-    const lastViewedMessageIdx = displayMessages.findIndex((message, index) => {
-      const nextMessage = displayMessages[index + 1]
+    const me = getCurrentAccount()._id
 
-      if (message.createdBy === getCurrentAccount()._id) {
+    return displayMessages.findIndex((message) => {
+      if (message.createdBy === me) {
         return false
       }
 
       const createdOn = message.createdOn ?? 0
-      const nextCreatedOn = nextMessage?.createdOn ?? 0
 
-      return lastViewedTimestamp >= createdOn && lastViewedTimestamp < nextCreatedOn
+      return lastViewedTimestamp < createdOn
     })
-
-    return lastViewedMessageIdx !== -1 ? lastViewedMessageIdx + 1 : -1
   }
 
   $: separatorPosition = getNewPosition(displayMessages, lastViewedTimestamp)
diff --git a/plugins/chunter-resources/src/components/chat/navigator/ChatNavGroup.svelte b/plugins/chunter-resources/src/components/chat/navigator/ChatNavGroup.svelte
index f4f5c57af7..dd205ae63e 100644
--- a/plugins/chunter-resources/src/components/chat/navigator/ChatNavGroup.svelte
+++ b/plugins/chunter-resources/src/components/chat/navigator/ChatNavGroup.svelte
@@ -13,11 +13,10 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { createEventDispatcher } from 'svelte'
-  import { Doc, getCurrentAccount, Ref } from '@hcengineering/core'
+  import { getCurrentAccount, Ref } from '@hcengineering/core'
   import notification, { DocNotifyContext } from '@hcengineering/notification'
   import { createQuery, getClient } from '@hcengineering/presentation'
-  import { Action, IconAdd, Scroller, showPopup } from '@hcengineering/ui'
+  import { Action, Scroller } from '@hcengineering/ui'
   import activity from '@hcengineering/activity'
   import view from '@hcengineering/view'
   import { getResource } from '@hcengineering/platform'
@@ -30,8 +29,6 @@
   export let selectedContextId: Ref<DocNotifyContext> | undefined = undefined
   export let model: ChatNavGroupModel
 
-  const dispatch = createEventDispatcher()
-
   const client = getClient()
   const hierarchy = client.getHierarchy()