Ignore notification close event

fixes #4002
deltachat · Jul 5, 2024 · c197083 · c197083
1 parent 2c99028
commit c197083
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/src/main/notifications.ts b/src/main/notifications.ts
@@ -79,8 +79,8 @@ function showNotification(_event: IpcMainInvokeEvent, data: DcNotification) {
       notify.close()
     })
     notify.on('close', () => {
-      notifications[chatId] =
-        notifications[chatId]?.filter(n => n !== notify) || []
+      // this is triggered when the message is moved to notification center
+      // so we don't remove the instance from the list
     })
 
     if (notifications[chatId]) {

diff --git a/src/renderer/backend-com.ts b/src/renderer/backend-com.ts
@@ -80,6 +80,11 @@ export namespace EffectfulBackendActions {
     await BackendRemote.rpc.deleteChat(accountId, chatId)
     clearNotificationsForChat(accountId, chatId)
   }
+
+  export async function marknoticedChat(accountId: number, chatId: number) {
+    await BackendRemote.rpc.marknoticedChat(accountId, chatId)
+    clearNotificationsForChat(accountId, chatId)
+  }
 }
 
 type ContextEvents = { ALL: (event: DcEvent) => void } & {

diff --git a/src/renderer/components/AccountListSidebar/AccountItem.tsx b/src/renderer/components/AccountListSidebar/AccountItem.tsx
@@ -2,7 +2,11 @@ import React, { useEffect, useState } from 'react'
 import classNames from 'classnames'
 import debounce from 'debounce'
 
-import { BackendRemote, onDCEvent } from '../../backend-com'
+import {
+  BackendRemote,
+  onDCEvent,
+  EffectfulBackendActions,
+} from '../../backend-com'
 import { avatarInitial } from '../Avatar'
 import { getLogger } from '../../../shared/logger'
 import useTranslationFunction from '../../hooks/useTranslationFunction'
@@ -201,9 +205,7 @@ async function markAccountAsRead(accountId: number) {
     }
   }
 
-  await Promise.all(
-    [...uniqueChatIds].map(chatId =>
-      BackendRemote.rpc.marknoticedChat(accountId, chatId)
-    )
-  )
+  for (const chatId of uniqueChatIds) {
+    await EffectfulBackendActions.marknoticedChat(accountId, chatId)
+  }
 }
diff --git a/src/renderer/components/chat/ChatListItem.tsx b/src/renderer/components/chat/ChatListItem.tsx
@@ -4,7 +4,7 @@ import { T, C } from '@deltachat/jsonrpc-client'
 
 import Timestamp from '../conversations/Timestamp'
 import { Avatar } from '../Avatar'
-import { BackendRemote, Type } from '../../backend-com'
+import { BackendRemote, Type, EffectfulBackendActions } from '../../backend-com'
 import { mapCoreMsgStatus2String } from '../helpers/MapMsgStatus'
 import { getLogger } from '../../../shared/logger'
 import { useContextMenuWithActiveState } from '../ContextMenu'
@@ -150,7 +150,7 @@ function ChatListItemArchiveLink({
     {
       label: tx('mark_all_as_read'),
       action: () => {
-        BackendRemote.rpc.marknoticedChat(
+        EffectfulBackendActions.marknoticedChat(
           selectedAccountId(),
           C.DC_CHAT_ID_ARCHIVED_LINK
         )