fix(@dekstop/chat): clicking on a mention or reply in the activity centre notifications list, does not take the user to the correct Community chat window

Fixes #4966

src/app/modules/main/activity_center/controller.nim

@@ -8,6 +8,7 @@ import ../../../../app_service/service/activity_center/service as activity_cente
 import ../../../../app_service/service/contacts/service as contacts_service
 import ../../../../app_service/service/message/service as message_service
 import ../../../../app_service/service/eth/utils as eth_utils
+import ../../../../app_service/service/chat/service as chat_service
 
 export controller_interface
 
@@ -18,13 +19,15 @@ type
     activityCenterService: activity_center_service.Service
     contactsService: contacts_service.Service
     messageService: message_service.Service
+    chatService: chat_service.Service
 
 proc newController*[T](
     delegate: io_interface.AccessInterface,
     events: EventEmitter,
     activityCenterService: activity_center_service.Service,
     contactsService: contacts_service.Service,
-    messageService: message_service.Service
+    messageService: message_service.Service,
+    chatService: chat_service.Service
     ): Controller[T] =
   result = Controller[T]()
   result.delegate = delegate
@@ -32,6 +35,7 @@ proc newController*[T](
   result.activityCenterService = activityCenterService
   result.contactsService = contactsService
   result.messageService = messageService
+  result.chatService = chatService
 
 method delete*[T](self: Controller[T]) =
   discard
@@ -107,3 +111,6 @@ method decodeContentHash*[T](self: Controller[T], hash: string): string =
 method switchTo*[T](self: Controller[T], sectionId, chatId, messageId: string) =
   let data = ActiveSectionChatArgs(sectionId: sectionId, chatId: chatId, messageId: messageId)
   self.events.emit(SIGNAL_MAKE_SECTION_CHAT_ACTIVE, data)
+
+method getChatDetails*[T](self: Controller[T], chatId: string): ChatDto =
+  return self.chatService.getChatById(chatId)

src/app/modules/main/activity_center/controller_interface.nim

@@ -1,6 +1,7 @@
 import ../../../../app_service/service/contacts/service as contacts_service
 import ../../../../app_service/service/activity_center/service as activity_center_service
 import ../../../../app_service/service/message/dto/[message]
+import ../../../../app_service/service/chat/dto/[chat]
 
 type
   AccessInterface* {.pure inheritable.} = ref object of RootObj
@@ -48,6 +49,9 @@ method decodeContentHash*(self: AccessInterface, hash: string): string {.base.}
 method switchTo*(self: AccessInterface, sectionId, chatId, messageId: string) {.base.} =
   raise newException(ValueError, "No implementation available")
 
+method getChatDetails*(self: AccessInterface, chatId: string): ChatDto {.base.} =
+  raise newException(ValueError, "No implementation available")
+
 
 type
   ## Abstract class (concept) which must be implemented by object/s used in this

src/app/modules/main/activity_center/item.nim

@@ -4,6 +4,7 @@ import ../../shared_models/message_item_qobject
 type Item* = ref object
   id: string # ID is the id of the chat, for public chats it is the name e.g. status, for one-to-one is the hex encoded public key and for group chats is a random uuid appended with the hex encoded pk of the creator of the chat
   chatId: string
+  sectionId: string
   name: string
   author: string
   notificationType: int
@@ -16,6 +17,7 @@ type Item* = ref object
 proc initItem*(
   id: string,
   chatId: string,
+  sectionId: string,
   name: string,
   author: string,
   notificationType: int,
@@ -28,6 +30,7 @@ proc initItem*(
   result = Item()
   result.id = id
   result.chatId = chatId
+  result.sectionId = sectionId
   result.name = name
   result.author = author
   result.notificationType = notificationType
@@ -42,6 +45,7 @@ proc `$`*(self: Item): string =
     id: {self.id},
     name: {$self.name},
     chatId: {$self.chatId},
+    sectionId: {$self.sectionId},
     author: {$self.author},
     notificationType: {$self.notificationType},
     timestamp: {$self.timestamp},
@@ -63,6 +67,9 @@ proc author*(self: Item): string =
 proc chatId*(self: Item): string =
   return self.chatId
 
+proc sectionId*(self: Item): string =
+  return self.sectionId
+
 proc notificationType*(self: Item): int =
   return self.notificationType
 

src/app/modules/main/activity_center/model.nim

@@ -4,15 +4,16 @@ import ./item
 type
   NotifRoles {.pure.} = enum
     Id = UserRole + 1
-    ChatId = UserRole + 2
-    Name = UserRole + 3
-    NotificationType = UserRole + 4
-    Message = UserRole + 5
-    Timestamp = UserRole + 6
-    Read = UserRole + 7
-    Dismissed = UserRole + 8
-    Accepted = UserRole + 9
-    Author = UserRole + 10
+    ChatId
+    SectionId
+    Name
+    NotificationType
+    Message
+    Timestamp
+    Read
+    Dismissed
+    Accepted
+    Author
 
 QtObject:
   type
@@ -70,6 +71,7 @@ QtObject:
     case communityItemRole:
       of NotifRoles.Id: result = newQVariant(acitivityNotificationItem.id)
       of NotifRoles.ChatId: result = newQVariant(acitivityNotificationItem.chatId)
+      of NotifRoles.SectionId: result = newQVariant(acitivityNotificationItem.sectionId)
       of NotifRoles.Name: result = newQVariant(acitivityNotificationItem.name)
       of NotifRoles.Author: result = newQVariant(acitivityNotificationItem.author)
       of NotifRoles.NotificationType: result = newQVariant(acitivityNotificationItem.notificationType.int)
@@ -86,6 +88,7 @@ QtObject:
     case data:
     of "id": result = notif.id
     of "chatId": result = notif.chatId
+    of "sectionId": result = notif.sectionId
     of "name": result = notif.name
     of "author": result = notif.author
     of "notificationType": result = $(notif.notificationType.int)
@@ -99,6 +102,7 @@ QtObject:
     {
       NotifRoles.Id.int:"id",
       NotifRoles.ChatId.int:"chatId",
+      NotifRoles.SectionId.int: "sectionId",
       NotifRoles.Name.int: "name",
       NotifRoles.Author.int: "author",
       NotifRoles.NotificationType.int: "notificationType",

src/app/modules/main/activity_center/module.nim

@@ -2,14 +2,17 @@ import NimQml, Tables, stint, sugar, sequtils
 
 import ./io_interface, ./view, ./controller
 import ./item as notification_item
-import ../../shared_models/message_item as message_item
-import ../../shared_models/message_item_qobject as message_item_qobject
+import ../../shared_models/message_item as msg_item
+import ../../shared_models/message_item_qobject as msg_item_qobj
 import ../../shared_models/message_transaction_parameters_item
 import ../../../global/global_singleton
 import ../../../core/eventemitter
 import ../../../../app_service/service/activity_center/service as activity_center_service
 import ../../../../app_service/service/contacts/service as contacts_service
 import ../../../../app_service/service/message/service as message_service
+import ../../../../app_service/service/chat/service as chat_service
+
+import ../../../global/app_sections_config as conf
 
 export io_interface
 
@@ -26,7 +29,8 @@ proc newModule*[T](
     events: EventEmitter,
     activityCenterService: activity_center_service.Service,
     contactsService: contacts_service.Service,
-    messageService: message_service.Service
+    messageService: message_service.Service,
+    chatService: chat_service.Service
     ): Module[T] =
   result = Module[T]()
   result.delegate = delegate
@@ -37,7 +41,8 @@ proc newModule*[T](
     events,
     activityCenterService,
     contactsService,
-    messageService
+    messageService,
+    chatService
   )
   result.moduleLoaded = false
 
@@ -67,14 +72,19 @@ method convertToItems*[T](
   activityCenterNotifications: seq[ActivityCenterNotificationDto]
   ): seq[notification_item.Item] =
   result = activityCenterNotifications.map(
-    proc(n: ActivityCenterNotificationDto): Item =
-      var messageItem = MessageItem()
+    proc(n: ActivityCenterNotificationDto): notification_item.Item =
+      var messageItem =  msg_item_qobj.newMessageItem(nil)
+
+      let chatDetails = self.controller.getChatDetails(n.chatId)
+      # default section id is `Chat` section
+      let sectionId = if(chatDetails.communityId.len > 0): chatDetails.communityId else: conf.CHAT_SECTION_ID
+
       if (n.message.id != ""):
         # If there is a message in the Notification, transfer it to a MessageItem (QObject)
         let contactDetails = self.controller.getContactDetails(n.message.`from`)
-        messageItem = message_item_qobject.newMessageItem(initItem(
+        messageItem = msg_item_qobj.newMessageItem(msg_item.initItem(
           n.message.id,
-          n.message.communityId,
+          chatDetails.communityId, # we don't received community id via `activityCenterNotifications` api call
           n.message.responseTo,
           n.message.`from`,
           contactDetails.displayName,
@@ -95,12 +105,13 @@ method convertToItems*[T](
           self.controller.decodeContentHash(n.message.sticker.hash),
           n.message.sticker.pack,
           n.message.links,
-          initTransactionParametersItem("","","","","","",-1,""),
+          newTransactionParametersItem("","","","","","",-1,""),
         ))
 
       return notification_item.initItem(
         n.id,
         n.chatId,
+        sectionId,
         n.name,
         n.author,
         n.notificationType.int,

src/app/modules/main/chat_section/chat_content/messages/module.nim

@@ -93,7 +93,7 @@ proc createFetchMoreMessagesItem(self: Module): Item =
     sticker = "",
     stickerPack = -1,
     @[],
-    initTransactionParametersItem("","","","","","",-1,""),
+    newTransactionParametersItem("","","","","","",-1,""),
   )
 
 proc createChatIdentifierItem(self: Module): Item =
@@ -130,7 +130,7 @@ proc createChatIdentifierItem(self: Module): Item =
     sticker = "",
     stickerPack = -1,
     @[],
-    initTransactionParametersItem("","","","","","",-1,""),
+    newTransactionParametersItem("","","","","","",-1,""),
   )
 
 proc checkIfMessageLoadedAndScrollToItIfItIs(self: Module): bool =
@@ -194,7 +194,7 @@ method newMessagesLoaded*(self: Module, messages: seq[MessageDto], reactions: se
         sticker = self.controller.decodeContentHash(m.sticker.hash),
         m.sticker.pack,
         m.links,
-        initTransactionParametersItem(m.transactionParameters.id,
+        newTransactionParametersItem(m.transactionParameters.id,
           m.transactionParameters.fromAddress,
           m.transactionParameters.address,
           transactionContract,
@@ -282,7 +282,7 @@ method messageAdded*(self: Module, message: MessageDto) =
     sticker = self.controller.decodeContentHash(message.sticker.hash),
     message.sticker.pack,
     message.links,
-    initTransactionParametersItem(message.transactionParameters.id,
+    newTransactionParametersItem(message.transactionParameters.id,
                     message.transactionParameters.fromAddress,
                     message.transactionParameters.address,
                     transactionContract,

src/app/modules/main/chat_section/chat_content/module.nim

@@ -178,7 +178,7 @@ proc buildPinnedMessageItem(self: Module, messageId: string, actionInitiatedBy:
     self.controller.decodeContentHash(m.sticker.hash),
     m.sticker.pack,
     m.links,
-    initTransactionParametersItem(m.transactionParameters.id,
+    newTransactionParametersItem(m.transactionParameters.id,
       m.transactionParameters.fromAddress,
       m.transactionParameters.address,
       transactionContract,

src/app/modules/main/module.nim

@@ -148,7 +148,7 @@ proc newModule*[T](
   )
   result.stickersModule = stickers_module.newModule(result, events, stickersService, settingsService, walletAccountService)
   result.activityCenterModule = activity_center_module.newModule(result, events, activityCenterService, contactsService,
-  messageService)
+  messageService, chatService)
   result.communitiesModule = communities_module.newModule(result, events, communityService, contactsService)
   result.appSearchModule = app_search_module.newModule(result, events, contactsService, chatService, communityService,
   messageService)

src/app/modules/shared_models/message_item_qobject.nim

@@ -13,8 +13,8 @@ QtObject:
 
   proc newMessageItem*(message: message_item.Item): MessageItem =
     new(result, delete)
-    result.messageItem = message
     result.setup
+    result.messageItem = message
 
   proc `$`*(self: MessageItem): string =
     result = $self.messageItem
@@ -121,3 +121,12 @@ QtObject:
   proc isEdited*(self: MessageItem): bool {.slot.} = result = ?.self.messageItem.isEdited
   QtProperty[int] bool:
     read = bool
+
+  # this is not the greatest approach, but aligns with the rest of the code
+  proc communityId*(self: MessageItem): string {.slot.} = result = ?.self.messageItem.communityId
+  QtProperty[string] communityId:
+    read = communityId
+
+  proc reactionsModel*(self: MessageItem): QVariant {.slot.} = result = newQVariant(?.self.messageItem.reactionsModel)
+  QtProperty[QVariant] reactionsModel:
+    read = reactionsModel

src/app/modules/shared_models/message_transaction_parameters_item.nim

@@ -12,7 +12,13 @@ QtObject:
       commandState: int
       signature: string
 
-  proc initTransactionParametersItem*(
+  proc setup(self: TransactionParametersItem) =
+    self.QObject.setup
+
+  proc delete*(self: TransactionParametersItem) =
+    self.QObject.delete
+
+  proc newTransactionParametersItem*(
       id: string,
       fromAddress: string,
       address: string,
@@ -22,7 +28,8 @@ QtObject:
       commandState: int,
       signature: string,
       ): TransactionParametersItem =
-    result = TransactionParametersItem()
+    new(result, delete)
+    result.setup
     result.id = id
     result.fromAddress = fromAddress
     result.address = address

ui/app/AppLayouts/Chat/views/ActivityCenterMessageComponentView.qml

@@ -140,11 +140,7 @@ Item {
                 }
 
                 activityCenter.close()
-                var sectionId = "chat"
-                if (model.message.communityId) {
-                    sectionId = model.message.communityId
-                }
-                root.store.activityCenterModuleInst.switchTo(sectionId, model.chatId, model.id)
+                root.store.activityCenterModuleInst.switchTo(model.sectionId, model.chatId, model.id)
             }
             prevMessageIndex: root.previousNotificationIndex
             prevMsgTimestamp: root.previousNotificationTimestamp