fix(ChatMessagesView): Usage of StatusMessage WIP

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

@@ -75,7 +75,7 @@ proc createMessageItemFromDto(self: Module, message: MessageDto, chatDetails: Ch
     chatDetails.communityId, # we don't received community id via `activityCenterNotifications` api call
     message.responseTo,
     message.`from`,
-    contactDetails.displayName,
+    contactDetails.details.displayName,
     contactDetails.details.localNickname,
     contactDetails.icon,
     contactDetails.isCurrentUser,
@@ -93,7 +93,8 @@ proc createMessageItemFromDto(self: Module, message: MessageDto, chatDetails: Ch
     message.links,
     newTransactionParametersItem("","","","","","",-1,""),
     message.mentionedUsersPks,
-    contactDetails.details.trustStatus
+    contactDetails.details.trustStatus,
+    contactDetails.details.ensVerified
     ))
 
 method convertToItems*(

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

@@ -91,10 +91,11 @@ proc createFetchMoreMessagesItem(self: Module): Item =
     messageType = -1,
     sticker = "",
     stickerPack = -1,
-    @[],
-    newTransactionParametersItem("","","","","","",-1,""),
-    @[],
-    TrustStatus.Unknown
+    links = @[],
+    transactionParameters = newTransactionParametersItem("","","","","","",-1,""),
+    mentionedUsersPks = @[],
+    senderTrustStatus = TrustStatus.Unknown,
+    senderEnsVerified = false
   )
 
 proc createChatIdentifierItem(self: Module): Item =
@@ -128,10 +129,11 @@ proc createChatIdentifierItem(self: Module): Item =
     messageType = -1,
     sticker = "",
     stickerPack = -1,
-    @[],
-    newTransactionParametersItem("","","","","","",-1,""),
-    @[],
-    TrustStatus.Unknown
+    links = @[],
+    transactionParameters = newTransactionParametersItem("","","","","","",-1,""),
+    mentionedUsersPks = @[],
+    senderTrustStatus = TrustStatus.Unknown,
+    senderEnsVerified = false
   )
 
 proc checkIfMessageLoadedAndScrollToItIfItIs(self: Module): bool =
@@ -177,7 +179,7 @@ method newMessagesLoaded*(self: Module, messages: seq[MessageDto], reactions: se
         m.communityId,
         m.responseTo,
         m.`from`,
-        sender.displayName,
+        sender.details.displayName,
         sender.details.localNickname,
         sender.icon,
         isCurrentUser,
@@ -203,6 +205,7 @@ method newMessagesLoaded*(self: Module, messages: seq[MessageDto], reactions: se
           m.transactionParameters.signature),
         m.mentionedUsersPks(),
         sender.details.trustStatus,
+        sender.details.ensVerified
         )
 
       for r in reactions:
@@ -265,7 +268,7 @@ method messageAdded*(self: Module, message: MessageDto) =
     message.communityId,
     message.responseTo,
     message.`from`,
-    sender.displayName,
+    sender.details.displayName,
     sender.details.localNickname,
     sender.icon,
     isCurrentUser,
@@ -291,6 +294,7 @@ method messageAdded*(self: Module, message: MessageDto) =
                     message.transactionParameters.signature),
     message.mentionedUsersPks,
     sender.details.trustStatus,
+    sender.details.ensVerified
   )
 
   self.view.model().insertItemBasedOnTimestamp(item)
@@ -399,7 +403,7 @@ method updateContactDetails*(self: Module, contactId: string) =
   let updatedContact = self.controller.getContactDetails(contactId)
   for item in self.view.model().modelContactUpdateIterator(contactId):
     if(item.senderId == contactId):
-      item.senderDisplayName = updatedContact.displayName
+      item.senderDisplayName = updatedContact.details.displayName
       item.senderLocalName = updatedContact.details.localNickname
       item.senderIcon = updatedContact.icon
       item.senderIsAdded = updatedContact.details.added

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

@@ -167,7 +167,7 @@ proc buildPinnedMessageItem(self: Module, messageId: string, actionInitiatedBy:
     m.communityId,
     m.responseTo,
     m.`from`,
-    contactDetails.displayName,
+    contactDetails.details.displayName,
     contactDetails.details.localNickname,
     contactDetails.icon,
     isCurrentUser,
@@ -193,6 +193,7 @@ proc buildPinnedMessageItem(self: Module, messageId: string, actionInitiatedBy:
       m.transactionParameters.signature),
     m.mentionedUsersPks,
     contactDetails.details.trustStatus,
+    contactDetails.details.ensVerified
   )
   item.pinned = true
   item.pinnedBy = actionInitiatedBy
@@ -318,8 +319,9 @@ method onContactDetailsUpdated*(self: Module, contactId: string) =
   let updatedContact = self.controller.getContactDetails(contactId)
   for item in self.view.pinnedModel().modelContactUpdateIterator(contactId):
     if(item.senderId == contactId):
-      item.senderDisplayName = updatedContact.displayName
+      item.senderDisplayName = updatedContact.details.displayName
       item.senderLocalName = updatedContact.details.localNickname
+      item.senderEnsVerified = updatedContact.details.ensVerified
       item.senderIcon = updatedContact.icon
       item.senderTrustStatus = updatedContact.details.trustStatus
     if(item.messageContainsMentions):
@@ -329,7 +331,7 @@ method onContactDetailsUpdated*(self: Module, contactId: string) =
         item.messageContainsMentions = m.containsContactMentions()
 
   if(self.controller.getMyChatId() == contactId):
-    self.view.updateChatDetailsNameAndIcon(updatedContact.displayName, updatedContact.icon)
+    self.view.updateChatDetailsNameAndIcon(updatedContact.details.displayName, updatedContact.icon)
     self.view.updateTrustStatus(updatedContact.details.trustStatus == TrustStatus.Untrustworthy)
 
 method onNotificationsUpdated*(self: Module, hasUnreadMessages: bool, notificationCount: int) =

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

@@ -75,7 +75,7 @@ method onNewMessagesLoaded*(self: Module, messages: seq[MessageDto]) =
     let status = toOnlineStatus(statusUpdateDto.statusType)
     self.view.model().addItem(initMemberItem(
       pubKey = m.`from`,
-      displayName = contactDetails.displayName,
+      displayName = contactDetails.details.displayName,
       ensName = contactDetails.details.name, # is it correct?
       localNickname = contactDetails.details.localNickname,
       alias = contactDetails.details.alias,
@@ -132,7 +132,7 @@ method addChatMember*(self: Module,  member: ChatMember) =
   let isMe = member.id == singletonInstance.userProfile.getPubKey()
   let contactDetails = self.controller.getContactDetails(member.id)
   var status = OnlineStatus.Online
-  var displayName = contactDetails.displayName
+  var displayName = contactDetails.details.displayName
   if (isMe):
     let currentUserStatus = intToEnum(singletonInstance.userProfile.getCurrentUserStatus(), StatusType.Unknown)
     status = toOnlineStatus(currentUserStatus)
@@ -142,7 +142,7 @@ method addChatMember*(self: Module,  member: ChatMember) =
 
   self.view.model().addItem(initMemberItem(
     pubKey = member.id,
-    displayName = displayName,
+    displayName = contactDetails.details.displayName,
     ensName = contactDetails.details.name,
     localNickname = contactDetails.details.localNickname,
     alias = contactDetails.details.alias,
@@ -180,7 +180,7 @@ method onChatMemberUpdated*(self: Module, publicKey: string, admin: bool, joined
   let contactDetails = self.controller.getContactDetails(publicKey)
   self.view.model().updateItem(
     pubKey = publicKey,
-    displayName = contactDetails.displayName,
+    displayName = contactDetails.details.displayName,
     ensName = contactDetails.details.name,
     localNickname = contactDetails.details.localNickname,
     alias = contactDetails.details.alias,

src/app/modules/main/profile_section/notifications/module.nim

@@ -65,7 +65,7 @@ proc createChatItem(self: Module, chatDto: ChatDto): Item =
   var itemType = item.Type.GroupChat
   if(chatDto.chatType == ChatType.OneToOne):
     let contactDetails = self.controller.getContactDetails(chatDto.id)
-    chatName = contactDetails.displayName
+    chatName = contactDetails.details.displayName
     chatImage = contactDetails.icon
     itemType = item.Type.OneToOneChat
 

src/app/modules/shared_models/message_item.nim

@@ -37,6 +37,7 @@ type
     transactionParameters: TransactionParametersItem
     mentionedUsersPks: seq[string]
     senderTrustStatus: TrustStatus
+    senderEnsVerified: bool
 
 proc initItem*(
     id,
@@ -61,7 +62,8 @@ proc initItem*(
     links: seq[string],
     transactionParameters: TransactionParametersItem,
     mentionedUsersPks: seq[string],
-    senderTrustStatus: TrustStatus
+    senderTrustStatus: TrustStatus,
+    senderEnsVerified: bool
     ): Item =
   result = Item()
   result.id = id
@@ -93,6 +95,7 @@ proc initItem*(
   result.gapFrom = 0
   result.gapTo = 0
   result.senderTrustStatus = senderTrustStatus
+  result.senderEnsVerified = senderEnsVerified
 
 proc `$`*(self: Item): string =
   result = fmt"""Item(
@@ -120,6 +123,7 @@ proc `$`*(self: Item): string =
     transactionParameters:{$self.transactionParameters},
     mentionedUsersPks:{$self.mentionedUsersPks},
     senderTrustStatus:{$self.senderTrustStatus},
+    senderEnsVerified: {self.senderEnsVerified},
     )"""
 
 proc id*(self: Item): string {.inline.} =
@@ -167,6 +171,12 @@ proc senderTrustStatus*(self: Item): TrustStatus {.inline.} =
 proc `senderTrustStatus=`*(self: Item, value: TrustStatus) {.inline.} =
   self.senderTrustStatus = value
 
+proc senderEnsVerified*(self: Item): bool {.inline.} =
+  self.senderEnsVerified
+
+proc `senderEnsVerified=`*(self: Item, value: bool) {.inline.} =
+  self.senderEnsVerified = value
+
 proc outgoingStatus*(self: Item): string {.inline.} =
   self.outgoingStatus
 
@@ -274,7 +284,8 @@ proc toJsonNode*(self: Item): JsonNode =
     "editMode": self.editMode,
     "isEdited": self.isEdited,
     "links": self.links,
-    "mentionedUsersPks": self.mentionedUsersPks
+    "mentionedUsersPks": self.mentionedUsersPks,
+    "senderEnsVerified": self.senderEnsVerified
   }
 
 proc editMode*(self: Item): bool {.inline.} =

src/app/modules/shared_models/message_item_qobject.nim

@@ -49,6 +49,10 @@ QtObject:
   QtProperty[string] senderLocalName:
     read = senderLocalName
 
+  proc senderEnsVerified*(self: MessageItem): bool {.slot.} = result = ?.self.messageItem.senderEnsVerified
+  QtProperty[bool] senderEnsVerified:
+    read = senderEnsVerified
+
   proc amISender*(self: MessageItem): bool {.slot.} = result = ?.self.messageItem.amISender
   QtProperty[bool] amISender:
     read = amISender

src/app/modules/shared_models/message_model.nim

@@ -38,6 +38,7 @@ type
     TransactionParameters
     MentionedUsersPks
     SenderTrustStatus
+    SenderEnsVerified
 
 QtObject:
   type
@@ -71,7 +72,7 @@ QtObject:
   proc countChanged(self: Model) {.signal.}
   proc getCount(self: Model): int {.slot.} =
     self.items.len
-  QtProperty[int] count:
+  QtProperty[int]count:
     read = getCount
     notify = countChanged
 
@@ -112,7 +113,8 @@ QtObject:
       ModelRole.Links.int: "links",
       ModelRole.TransactionParameters.int: "transactionParameters",
       ModelRole.MentionedUsersPks.int: "mentionedUsersPks",
-      ModelRole.SenderTrustStatus.int: "senderTrustStatus"
+      ModelRole.SenderTrustStatus.int: "senderTrustStatus",
+      ModelRole.SenderEnsVerified.int: "senderEnsVerified"
     }.toTable
 
   method data(self: Model, index: QModelIndex, role: int): QVariant =
@@ -205,6 +207,8 @@ QtObject:
       }))
     of ModelRole.MentionedUsersPks:
       result = newQVariant(item.mentionedUsersPks.join(" "))
+    of ModelRole.SenderEnsVerified:
+      result = newQVariant(item.senderEnsVerified)
 
   proc updateItemAtIndex(self: Model, index: int) =
     let ind = self.createIndex(index, 0, nil)
@@ -393,8 +397,12 @@ QtObject:
 
       var roles: seq[int]
       if(self.items[i].senderId == contactId):
-        roles = @[ModelRole.SenderDisplayName.int, ModelRole.SenderLocalName.int,
-          ModelRole.SenderIcon.int, ModelRole.SenderIsAdded.int, ModelRole.SenderTrustStatus.int]
+        roles = @[ModelRole.SenderDisplayName.int,
+          ModelRole.SenderLocalName.int,
+          ModelRole.SenderIcon.int,
+          ModelRole.SenderIsAdded.int,
+          ModelRole.SenderTrustStatus.int,
+          ModelRole.SenderEnsVerified.int]
       if(self.items[i].pinnedBy == contactId):
         roles.add(ModelRole.PinnedBy.int)
       if(self.items[i].messageContainsMentions):

ui/app/AppLayouts/Chat/controls/activityCenter/ChannelBadge.qml

@@ -50,8 +50,8 @@ Item {
     StyledText {
         id: contactInfo
         text: realChatType !== Constants.chatType.publicChat ?
-                  StatusQUtils.Emoji.parse(Utils.removeStatusEns(Utils.filterXSS(name))) :
-                  "#" + Utils.filterXSS(name)
+                  StatusQUtils.Emoji.parse(Utils.removeStatusEns(StatusQUtils.Utils.filterXSS(name))) :
+                  "#" + StatusQUtils.Utils.filterXSS(name)
         anchors.left: contactImage.right
         anchors.leftMargin: 4
         color: textColor

ui/app/AppLayouts/Chat/controls/activityCenter/ReplyComponent.qml

@@ -24,7 +24,7 @@ Item {
     }
 
     StyledTextEdit {
-        text: Utils.getReplyMessageStyle(StatusQUtils.Emoji.parse(Utils.linkifyAndXSS(repliedMessageContent), StatusQUtils.Emoji.size.small), false)
+        text: Utils.getReplyMessageStyle(StatusQUtils.Emoji.parse(StatusQUtils.Utils.linkifyAndXSS(repliedMessageContent), StatusQUtils.Emoji.size.small), false)
         textFormat: Text.RichText
         height: 18
         width: implicitWidth > 300 ? 300 : implicitWidth

ui/app/AppLayouts/Chat/panels/ChatTimePanel.qml

@@ -10,11 +10,11 @@ StyledText {
     color: Style.current.secondaryText
     text: Utils.formatShortTime(timestamp)
     font.pixelSize: Style.current.asideTextFontSize
-    property string timestamp
+    property int timestamp
 
     StatusQ.StatusToolTip {
         visible: hhandler.hovered
-        text: Utils.formatLongDateTime(parseInt(chatTime.timestamp, 10), RootStore.accountSensitiveSettings.isDDMMYYDateFormat, RootStore.accountSensitiveSettings.is24hTimeFormat)
+        text: Utils.formatLongDateTime(chatTime.timestamp, RootStore.accountSensitiveSettings.isDDMMYYDateFormat, RootStore.accountSensitiveSettings.is24hTimeFormat)
         maxWidth: 350
     }
 

ui/app/AppLayouts/Chat/panels/UserListPanel.qml

@@ -101,14 +101,12 @@ Item {
                 if (mouse.button === Qt.RightButton) {
                     // Set parent, X & Y positions for the messageContextMenu
                     messageContextMenu.parent = this
-                    messageContextMenu.setXPosition = function() { return 0; }
-                    messageContextMenu.setYPosition = function() { return mouse.y + (Style.current.halfPadding/2); }
                     messageContextMenu.isProfile = true
                     messageContextMenu.myPublicKey = userProfile.pubKey
                     messageContextMenu.selectedUserPublicKey = model.pubKey
                     messageContextMenu.selectedUserDisplayName = model.displayName
                     messageContextMenu.selectedUserIcon = image.source
-                    messageContextMenu.popup()
+                    messageContextMenu.popup(4, 4)
                 } else if (mouse.button === Qt.LeftButton && !!messageContextMenu) {
                     Global.openProfilePopup(model.pubKey);
                 }

ui/app/AppLayouts/Chat/popups/PinnedMessagesPopup.qml

@@ -98,13 +98,16 @@ ModalPopup {
 
             delegate: Item {
                 id: messageDelegate
-                property var listView: ListView.view
-                width: parent.width
+
+                width: ListView.view.width
                 height: messageItem.height
 
                 MessageView {
                     id: messageItem
-                    store: popup.store
+
+                    width: parent.width
+
+                    rootStore: popup.store
                     messageStore: popup.messageStore
                     messageContextMenu: msgContextMenu
 
@@ -113,9 +116,10 @@ ModalPopup {
                     senderId: model.senderId
                     senderDisplayName: model.senderDisplayName
                     senderLocalName: model.senderLocalName
+                    senderEnsName: model.senderEnsVerified ? model.senderDisplayName : ""
                     senderIcon: model.senderIcon
                     amISender: model.amISender
-                    message: model.messageText
+                    messageText: model.messageText
                     messageImage: model.messageImage
                     messageTimestamp: model.timestamp
                     messageOutgoingStatus: model.outgoingStatus
@@ -125,7 +129,6 @@ ModalPopup {
                     reactionsModel: model.reactions
                     senderTrustStatus: model.senderTrustStatus
                     linkUrls: model.links
-                    isInPinnedPopup: true
                     transactionParams: model.transactionParameters
 
                     // This is possible since we have all data loaded before we load qml.
@@ -136,7 +139,8 @@ ModalPopup {
                     nextMessageAsJsonObj: popup.messageStore? popup.messageStore.getMessageByIndexAsJson(index + 1) : {}
 
                     // Additional params
-                    forceHoverHandler: !popup.messageToPin
+                    isInPinnedPopup: true
+                    disableHover: !!popup.messageToPin
                 }
 
                 MouseArea {