fix(SearchPopup): displaying comm channel's emojis

Closes #7702
status-im · Oct 5, 2022 · e31b863 · e31b863
1 parent 99272c5
commit e31b863
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/src/app/modules/main/app_search/module.nim b/src/app/modules/main/app_search/module.nim
@@ -81,6 +81,7 @@ proc buildLocationMenuForChannelGroup(self: Module, channelGroup: ChannelGroupDt
   for chatDto in channelGroup.chats:
     var chatName = chatDto.name
     var chatImage = chatDto.icon
+    var chatEmoji = chatDto.emoji
     var colorHash: ColorHashDto = @[]
     var colorId: int = 0
     let isOneToOneChat = chatDto.chatType == ChatType.OneToOne
@@ -91,7 +92,7 @@ proc buildLocationMenuForChannelGroup(self: Module, channelGroup: ChannelGroupDt
     let subItem = location_menu_sub_item.initSubItem(
       chatDto.id,
       chatName,
-      chatImage,
+      if (chatImage != ""): chatImage else: chatEmoji,
       "",
       chatDto.color,
       isOneToOneChat,

diff --git a/ui/StatusQ/sandbox/controls/ListItems.qml b/ui/StatusQ/sandbox/controls/ListItems.qml
@@ -539,9 +539,6 @@ ColumnLayout {
         isAdmin: true
         asset.isLetterIdenticon: true
         isUntrustworthy: true
-        Component.onCompleted: {
-            print(asset.name, asset.isImage, asset.isLetterIdenticon)
-        }
     }
 
     StatusBaseText {

diff --git a/ui/StatusQ/src/StatusQ/Components/StatusEmoji.qml b/ui/StatusQ/src/StatusQ/Components/StatusEmoji.qml
@@ -16,4 +16,4 @@ Image {
     mipmap: true
     antialiasing: true
     source: emojiId ? `../../assets/twemoji/svg/${emojiId}.svg` : ""
-}
+}
diff --git a/ui/StatusQ/src/StatusQ/Components/StatusSmartIdenticon.qml b/ui/StatusQ/src/StatusQ/Components/StatusSmartIdenticon.qml
@@ -41,7 +41,7 @@ Loader {
                 border.color: Theme.palette.directColor7
                 color: root.asset.imgIsIdenticon ?
                            Theme.palette.statusRoundedImage.backgroundColor :
-                           "transparent"
+                           root.asset.bgColor
             }
             Loader {
                 anchors.centerIn: parent

diff --git a/ui/StatusQ/src/StatusQ/Popups/StatusMenuItemDelegate.qml b/ui/StatusQ/src/StatusQ/Popups/StatusMenuItemDelegate.qml
@@ -111,7 +111,7 @@ MenuItem {
         sourceComponent: {
             let subMenuItemIcon = statusPopupMenu.subMenuItemIcons && statusPopupMenu.subMenuItemIcons[parent.subMenuIndex]
 
-            if ((parent.subMenu && subMenuItemIcon && subMenuItemIcon.source) || 
+            if ((parent.subMenu && subMenuItemIcon && statusPopupMenu.subMenuItemIcons[parent.subMenuIndex].source) ||
                 statusPopupMenuItem.action.assetSettings && !!statusPopupMenuItem.action.assetSettings.name.toString()
                 && statusPopupMenuItem.action.assetSettings.isImage) {
                 return statusRoundImageCmp

diff --git a/ui/StatusQ/src/StatusQ/Popups/StatusSearchLocationMenu.qml b/ui/StatusQ/src/StatusQ/Popups/StatusSearchLocationMenu.qml
@@ -5,6 +5,7 @@ import QtQuick.Controls 2.14
 import StatusQ.Core 0.1
 import StatusQ.Core.Theme 0.1
 import StatusQ.Popups 0.1
+import StatusQ.Core.Utils 0.1 as StatusQUtils
 
 StatusPopupMenu {
     id: root
@@ -103,8 +104,10 @@ StatusPopupMenu {
                         value: model.value
                         text: model.text
                         assetSettings.isImage: !!model.imageSource
-                        assetSettings.name: !!model.imageSource ? model.imageSource : model.iconName
+                        assetSettings.name: !!StatusQUtils.Emoji.iconSource(model.imageSource) ?
+                                            StatusQUtils.Emoji.iconSource(model.imageSource) : model.imageSource
                         assetSettings.color: model.isUserIcon ? Theme.palette.userCustomizationColors[model.colorId] : model.iconColor
+                        assetSettings.bgColor: model.iconColor
                         assetSettings.charactersLen: model.isUserIcon ? 2 : 1
                         ringSettings.ringSpecModel: model.colorHash
                         onTriggered: {

diff --git a/ui/StatusQ/src/StatusQ/Popups/StatusSearchPopupMenuItem.qml b/ui/StatusQ/src/StatusQ/Popups/StatusSearchPopupMenuItem.qml
@@ -14,6 +14,7 @@ MenuItem {
     property StatusAssetSettings assetSettings: StatusAssetSettings {
         height: 16
         width: 16
+        isImage: (name.toString() !== "")
         isLetterIdenticon: (name.toString() === "")
         color: (name === "channel") ? Theme.palette.directColor1 : "transparent"
         letterSize: charactersLen > 1 ? 8 : 11