core: forward member name; ui: don't show "Member" label if unknown member was created with name (#6211)

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt

@@ -2247,7 +2247,7 @@ data class GroupMember (
     get() {
       val p = memberProfile
       val name = p.localAlias.ifEmpty { p.displayName }
-      return pastMember(name)
+      return unknownMember(name)
     }
   override val fullName: String get() = memberProfile.fullName
   override val shortDescr: String? get() = memberProfile.shortDescr
@@ -2262,13 +2262,19 @@ data class GroupMember (
     get() {
       val p = memberProfile
       val name = p.localAlias.ifEmpty { p.displayName + (if (p.fullName == "" || p.fullName == p.displayName) "" else " / ${p.fullName}") }
-      return pastMember(name)
+      return unknownMember(name)
     }
 
-  private fun pastMember(name: String): String {
-    return if (memberStatus == GroupMemberStatus.MemUnknown)
-      String.format(generalGetString(MR.strings.past_member_vName), name)
-    else
+  private fun unknownMember(name: String): String {
+    return if (memberStatus == GroupMemberStatus.MemUnknown) {
+      if (memberId.startsWith(name)) {
+        // unknown member was created using memberId for name
+        String.format(generalGetString(MR.strings.past_member_vName), name)
+      } else {
+        // unknown member was created with name
+        name
+      }
+    } else
       name
   }
 
@@ -2282,7 +2288,7 @@ data class GroupMember (
       } else {
         fullName
       }
-      return pastMember(name)
+      return unknownMember(name)
     }
 
   val memberActive: Boolean get() = when (this.memberStatus) {

apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml

@@ -1760,7 +1760,7 @@
   <string name="group_member_status_connecting">connecting</string>
   <string name="group_member_status_unknown_short">unknown</string>
 
-  <string name="past_member_vName">Past member %1$s</string>
+  <string name="past_member_vName">Member %1$s</string>
 
   <!-- AddGroupMembersView.kt -->
   <string name="no_contacts_to_add">No contacts to add</string>