From 2f52995e18ed643130d7cfb01120e6d8d213a769 Mon Sep 17 00:00:00 2001 From: Beaudan Brown Date: Fri, 25 Oct 2019 12:06:39 +1100 Subject: [PATCH] Fix the delete messages button to not break the conversation --- _locales/en/messages.json | 2 +- js/models/conversations.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 1355e2f87..a6a98762f 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1053,7 +1053,7 @@ "Confirmation dialog text that asks the user if they really wish to delete the public channel messages locally. Answer buttons use the strings 'ok' and 'cancel'. The deletion is permanent, i.e. it cannot be undone." }, "deleteConversationConfirmation": { - "message": "Permanently delete this conversation?", + "message": "Permanently delete the messages in this conversation?", "description": "Confirmation dialog text that asks the user if they really wish to delete the conversation. Answer buttons use the strings 'ok' and 'cancel'. The deletion is permanent, i.e. it cannot be undone." }, diff --git a/js/models/conversations.js b/js/models/conversations.js index 12b67d756..8e471760b 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -2450,8 +2450,8 @@ }); } else { Whisper.events.trigger('showConfirmationDialog', { - message: i18n('deleteContactConfirmation'), - onOk: () => ConversationController.deleteContact(this.id), + message: i18n('deleteConversationConfirmation'), + onOk: () => this.destroyMessages(), }); } },