Ignore notification close event & clear notifications when marking accounts unread chat as noticed

CHANGELOG.md

@@ -26,6 +26,8 @@
 - Fix the problem of Quit menu item on WebXDC apps closes the whole DC app #3995
 - minor performance improvements #3981
 - fix chat list items (e.g. Archive) and contacts not showing up sometimes #4004
+- fix bug notifications not being removed on Mac  #4010
+- fix bug "Mark All as Read" does not remove notifications #4002
 
 <a id="1_46_1"></a>
 

src/main/notifications.ts

@@ -79,8 +79,15 @@ function showNotification(_event: IpcMainInvokeEvent, data: DcNotification) {
       notify.close()
     })
     notify.on('close', () => {
-      notifications[chatId] =
-        notifications[chatId]?.filter(n => n !== notify) || []
+      // on Window and Linux this can be triggered by system time out
+      // when the message is moved to notification center so only close
+      // the notification on this event on Mac
+      if (isMac) {
+        notifications[chatId] =
+          notifications[chatId]?.filter(n => n !== notify) || []
+      }
+      /* ignore-console-log */
+      console.log('Notification close event triggered', notify)
     })
 
     if (notifications[chatId]) {

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 } & {

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)
+  }
 }

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 { 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
         )