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

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

This reverts commit 0fb954b640.
This commit is contained in:
Alexandra Betouni 2023-01-12 14:19:36 +02:00 committed by Jonathan Rainville
parent 7744d20eb5
commit 8bb9da6fcc
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app_service/service/stickers/service.nim
View File

@ -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)

12
ui/StatusQ/src/StatusQ/Components/StatusMessage.qml
View File

@ -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"

2
ui/imports/shared/views/chat/MessageView.qml
View File

@ -363,8 +363,6 @@ Loader {
StatusMessage {
id: delegate
Layout.fillWidth: true
Layout.topMargin: 2
Layout.bottomMargin: 2
function convertContentType(value) {
switch (value) {