Revert "fix(StatusMessage): stickers were not aligned correctly"

This reverts commit 0fb954b.
status-im · Jan 27, 2023 · 8bb9da6 · 8bb9da6
1 parent 7744d20
commit 8bb9da6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 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,9 +140,10 @@ Control {
 
     contentItem: Item {
 
-        implicitWidth: parent.width
+        implicitWidth: messageLayout.implicitWidth
         implicitHeight: messageLayout.implicitHeight
 
+
         SequentialAnimation {
             id: messageFoundAnimation
 
@@ -181,8 +182,7 @@ Control {
 
         ColumnLayout {
             id: messageLayout
-            width: parent.width
-            height: childrenRect.height
+            anchors.fill: parent
             spacing: 2
 
             Loader {
@@ -202,7 +202,6 @@ Control {
                 Layout.fillWidth: true
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
-                Layout.preferredHeight: childrenRect.height
                 spacing: 8
 
                 StatusSmartIdenticon {
@@ -227,7 +226,6 @@ 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 {
@@ -255,9 +253,7 @@ Control {
                     }
                     Loader {
                         Layout.fillWidth: true
-                        active: (!root.editMode && !!root.messageDetails.messageText && !root.hideMessage
-                        && ((root.messageDetails.contentType === StatusMessage.ContentType.Text)
-                        || (root.messageDetails.contentType === StatusMessage.ContentType.Emoji)))
+                        active: !root.editMode && !!root.messageDetails.messageText && !root.hideMessage
                         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,8 +363,6 @@ Loader {
             StatusMessage {
                 id: delegate
                 Layout.fillWidth: true
-                Layout.topMargin: 2
-                Layout.bottomMargin: 2
 
                 function convertContentType(value) {
                     switch (value) {