Merge branch 'develop' into feature/fga/update_create_room_flow

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt

@@ -325,7 +325,12 @@ private fun TimelineItemEventRowContent(
         MessageEventBubble(
             modifier = Modifier
                 .constrainAs(message) {
-                    top.linkTo(sender.bottom, margin = NEGATIVE_MARGIN_FOR_BUBBLE)
+                    val topMargin = if (bubbleState.cutTopStart) {
+                        NEGATIVE_MARGIN_FOR_BUBBLE
+                    } else {
+                        0.dp
+                    }
+                    top.linkTo(sender.bottom, margin = topMargin)
                     if (event.isMine) {
                         end.linkTo(parent.end, margin = 16.dp)
                     } else {

gradle/libs.versions.toml

@@ -18,7 +18,7 @@ core = "1.13.1"
 # Stick to 1.0.0 for now, and ensure that this scenario cannot be reproduced when upgrading the version.
 datastore = "1.0.0"
 constraintlayout = "2.1.4"
-constraintlayout_compose = "1.0.1"
+constraintlayout_compose = "1.1.0"
 lifecycle = "2.8.6"
 activity = "1.9.3"
 media3 = "1.4.1"