From 7acd299858d1c48cfd193f0d9aebfd275ecfaba2 Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <>
Date: Mon, 2 Sep 2024 16:02:32 +1000
Subject: [PATCH] fix unblock modals

---
 .../Conversations/ConversationVC+Interaction.swift    |  4 ++--
 .../Settings/ThreadSettingsViewModel.swift            |  7 ++++++-
 Session/Settings/BlockedContactsViewModel.swift       | 11 ++++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift
index 627fd5f3c..c529de74b 100644
--- a/Session/Conversations/ConversationVC+Interaction.swift
+++ b/Session/Conversations/ConversationVC+Interaction.swift
@@ -155,8 +155,8 @@ extension ConversationVC:
                     self.viewModel.threadData.displayName
                 ),
                 body: .attributedText(
-                    "blockUnblockDescription"
-                        .put(key: "name", value: self.viewModel.threadData.displayName)
+                    "blockUnblockName"
+                        .put(key: "name", value: viewModel.threadData.displayName)
                         .localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize))
                 ),
                 confirmTitle: "blockUnblock".localized(),
diff --git a/Session/Conversations/Settings/ThreadSettingsViewModel.swift b/Session/Conversations/Settings/ThreadSettingsViewModel.swift
index 30bbe83d4..297a6252d 100644
--- a/Session/Conversations/Settings/ThreadSettingsViewModel.swift
+++ b/Session/Conversations/Settings/ThreadSettingsViewModel.swift
@@ -697,7 +697,12 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
                                         threadViewModel.displayName
                                     )
                                 }(),
-                                body: (threadViewModel.threadIsBlocked == true ? .none :
+                                body: (threadViewModel.threadIsBlocked == true ?
+                                    .attributedText(
+                                        "blockUnblockName"
+                                            .put(key: "name", value: threadViewModel.displayName)
+                                            .localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize))
+                                    ) :
                                     .attributedText(
                                         "blockDescription"
                                             .put(key: "name", value: threadViewModel.displayName)
diff --git a/Session/Settings/BlockedContactsViewModel.swift b/Session/Settings/BlockedContactsViewModel.swift
index 28e5435d7..764b55cc8 100644
--- a/Session/Settings/BlockedContactsViewModel.swift
+++ b/Session/Settings/BlockedContactsViewModel.swift
@@ -180,27 +180,28 @@ public class BlockedContactsViewModel: SessionTableViewModel, NavigatableStateHo
                 
                 return info.title?.text
             }
-        let confirmationTitle: String = {
+        let confirmationBody: NSAttributedString = {
             let name: String = contactNames.first ?? ""
             switch contactNames.count {
             case 1:
                 return "blockUnblockName"
                     .put(key: "name", value: name)
-                    .localized()
+                    .localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize))
             case 2:
                 return "blockUnblockNameTwo"
                     .put(key: "name", value: name)
-                    .localized()
+                    .localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize))
             default:
                 return "blockUnblockNameMultiple"
                     .put(key: "name", value: name)
                     .put(key: "count", value: contactNames.count - 1)
-                    .localized()
+                    .localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize))
             }
         }()
         let confirmationModal: ConfirmationModal = ConfirmationModal(
             info: ConfirmationModal.Info(
-                title: confirmationTitle,
+                title: "blockUnblock".localized(),
+                body: .attributedText(confirmationBody),
                 confirmTitle: "blockUnblock".localized(),
                 confirmStyle: .danger,
                 cancelStyle: .alert_text