From 78d68bcc3895960146749166b2705d8a2eb86de2 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Fri, 12 Aug 2022 15:48:09 +1000
Subject: [PATCH] tweak: Delete -> Decline

---
 .../ConversationVC+Interaction.swift           | 18 ------------------
 Session/Conversations/ConversationVC.swift     |  2 +-
 .../Translations/hi.lproj/Localizable.strings  |  1 +
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift
index caef86415..c23af9fc7 100644
--- a/Session/Conversations/ConversationVC+Interaction.swift
+++ b/Session/Conversations/ConversationVC+Interaction.swift
@@ -1713,27 +1713,9 @@ extension ConversationVC {
             // Delete the request
             Storage.shared.writeAsync(
                 updates: { db in
-                    // Update the contact
-                    _ = try Contact
-                        .fetchOrCreate(db, id: threadId)
-                        .with(
-                            isApproved: false,
-                            isBlocked: true,
-
-                            // Note: We set this to true so the current user will be able to send a
-                            // message to the person who originally sent them the message request in
-                            // the future if they unblock them
-                            didApproveMe: true
-                        )
-                        .saved(db)
-                    
                     _ = try SessionThread
                         .filter(id: threadId)
                         .deleteAll(db)
-                    
-                    try MessageSender
-                        .syncConfiguration(db, forceSyncNow: true)
-                        .retainUntilComplete()
                 },
                 completion: { db, _ in
                     DispatchQueue.main.async { [weak self] in
diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift
index b06c8d0b2..c0cf9eca4 100644
--- a/Session/Conversations/ConversationVC.swift
+++ b/Session/Conversations/ConversationVC.swift
@@ -260,7 +260,7 @@ final class ConversationVC: BaseVC, OWSConversationSettingsViewDelegate, Convers
         result.translatesAutoresizingMaskIntoConstraints = false
         result.clipsToBounds = true
         result.titleLabel?.font = UIFont.boldSystemFont(ofSize: 18)
-        result.setTitle(NSLocalizedString("TXT_DELETE_TITLE", comment: ""), for: .normal)
+        result.setTitle(NSLocalizedString("TXT_DECLINE_TITLE", comment: ""), for: .normal)
         result.setTitleColor(Colors.destructive, for: .normal)
         result.setBackgroundImage(
             Colors.destructive
diff --git a/Session/Meta/Translations/hi.lproj/Localizable.strings b/Session/Meta/Translations/hi.lproj/Localizable.strings
index d4d8248d4..9902f96a8 100644
--- a/Session/Meta/Translations/hi.lproj/Localizable.strings
+++ b/Session/Meta/Translations/hi.lproj/Localizable.strings
@@ -644,6 +644,7 @@
 "MESSAGE_REQUESTS_NOTIFICATION" = "You have a new message request";
 "TXT_HIDE_TITLE" = "Hide";
 "TXT_DELETE_ACCEPT" = "Accept";
+"TXT_DECLINE_TITLE" = "Decline";
 "ALERT_ERROR_TITLE" = "Error";
 "NEW_CONVERSATION_MENU_OPEN_GROUP" = "Open Group";
 "NEW_CONVERSATION_MENU_DIRECT_MESSAGE" = "Direct Message";