status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: ensure `StatusChatList` receives the proper value for mentions 

This is due to a change in how mentions and unread messages are indicated.
See 7fbccec227 for more information.
This commit is contained in:
Pascal Precht 2021-07-09 14:40:00 +02:00 committed by Michał Cieślak
parent 056704f68d
commit 78ed4642d6
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui/StatusQ/sandbox/DemoApp.qml
View File

@ -671,9 +671,8 @@ Rectangle {
name: "#status" name: "#status"
chatType: StatusChatListItem.Type.PublicChat chatType: StatusChatListItem.Type.PublicChat
muted: false muted: false
hasUnreadMessages: false
hasMention: false
unreadMessagesCount: 0 unreadMessagesCount: 0
mentionsCount: 0
color: "blue" color: "blue"
} }
ListElement { ListElement {
@ -681,16 +680,15 @@ Rectangle {
name: "status-desktop" name: "status-desktop"
chatType: StatusChatListItem.Type.PublicChat chatType: StatusChatListItem.Type.PublicChat
muted: false muted: false
hasUnreadMessages: true
color: "red" color: "red"
unreadMessagesCount: 1 unreadMessagesCount: 1
mentionsCount: 1
} }
ListElement { ListElement {
chatId: "2" chatId: "2"
name: "Amazing Funny Squirrel" name: "Amazing Funny Squirrel"
chatType: StatusChatListItem.Type.OneToOneChat chatType: StatusChatListItem.Type.OneToOneChat
muted: false muted: false
hasUnreadMessages: false
color: "green" color: "green"
identicon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAlklEQVR4nOzW0QmDQBAG4SSkl7SUQlJGCrElq9F3QdjjVhh/5nv3cFhY9vUIYQiNITSG0Bh identicon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAlklEQVR4nOzW0QmDQBAG4SSkl7SUQlJGCrElq9F3QdjjVhh/5nv3cFhY9vUIYQiNITSG0Bh
CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2ImYgiNITTlTdG1nUZ5a92VITQxITFiJmIIjSE0htAYQrMHAAD//+wwFVpz+yqXAAAAAElFTkSuQmCC" CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2ImYgiNITTlTdG1nUZ5a92VITQxITFiJmIIjSE0htAYQrMHAAD//+wwFVpz+yqXAAAAAElFTkSuQmCC"
@ -701,7 +699,6 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
name: "Black Ops" name: "Black Ops"
chatType: StatusChatListItem.Type.GroupChat chatType: StatusChatListItem.Type.GroupChat
muted: false muted: false
hasUnreadMessages: false
color: "purple" color: "purple"
unreadMessagesCount: 0 unreadMessagesCount: 0
} }
@ -710,7 +707,6 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
name: "Spectacular Growing Otter" name: "Spectacular Growing Otter"
chatType: StatusChatListItem.Type.OneToOneChat chatType: StatusChatListItem.Type.OneToOneChat
muted: true muted: true
hasUnreadMessages: false
color: "Orange" color: "Orange"
unreadMessagesCount: 0 unreadMessagesCount: 0
} }
@ -719,7 +715,6 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
name: "channel-with-a-super-duper-long-name" name: "channel-with-a-super-duper-long-name"
chatType: StatusChatListItem.Type.PublicChat chatType: StatusChatListItem.Type.PublicChat
muted: false muted: false
hasUnreadMessages: false
color: "green" color: "green"
unreadMessagesCount: 0 unreadMessagesCount: 0
} }
@ -732,8 +727,6 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
name: "general" name: "general"
chatType: StatusChatListItem.Type.CommunityChat chatType: StatusChatListItem.Type.CommunityChat
muted: false muted: false
hasUnreadMessages: false
hasMention: false
unreadMessagesCount: 0 unreadMessagesCount: 0
color: "orange" color: "orange"
} }
@ -742,8 +735,6 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
name: "random" name: "random"
chatType: StatusChatListItem.Type.CommunityChat chatType: StatusChatListItem.Type.CommunityChat
muted: false muted: false
hasUnreadMessages: false
hasMention: false
unreadMessagesCount: 0 unreadMessagesCount: 0
color: "orange" color: "orange"
categoryId: "public" categoryId: "public"
@ -753,8 +744,6 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
name: "watercooler" name: "watercooler"
chatType: StatusChatListItem.Type.CommunityChat chatType: StatusChatListItem.Type.CommunityChat
muted: false muted: false
hasUnreadMessages: false
hasMention: false
unreadMessagesCount: 0 unreadMessagesCount: 0
color: "orange" color: "orange"
categoryId: "public" categoryId: "public"
@ -764,8 +753,6 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
name: "language-design" name: "language-design"
chatType: StatusChatListItem.Type.CommunityChat chatType: StatusChatListItem.Type.CommunityChat
muted: false muted: false
hasUnreadMessages: false
hasMention: false
unreadMessagesCount: 0 unreadMessagesCount: 0
color: "orange" color: "orange"
categoryId: "dev" categoryId: "dev"

4
ui/StatusQ/src/StatusQ/Components/StatusChatList.qml
View File

@ -49,8 +49,8 @@ Column {
type: model.chatType type: model.chatType
muted: !!model.muted muted: !!model.muted
hasUnreadMessages: !!model.hasUnreadMessages || model.unviewedMessagesCount > 0 hasUnreadMessages: !!model.hasUnreadMessages || model.unviewedMessagesCount > 0
hasMention: !!model.hasMention hasMention: model.mentionsCount > 0
badge.value: model.unviewedMessagesCount || 0 badge.value: model.mentionsCount || 0
selected: (model.chatId || model.id) === statusChatList.selectedChatId selected: (model.chatId || model.id) === statusChatList.selectedChatId
icon.color: model.color || "" icon.color: model.color || ""