diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml index 195e38c0..819537a5 100644 --- a/src/mainview/MainView.qml +++ b/src/mainview/MainView.qml @@ -577,6 +577,10 @@ Window { function onNeedToUpdateSmartList() { mainViewWindowSidePanel.forceUpdateConversationSmartListView() } + + function onContactBanned() { + showWelcomeView() + } } onNeedToGoBackToWelcomeView: { diff --git a/src/mainview/components/ConversationSmartListView.qml b/src/mainview/components/ConversationSmartListView.qml index c3df41f7..189ab317 100644 --- a/src/mainview/components/ConversationSmartListView.qml +++ b/src/mainview/components/ConversationSmartListView.qml @@ -129,10 +129,7 @@ ListView { context: Qt.ApplicationShortcut enabled: root.visible onActivated: { - UtilsAdapter.removeConversation(UtilsAdapter.getCurrAccId(), - UtilsAdapter.getCurrConvId(), - true) - root.needToBackToWelcomePage() + MessagesAdapter.blockConversation(UtilsAdapter.getCurrConvId()) } } diff --git a/src/settingsview/components/BannedItemDelegate.qml b/src/settingsview/components/BannedItemDelegate.qml index ed113f3c..e71f7199 100644 --- a/src/settingsview/components/BannedItemDelegate.qml +++ b/src/settingsview/components/BannedItemDelegate.qml @@ -151,7 +151,7 @@ ItemDelegate { backgroundColor: "transparent" ToolTip.visible: hovered - ToolTip.text: reinstateContact + ToolTip.text: JamiStrings.reinstateContact onClicked: { btnReAddContactClicked()