From f8fb6477523b2a22bb6d82676bbfcc94a1898794 Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <>
Date: Wed, 28 Aug 2024 11:31:27 +1000
Subject: [PATCH] fix some modals

---
 .../ConversationVC+Interaction.swift          | 14 +++++++-----
 .../Meta/Translations/Localizable.xcstrings   | 22 +++++++++++++++++++
 Session/Shared/Views/SessionCell.swift        |  1 -
 .../Components/ConfirmationModal.swift        |  2 +-
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift
index 2840185e1..4f9220470 100644
--- a/Session/Conversations/ConversationVC+Interaction.swift
+++ b/Session/Conversations/ConversationVC+Interaction.swift
@@ -2273,9 +2273,10 @@ extension ConversationVC:
         let modal: ConfirmationModal = ConfirmationModal(
             targetView: self.view,
             info: ConfirmationModal.Info(
-                title: Constants.app_name,
-                body: .text("This will ban the selected user from this room. It won't ban them from other rooms."),
-                confirmTitle: "okay".localized(),
+                title: "banUser".localized(),
+                body: .text("communityBanDescription".localized()),
+                confirmTitle: "theContinue".localized(),
+                confirmStyle: .danger,
                 cancelStyle: .alert_text,
                 onConfirm: { [weak self] _ in
                     Storage.shared
@@ -2334,9 +2335,10 @@ extension ConversationVC:
         let modal: ConfirmationModal = ConfirmationModal(
             targetView: self.view,
             info: ConfirmationModal.Info(
-                title: Constants.app_name,
-                body: .text("This will ban the selected user from this room and delete all messages sent by them. It won't ban them from other rooms or delete the messages they sent there."),
-                confirmTitle: "okay".localized(),
+                title: "banDeleteAll".localized(),
+                body: .text("communityBanDeleteDescription".localized()),
+                confirmTitle: "theContinue".localized(),
+                confirmStyle: .danger,
                 cancelStyle: .alert_text,
                 onConfirm: { [weak self] _ in
                     Storage.shared
diff --git a/Session/Meta/Translations/Localizable.xcstrings b/Session/Meta/Translations/Localizable.xcstrings
index 39c7112f6..d6e044507 100644
--- a/Session/Meta/Translations/Localizable.xcstrings
+++ b/Session/Meta/Translations/Localizable.xcstrings
@@ -84939,6 +84939,28 @@
         }
       }
     },
+    "communityBanDeleteDescription" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "This will ban the selected user from this Community and delete all their messages. Are you sure you want to continue?"
+          }
+        }
+      }
+    },
+    "communityBanDescription" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "This will ban the selected user from this Community. Are you sure you want to continue?"
+          }
+        }
+      }
+    },
     "communityEnterUrl" : {
       "extractionState" : "manual",
       "localizations" : {
diff --git a/Session/Shared/Views/SessionCell.swift b/Session/Shared/Views/SessionCell.swift
index e73ac6446..aa70661f8 100644
--- a/Session/Shared/Views/SessionCell.swift
+++ b/Session/Shared/Views/SessionCell.swift
@@ -298,7 +298,6 @@ public class SessionCell: UITableViewCell {
         leftAccessoryView.alpha = 1
         leftAccessoryFillConstraint.isActive = false
         titleLabel.text = ""
-        titleLabel.textAlignment = .left
         titleLabel.themeTextColor = .textPrimary
         titleLabel.alpha = 1
         titleTextField.text = ""
diff --git a/SessionUIKit/Components/ConfirmationModal.swift b/SessionUIKit/Components/ConfirmationModal.swift
index 82c7ad29d..30dbde668 100644
--- a/SessionUIKit/Components/ConfirmationModal.swift
+++ b/SessionUIKit/Components/ConfirmationModal.swift
@@ -204,7 +204,7 @@ public class ConfirmationModal: Modal, UITextFieldDelegate {
     }
     
     private func layoutExplanationLabel() {
-        let labelWidth = view.frame.width - 2 * Values.veryLargeSpacing
+        let labelWidth = view.frame.width - 4 * Values.veryLargeSpacing
         let maxLabelSize = CGSize(width: labelWidth, height: CGFloat.greatestFiniteMagnitude)
         let expectedLabelSize = explanationLabel.sizeThatFits(maxLabelSize)
         let lineHeight = explanationLabel.font.lineHeight