From 5e874f4f4b8cca05dd7818a1468bd4c7dd717406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Thu, 27 Jul 2023 14:19:37 -0400
Subject: [PATCH] contextmenu: remove incorrect block contact
Change-Id: Ia3c72757c903e022f2cbf6d74fc0e0916cd83a94
GitLab: #1270
---
src/app/constant/JamiStrings.qml | 1 -
.../mainview/components/ConversationSmartListContextMenu.qml | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml
index f0d426f57..957382477 100644
--- a/src/app/constant/JamiStrings.qml
+++ b/src/app/constant/JamiStrings.qml
@@ -266,7 +266,6 @@ Item {
property string confirmBlockConversation: qsTr("Would you really like to block this conversation?")
property string removeContact: qsTr("Remove contact")
property string blockContact: qsTr("Block contact")
- property string blockSwarm: qsTr("Block swarm")
property string convDetails: qsTr("Conversation details")
property string contactDetails: qsTr("Contact details")
diff --git a/src/app/mainview/components/ConversationSmartListContextMenu.qml b/src/app/mainview/components/ConversationSmartListContextMenu.qml
index 068cda26f..054dcccfd 100644
--- a/src/app/mainview/components/ConversationSmartListContextMenu.qml
+++ b/src/app/mainview/components/ConversationSmartListContextMenu.qml
@@ -126,8 +126,8 @@ ContextMenuAutoLoader {
GeneralMenuItem {
id: blockContact
- canTrigger: !hasCall && contactType !== Profile.Type.SIP && !root.isBanned
- itemName: !(mode && isCoreDialog) ? JamiStrings.blockContact : JamiStrings.blockSwarm
+ canTrigger: !hasCall && contactType !== Profile.Type.SIP && !root.isBanned && isCoreDialog
+ itemName: JamiStrings.blockContact
iconSource: JamiResources.block_black_24dp_svg
addMenuSeparatorAfter: canTrigger
onClicked: {
--
GitLab