fix(StatusMessage): stickers were not aligned correctly

Closes #8944
status-im · Jan 25, 2023 · 0fb954b · 0fb954b
1 parent 763041d
commit 0fb954b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/app_service/service/stickers/service.nim b/src/app_service/service/stickers/service.nim
@@ -399,4 +399,4 @@ QtObject:
     let network = self.networkService.getNetworkForStickers()
 
     let balances = status_go_backend.getTokensBalancesForChainIDs(@[network.chainId], @[account], @[token.addressAsString()]).result
-    return ens_utils.hex2Token(balances{account}{token.addressAsString()}.getStr, token.decimals)
+    return ens_utils.hex2Token(balances{account}{token.addressAsString()}.getStr, token.decimals)
diff --git a/ui/StatusQ/src/StatusQ/Components/StatusMessage.qml b/ui/StatusQ/src/StatusQ/Components/StatusMessage.qml
@@ -140,10 +140,9 @@ Control {
 
     contentItem: Item {
 
-        implicitWidth: messageLayout.implicitWidth
+        implicitWidth: parent.width
         implicitHeight: messageLayout.implicitHeight
 
-
         SequentialAnimation {
             id: messageFoundAnimation
 
@@ -182,7 +181,8 @@ Control {
 
         ColumnLayout {
             id: messageLayout
-            anchors.fill: parent
+            width: parent.width
+            height: childrenRect.height
             spacing: 2
 
             Loader {
@@ -202,6 +202,7 @@ Control {
                 Layout.fillWidth: true
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
+                Layout.preferredHeight: childrenRect.height
                 spacing: 8
 
                 StatusSmartIdenticon {
@@ -226,6 +227,7 @@ Control {
                     spacing: 2
                     Layout.alignment: Qt.AlignTop
                     Layout.fillWidth: true
+                    Layout.preferredHeight: childrenRect.height
                     Layout.leftMargin: profileImage.visible ? 0 : root.messageDetails.sender.profileImage.assetSettings.width + parent.spacing
 
                     StatusPinMessageDetails {
@@ -253,7 +255,9 @@ Control {
                     }
                     Loader {
                         Layout.fillWidth: true
-                        active: !root.editMode && !!root.messageDetails.messageText && !root.hideMessage
+                        active: (!root.editMode && !!root.messageDetails.messageText && !root.hideMessage
+                        && ((root.messageDetails.contentType === StatusMessage.ContentType.Text)
+                        || (root.messageDetails.contentType === StatusMessage.ContentType.Emoji)))
                         visible: active
                         sourceComponent: StatusTextMessage {
                             objectName: "StatusMessage_textMessage"

diff --git a/ui/imports/shared/views/chat/MessageView.qml b/ui/imports/shared/views/chat/MessageView.qml
@@ -363,6 +363,8 @@ Loader {
             StatusMessage {
                 id: delegate
                 Layout.fillWidth: true
+                Layout.topMargin: 2
+                Layout.bottomMargin: 2
 
                 function convertContentType(value) {
                     switch (value) {