From 3a737f97a752b5ea452c89a3a7ffbdf5191a8223 Mon Sep 17 00:00:00 2001 From: Boris Melnik Date: Tue, 7 Mar 2023 18:02:27 +0600 Subject: [PATCH] fix(messaging): Sync with status-go content type enum Fixes: #9655 --- src/app_service/common/types.nim | 2 +- ui/imports/shared/views/chat/MessageView.qml | 4 ++-- ui/imports/utils/Constants.qml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app_service/common/types.nim b/src/app_service/common/types.nim index 18f17d47cf..ac8dbbae4a 100644 --- a/src/app_service/common/types.nim +++ b/src/app_service/common/types.nim @@ -14,7 +14,7 @@ type Audio = 8 Community = 9 Gap = 10 - Edit = 11 + ContactRequest = 11 DiscordMessage = 12 ContactIdentityVerification = 13 diff --git a/ui/imports/shared/views/chat/MessageView.qml b/ui/imports/shared/views/chat/MessageView.qml index 79ab1922fd..16b989e9e2 100644 --- a/ui/imports/shared/views/chat/MessageView.qml +++ b/ui/imports/shared/views/chat/MessageView.qml @@ -109,7 +109,7 @@ Loader { property bool isStatusMessage: messageContentType === Constants.messageContentType.systemMessagePrivateGroupType property bool isSticker: messageContentType === Constants.messageContentType.stickerType property bool isDiscordMessage: messageContentType === Constants.messageContentType.discordMessageType - property bool isText: messageContentType === Constants.messageContentType.messageType || messageContentType === Constants.messageContentType.editType || isDiscordMessage + property bool isText: messageContentType === Constants.messageContentType.messageType || messageContentType === Constants.messageContentType.contactRequestType || isDiscordMessage property bool isMessage: isEmoji || isImage || isSticker || isText || isAudio || messageContentType === Constants.messageContentType.communityInviteType || messageContentType === Constants.messageContentType.transactionType @@ -249,6 +249,7 @@ Loader { function convertContentType(value) { switch (value) { + case Constants.messageContentType.contactRequestType: case Constants.messageContentType.messageType: return StatusMessage.ContentType.Text; case Constants.messageContentType.stickerType: @@ -271,7 +272,6 @@ Loader { case Constants.messageContentType.statusType: case Constants.messageContentType.systemMessagePrivateGroupType: case Constants.messageContentType.gapType: - case Constants.messageContentType.editType: default: return StatusMessage.ContentType.Unknown; } diff --git a/ui/imports/utils/Constants.qml b/ui/imports/utils/Constants.qml index 77b57fb7ba..8fd6ea638b 100644 --- a/ui/imports/utils/Constants.qml +++ b/ui/imports/utils/Constants.qml @@ -404,7 +404,7 @@ QtObject { readonly property int audioType: 8 readonly property int communityInviteType: 9 readonly property int gapType: 10 - readonly property int editType: 11 + readonly property int contactRequestType: 11 readonly property int discordMessageType: 12 }