From 6dd6608e94e7737acd3cd2993bd6305291991560 Mon Sep 17 00:00:00 2001
From: Avently <7953703+avently@users.noreply.github.com>
Date: Fri, 10 Jan 2025 16:53:12 +0700
Subject: [PATCH] archived by

---
 .../chat/simplex/common/views/chat/item/FramedItemView.kt | 7 ++++++-
 .../common/views/chat/item/MarkedDeletedItemView.kt       | 8 +++++++-
 .../common/src/commonMain/resources/MR/base/strings.xml   | 1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt
index d491a1d189..afc031a685 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt
@@ -216,7 +216,12 @@ fun FramedItemView(
                   iconColor = Color.Red
                 )
               } else {
-                FramedItemHeader(stringResource(MR.strings.report_item_archived), true, painterResource(MR.images.ic_flag))
+                val text = if (ci.meta.itemDeleted is CIDeleted.Moderated) {
+                  stringResource(MR.strings.report_item_archived_by).format(ci.meta.itemDeleted.byGroupMember.displayName)
+                } else {
+                  stringResource(MR.strings.report_item_archived)
+                }
+                FramedItemHeader(text, true, painterResource(MR.images.ic_flag))
               }
             } else if (ci.meta.itemDeleted != null) {
               when (ci.meta.itemDeleted) {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkedDeletedItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkedDeletedItemView.kt
index 91e2455e3a..397815c3a0 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkedDeletedItemView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkedDeletedItemView.kt
@@ -94,7 +94,13 @@ private fun MergedMarkedDeletedText(chatItem: ChatItem, revealed: State<Boolean>
 }
 
 fun markedDeletedText(cItem: ChatItem): String =
-  if (cItem.meta.itemDeleted != null && cItem.isReport) generalGetString(MR.strings.report_item_archived)
+  if (cItem.meta.itemDeleted != null && cItem.isReport) {
+    if (cItem.meta.itemDeleted is CIDeleted.Moderated) {
+      generalGetString(MR.strings.report_item_archived_by).format(cItem.meta.itemDeleted.byGroupMember.displayName)
+    } else {
+      generalGetString(MR.strings.report_item_archived)
+    }
+  }
   else when (cItem.meta.itemDeleted) {
     is CIDeleted.Moderated ->
       String.format(generalGetString(MR.strings.moderated_item_description), cItem.meta.itemDeleted.byGroupMember.displayName)
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
index 5baf05e0ce..bec9103bc1 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
@@ -40,6 +40,7 @@
   <string name="report_item_visibility_submitter">Only you and moderators see it</string>
   <string name="report_item_visibility_moderators">Only sender and moderators see it</string>
   <string name="report_item_archived">archived report</string>
+  <string name="report_item_archived_by">archived report by %s</string>
   <string name="blocked_item_description">blocked</string>
   <string name="blocked_by_admin_item_description">blocked by admin</string>
   <string name="blocked_items_description">%d messages blocked</string>