Merge branch 'develop' into feature/valere/timeline_active_call_rendering

# Conflicts:
#	tests/uitests/src/test/snapshots/images/features.messages.impl.timeline.components.customreaction_EmojiItemWithPopup_Night_0_en.png

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMember.kt

@@ -10,6 +10,7 @@ package io.element.android.libraries.matrix.api.room
 
 import androidx.compose.runtime.Immutable
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 import io.element.android.libraries.matrix.api.user.MatrixUser
 
 data class RoomMember(
@@ -23,6 +24,7 @@ data class RoomMember(
     val role: Role,
     val membershipChangeReason: String?,
     val isServiceMember: Boolean,
+    val displayedStatus: DisplayedStatus?,
 ) {
     /**
      * Role of the RoomMember, based on its [powerLevel].

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileDetails.kt

@@ -10,6 +10,7 @@ package io.element.android.libraries.matrix.api.timeline.item.event
 
 import androidx.compose.runtime.Immutable
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.user.DisplayedStatus
 
 @Immutable
 sealed interface ProfileDetails {
@@ -20,7 +21,8 @@ sealed interface ProfileDetails {
     data class Ready(
         val displayName: String?,
         val displayNameAmbiguous: Boolean,
-        val avatarUrl: String?
+        val avatarUrl: String?,
+        val displayedStatus: DisplayedStatus?,
     ) : ProfileDetails
 
     data class Error(

libraries/matrix/api/src/test/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/ProfileTimelineDetailsTest.kt

@@ -38,6 +38,7 @@ class ProfileTimelineDetailsTest {
                 displayName = null,
                 displayNameAmbiguous = false,
                 avatarUrl = null,
+                displayedStatus = null,
             ).getDisambiguatedDisplayName(aUserId)
         ).isEqualTo(A_USER_ID)
     }
@@ -49,6 +50,7 @@ class ProfileTimelineDetailsTest {
                 displayName = "Alice",
                 displayNameAmbiguous = false,
                 avatarUrl = null,
+                displayedStatus = null,
             ).getDisambiguatedDisplayName(aUserId)
         ).isEqualTo("Alice")
     }
@@ -60,6 +62,7 @@ class ProfileTimelineDetailsTest {
                 displayName = "Alice",
                 displayNameAmbiguous = true,
                 avatarUrl = null,
+                displayedStatus = null,
             ).getDisambiguatedDisplayName(aUserId)
         ).isEqualTo("Alice ($A_USER_ID)")
     }