Merge branch 'develop' into feature/fga/update-rust-sdk-0.1.29-again

2023-07-10 15:41:42 +02:00 · 2023-07-10 15:41:42 +02:00 · 9e5a3d14e5
commit 9e5a3d14e5
parent fed958bc28 a0c1f2c18a
225 changed files with 1635 additions and 815 deletions
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
@ -38,10 +38,10 @@ import io.element.android.features.createroom.impl.userlist.UserListState
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
-import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.ui.strings.CommonStrings

@OptIn(ExperimentalLayoutApi::class)
@ -92,7 +92,7 @@ fun AddPeopleViewTopBar(
    onBackPressed: () -> Unit = {},
    onNextPressed: () -> Unit = {},
 ) {
-    CenterAlignedTopAppBar(
+    TopAppBar(
        modifier = modifier,
        title = {
            Text(
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
@ -57,10 +57,10 @@ import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.components.dialogs.RetryDialog
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
-import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.ui.components.AvatarActionBottomSheet
 import io.element.android.libraries.matrix.ui.components.SelectedUsersList
@ -181,7 +181,7 @@ fun ConfigureRoomToolbar(
    onBackPressed: () -> Unit = {},
    onNextPressed: () -> Unit = {},
 ) {
-    CenterAlignedTopAppBar(
+    TopAppBar(
        modifier = modifier,
        title = {
            Text(
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
@ -48,11 +48,11 @@ import io.element.android.libraries.designsystem.components.ProgressDialog
 import io.element.android.libraries.designsystem.components.dialogs.RetryDialog
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
-import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.libraries.designsystem.R as DrawableR
@ -133,7 +133,7 @@ fun CreateRoomRootViewTopBar(
    modifier: Modifier = Modifier,
    onClosePressed: () -> Unit = {},
 ) {
-    CenterAlignedTopAppBar(
+    TopAppBar(
        modifier = modifier,
        title = {
            Text(
@ -142,7 +142,7 @@ fun CreateRoomRootViewTopBar(
                fontWeight = FontWeight.SemiBold,
            )
        },
-        actions = {
+        navigationIcon = {
            IconButton(onClick = onClosePressed) {
                Icon(
                    imageVector = Icons.Default.Close,
--- a/features/invitelist/impl/build.gradle.kts
+++ b/features/invitelist/impl/build.gradle.kts
@ -43,6 +43,7 @@ dependencies {
    implementation(projects.libraries.designsystem)
    implementation(projects.libraries.uiStrings)
    implementation(projects.services.analytics.api)
+    implementation(projects.libraries.push.api)

    testImplementation(libs.test.junit)
    testImplementation(libs.coroutines.test)
@ -50,6 +51,7 @@ dependencies {
    testImplementation(libs.test.truth)
    testImplementation(libs.test.turbine)
    testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.push.test)
    testImplementation(projects.features.invitelist.test)
    testImplementation(projects.features.analytics.test)

--- a/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListPresenter.kt
+++ b/features/invitelist/impl/src/main/kotlin/io/element/android/features/invitelist/impl/InviteListPresenter.kt
@ -37,6 +37,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomSummary
+import io.element.android.libraries.push.api.notifications.NotificationDrawerManager
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analytics.api.extensions.toAnalyticsJoinedRoom
 import kotlinx.collections.immutable.toPersistentList
@ -49,6 +50,7 @@ class InviteListPresenter @Inject constructor(
    private val client: MatrixClient,
    private val store: SeenInvitesStore,
    private val analyticsService: AnalyticsService,
+    private val notificationDrawerManager: NotificationDrawerManager,
 ) : Presenter<InviteListState> {

    @Composable
@ -138,6 +140,7 @@ class InviteListPresenter @Inject constructor(
        suspend {
            client.getRoom(roomId)?.use {
                it.acceptInvitation().getOrThrow()
+                notificationDrawerManager.clearMembershipNotificationForRoom(client.sessionId, roomId)
                analyticsService.capture(it.toAnalyticsJoinedRoom(JoinedRoom.Trigger.Invite))
            }
            roomId
@ -148,7 +151,9 @@ class InviteListPresenter @Inject constructor(
        suspend {
            client.getRoom(roomId)?.use {
                it.rejectInvitation().getOrThrow()
-            } ?: Unit
+                notificationDrawerManager.clearMembershipNotificationForRoom(client.sessionId, roomId)
+            }
+            Unit
        }.runCatchingUpdatingState(declinedAction)
    }

--- a/features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt
+++ b/features/invitelist/impl/src/test/kotlin/io/element/android/features/invitelist/impl/InviteListPresenterTests.kt
@ -21,10 +21,12 @@ import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth
 import io.element.android.features.analytics.test.FakeAnalyticsService
+import io.element.android.features.invitelist.api.SeenInvitesStore
 import io.element.android.features.invitelist.test.FakeSeenInvitesStore
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
+import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
@ -39,6 +41,9 @@ import io.element.android.libraries.matrix.test.A_USER_NAME
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
 import io.element.android.libraries.matrix.test.room.FakeRoomSummaryDataSource
+import io.element.android.libraries.push.api.notifications.NotificationDrawerManager
+import io.element.android.libraries.push.test.notifications.FakeNotificationDrawerManager
+import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.test.runTest
 import org.junit.Test

@ -47,12 +52,8 @@ class InviteListPresenterTests {
    @Test
    fun `present - starts empty, adds invites when received`() = runTest {
        val roomSummaryDataSource = FakeRoomSummaryDataSource()
-        val presenter = InviteListPresenter(
-            FakeMatrixClient(
-                roomSummaryDataSource = roomSummaryDataSource,
-            ),
-            FakeSeenInvitesStore(),
-            FakeAnalyticsService(),
+        val presenter = createPresenter(
+            FakeMatrixClient(roomSummaryDataSource = roomSummaryDataSource)
        )
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
@ -72,12 +73,8 @@ class InviteListPresenterTests {
    @Test
    fun `present - uses user ID and avatar for direct invites`() = runTest {
        val roomSummaryDataSource = FakeRoomSummaryDataSource().withDirectChatInvitation()
-        val presenter = InviteListPresenter(
-            FakeMatrixClient(
-                roomSummaryDataSource = roomSummaryDataSource,
-            ),
-            FakeSeenInvitesStore(),
-            FakeAnalyticsService(),
+        val presenter = createPresenter(
+            FakeMatrixClient(roomSummaryDataSource = roomSummaryDataSource)
        )
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
@ -102,12 +99,8 @@ class InviteListPresenterTests {
    @Test
    fun `present - includes sender details for room invites`() = runTest {
        val roomSummaryDataSource = FakeRoomSummaryDataSource().withRoomInvitation()
-        val presenter = InviteListPresenter(
-            FakeMatrixClient(
-                roomSummaryDataSource = roomSummaryDataSource,
-            ),
-            FakeSeenInvitesStore(),
-            FakeAnalyticsService(),
+        val presenter = createPresenter(
+            FakeMatrixClient(roomSummaryDataSource = roomSummaryDataSource)
        )
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
@ -136,6 +129,7 @@ class InviteListPresenterTests {
            ),
            FakeSeenInvitesStore(),
            FakeAnalyticsService(),
+            FakeNotificationDrawerManager()
        )
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
@ -155,12 +149,8 @@ class InviteListPresenterTests {
    @Test
    fun `present - shows confirm dialog for declining room invites`() = runTest {
        val roomSummaryDataSource = FakeRoomSummaryDataSource().withRoomInvitation()
-        val presenter = InviteListPresenter(
-            FakeMatrixClient(
-                roomSummaryDataSource = roomSummaryDataSource,
-            ),
-            FakeSeenInvitesStore(),
-            FakeAnalyticsService(),
+        val presenter = createPresenter(
+            FakeMatrixClient(roomSummaryDataSource = roomSummaryDataSource)
        )
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
@ -180,12 +170,8 @@ class InviteListPresenterTests {
    @Test
    fun `present - hides confirm dialog when cancelling`() = runTest {
        val roomSummaryDataSource = FakeRoomSummaryDataSource().withRoomInvitation()
-        val presenter = InviteListPresenter(
-            FakeMatrixClient(
-                roomSummaryDataSource = roomSummaryDataSource,
-            ),
-            FakeSeenInvitesStore(),
-            FakeAnalyticsService(),
+        val presenter = createPresenter(
+            FakeMatrixClient(roomSummaryDataSource = roomSummaryDataSource)
        )
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
@ -205,11 +191,12 @@ class InviteListPresenterTests {
    @Test
    fun `present - declines invite after confirming`() = runTest {
        val roomSummaryDataSource = FakeRoomSummaryDataSource().withRoomInvitation()
+        val fakeNotificationDrawerManager = FakeNotificationDrawerManager()
        val client = FakeMatrixClient(
            roomSummaryDataSource = roomSummaryDataSource,
        )
        val room = FakeMatrixRoom()
-        val presenter = InviteListPresenter(client, FakeSeenInvitesStore(), FakeAnalyticsService())
+        val presenter = createPresenter(client = client, notificationDrawerManager = fakeNotificationDrawerManager)
        client.givenGetRoomResult(A_ROOM_ID, room)

        moleculeFlow(RecompositionClock.Immediate) {
@ -225,6 +212,7 @@ class InviteListPresenterTests {
            skipItems(2)

            Truth.assertThat(room.isInviteRejected).isTrue()
+            Truth.assertThat(fakeNotificationDrawerManager.getClearMembershipNotificationForRoomCount(client.sessionId, A_ROOM_ID)).isEqualTo(1)
        }
    }

@ -235,7 +223,7 @@ class InviteListPresenterTests {
            roomSummaryDataSource = roomSummaryDataSource,
        )
        val room = FakeMatrixRoom()
-        val presenter = InviteListPresenter(client, FakeSeenInvitesStore(), FakeAnalyticsService())
+        val presenter = createPresenter(client)
        val ex = Throwable("Ruh roh!")
        room.givenRejectInviteResult(Result.failure(ex))
        client.givenGetRoomResult(A_ROOM_ID, room)
@ -266,7 +254,7 @@ class InviteListPresenterTests {
            roomSummaryDataSource = roomSummaryDataSource,
        )
        val room = FakeMatrixRoom()
-        val presenter = InviteListPresenter(client, FakeSeenInvitesStore(), FakeAnalyticsService())
+        val presenter = createPresenter(client)
        val ex = Throwable("Ruh roh!")
        room.givenRejectInviteResult(Result.failure(ex))
        client.givenGetRoomResult(A_ROOM_ID, room)
@ -294,11 +282,12 @@ class InviteListPresenterTests {
    @Test
    fun `present - accepts invites and sets state on success`() = runTest {
        val roomSummaryDataSource = FakeRoomSummaryDataSource().withRoomInvitation()
+        val fakeNotificationDrawerManager = FakeNotificationDrawerManager()
        val client = FakeMatrixClient(
            roomSummaryDataSource = roomSummaryDataSource,
        )
        val room = FakeMatrixRoom()
-        val presenter = InviteListPresenter(client, FakeSeenInvitesStore(), FakeAnalyticsService())
+        val presenter = createPresenter(client = client, notificationDrawerManager = fakeNotificationDrawerManager)
        client.givenGetRoomResult(A_ROOM_ID, room)

        moleculeFlow(RecompositionClock.Immediate) {
@ -311,6 +300,7 @@ class InviteListPresenterTests {

            Truth.assertThat(room.isInviteAccepted).isTrue()
            Truth.assertThat(newState.acceptedAction).isEqualTo(Async.Success(A_ROOM_ID))
+            Truth.assertThat(fakeNotificationDrawerManager.getClearMembershipNotificationForRoomCount(client.sessionId, A_ROOM_ID)).isEqualTo(1)
        }
    }

@ -321,7 +311,7 @@ class InviteListPresenterTests {
            roomSummaryDataSource = roomSummaryDataSource,
        )
        val room = FakeMatrixRoom()
-        val presenter = InviteListPresenter(client, FakeSeenInvitesStore(), FakeAnalyticsService())
+        val presenter = createPresenter(client)
        val ex = Throwable("Ruh roh!")
        room.givenAcceptInviteResult(Result.failure(ex))
        client.givenGetRoomResult(A_ROOM_ID, room)
@ -346,7 +336,7 @@ class InviteListPresenterTests {
            roomSummaryDataSource = roomSummaryDataSource,
        )
        val room = FakeMatrixRoom()
-        val presenter = InviteListPresenter(client, FakeSeenInvitesStore(), FakeAnalyticsService())
+        val presenter = createPresenter(client)
        val ex = Throwable("Ruh roh!")
        room.givenAcceptInviteResult(Result.failure(ex))
        client.givenGetRoomResult(A_ROOM_ID, room)
@ -376,6 +366,7 @@ class InviteListPresenterTests {
            ),
            store,
            FakeAnalyticsService(),
+            FakeNotificationDrawerManager()
        )
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
@ -413,6 +404,7 @@ class InviteListPresenterTests {
            ),
            store,
            FakeAnalyticsService(),
+            FakeNotificationDrawerManager()
        )
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
@ -500,4 +492,16 @@ class InviteListPresenterTests {
            unreadNotificationCount = 0,
        )
    )
+
+    private fun createPresenter(
+        client: MatrixClient,
+        seenInvitesStore: SeenInvitesStore = FakeSeenInvitesStore(),
+        fakeAnalyticsService: AnalyticsService = FakeAnalyticsService(),
+        notificationDrawerManager: NotificationDrawerManager = FakeNotificationDrawerManager()
+    ) = InviteListPresenter(
+        client,
+        seenInvitesStore,
+        fakeAnalyticsService,
+        notificationDrawerManager
+    )
 }
--- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/StaticMapView.kt
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/StaticMapView.kt
@ -29,7 +29,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImagePainter
@ -38,8 +37,8 @@ import coil.request.ImageRequest
 import io.element.android.features.location.api.internal.AttributionPlacement
 import io.element.android.features.location.api.internal.StaticMapPlaceholder
 import io.element.android.features.location.api.internal.buildStaticMapsApiUrl
-import io.element.android.libraries.designsystem.preview.ElementPreviewDark
-import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.preview.DayNightPreviews
+import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.text.toDp
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.theme.ElementTheme
@ -127,18 +126,9 @@ fun StaticMapView(
    }
 }

-@Preview
+@DayNightPreviews
@Composable
-fun StaticMapViewLightPreview() =
-    ElementPreviewLight { ContentToPreview() }
-
-@Preview
-@Composable
-fun StaticMapViewDarkPreview() =
-    ElementPreviewDark { ContentToPreview() }
-
-@Composable
-private fun ContentToPreview() {
+fun StaticMapViewPreview() = ElementPreview {
    StaticMapView(
        lat = 0.0,
        lon = 0.0,
--- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/StaticMapPlaceholder.kt
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/StaticMapPlaceholder.kt
@ -29,13 +29,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
 import io.element.android.features.location.api.R
-import io.element.android.libraries.designsystem.preview.ElementPreviewDark
-import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.preview.DayNightPreviews
+import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
@ -83,22 +82,13 @@ internal fun StaticMapPlaceholder(
    }
 }

-@Preview
+@DayNightPreviews
@Composable
-fun StaticMapPlaceholderLightPreview(
+fun StaticMapPlaceholderPreview(
    @PreviewParameter(BooleanParameterProvider::class) values: Boolean
-) = ElementPreviewLight { ContentToPreview(values) }
-
-@Preview
-@Composable
-fun StaticMapPlaceholderDarkPreview(
-    @PreviewParameter(BooleanParameterProvider::class) values: Boolean
-) = ElementPreviewDark { ContentToPreview(values) }
-
-@Composable
-private fun ContentToPreview(showProgress: Boolean) {
+) = ElementPreview {
    StaticMapPlaceholder(
-        showProgress = showProgress,
+        showProgress = values,
        contentDescription = null,
        modifier = Modifier.size(400.dp),
        onLoadMapClick = {},
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/SendLocationView.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/SendLocationView.kt
@ -48,9 +48,9 @@ import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.theme.components.BottomSheetScaffold
-import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.libraries.designsystem.R as DesignSystemR

@ -91,7 +91,7 @@ fun SendLocationView(
        sheetDragHandle = {},
        sheetSwipeEnabled = false,
        topBar = {
-            CenterAlignedTopAppBar(
+            TopAppBar(
                title = {
                    Text(
                        text = stringResource(CommonStrings.screen_share_location_title),
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt
@ -39,11 +39,11 @@ import io.element.android.features.location.impl.map.rememberMapState
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
-import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.theme.compound.generated.TypographyTokens
 import io.element.android.libraries.ui.strings.CommonStrings

@ -61,7 +61,7 @@ fun ShowLocationView(

    Scaffold(modifier,
        topBar = {
-            CenterAlignedTopAppBar(
+            TopAppBar(
                title = {
                    Text(
                        text = stringResource(CommonStrings.screen_view_location_title),
--- a/features/login/impl/src/main/res/values-cs/translations.xml
+++ b/features/login/impl/src/main/res/values-cs/translations.xml
@ -42,5 +42,6 @@ Díky za trpělivost!"</string>
  <string name="screen_change_server_title">"Vyberte svůj server"</string>
  <string name="screen_login_password_hint">"Heslo"</string>
  <string name="screen_login_submit">"Pokračovat"</string>
+  <string name="screen_login_subtitle">"Matrix je otevřená síť pro bezpečnou a decentralizovanou komunikaci."</string>
  <string name="screen_login_username_hint">"Uživatelské jméno"</string>
 </resources>
--- a/features/login/impl/src/main/res/values-de/translations.xml
+++ b/features/login/impl/src/main/res/values-de/translations.xml
@ -42,5 +42,6 @@ Vielen Dank für deine Geduld!"</string>
  <string name="screen_change_server_title">"Wählen deinen Server"</string>
  <string name="screen_login_password_hint">"Passwort"</string>
  <string name="screen_login_submit">"Weiter"</string>
+  <string name="screen_login_subtitle">"Matrix ist ein offenes Netzwerk für sichere, dezentrale Kommunikation"</string>
  <string name="screen_login_username_hint">"Benutzername"</string>
 </resources>
--- a/features/login/impl/src/main/res/values-ro/translations.xml
+++ b/features/login/impl/src/main/res/values-ro/translations.xml
@ -42,5 +42,6 @@ Vă mulțumim pentru răbdare!"</string>
  <string name="screen_change_server_title">"Selectați serverul"</string>
  <string name="screen_login_password_hint">"Parola"</string>
  <string name="screen_login_submit">"Continuați"</string>
+  <string name="screen_login_subtitle">"Matrix este o rețea deschisă pentru o comunicare sigură și descentralizată."</string>
  <string name="screen_login_username_hint">"Utilizator"</string>
 </resources>
--- a/features/login/impl/src/main/res/values-sk/translations.xml
+++ b/features/login/impl/src/main/res/values-sk/translations.xml
@ -42,5 +42,6 @@
  <string name="screen_change_server_title">"Vyberte svoj server"</string>
  <string name="screen_login_password_hint">"Heslo"</string>
  <string name="screen_login_submit">"Pokračovať"</string>
+  <string name="screen_login_subtitle">"Matrix je otvorená sieť pre bezpečnú a decentralizovanú komunikáciu."</string>
  <string name="screen_login_username_hint">"Používateľské meno"</string>
 </resources>
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt
@ -54,7 +54,6 @@ import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
 import io.element.android.libraries.designsystem.components.dialogs.ErrorDialogDefaults
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
-import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
 import io.element.android.libraries.designsystem.theme.components.Divider
 import io.element.android.libraries.designsystem.theme.components.RadioButton
 import io.element.android.libraries.designsystem.theme.components.Scaffold
@ -62,6 +61,7 @@ import io.element.android.libraries.designsystem.theme.components.SearchBar
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.designsystem.theme.roomListRoomMessage
 import io.element.android.libraries.designsystem.theme.roomListRoomName
 import io.element.android.libraries.matrix.api.core.RoomId
@ -111,7 +111,7 @@ fun ForwardMessagesView(
    Scaffold(
        modifier = modifier,
        topBar = {
-            CenterAlignedTopAppBar(
+            TopAppBar(
                title = { Text(stringResource(CommonStrings.common_forward_message), style = ElementTextStyles.Bold.callout) },
                navigationIcon = {
                    BackButton(onClick = { onBackButton(state) })
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt
@ -50,10 +50,10 @@ import io.element.android.libraries.designsystem.components.button.ButtonWithPro
 import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
-import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
 import io.element.android.libraries.designsystem.theme.components.OutlinedTextField
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.ui.strings.CommonStrings

@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
@ -83,7 +83,7 @@ fun ReportMessageView(

    Scaffold(
        topBar = {
-            CenterAlignedTopAppBar(
+            TopAppBar(
                title = {
                    Text(
                        stringResource(CommonStrings.action_report_content),
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessagesReactionButton.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/MessagesReactionButton.kt
@ -44,6 +44,7 @@ import androidx.compose.ui.unit.sp
 import io.element.android.features.messages.impl.R
 import io.element.android.features.messages.impl.timeline.model.AggregatedReaction
 import io.element.android.features.messages.impl.timeline.model.AggregatedReactionProvider
+import io.element.android.features.messages.impl.timeline.model.aTimelineItemReactions
 import io.element.android.libraries.designsystem.ElementTextStyles
 import io.element.android.libraries.designsystem.preview.DayNightPreviews
 import io.element.android.libraries.designsystem.preview.ElementPreview
@ -132,7 +133,7 @@ private fun IconContent(
 )

@Composable
-fun ReactionContent(
+private fun ReactionContent(
    reaction: AggregatedReaction,
    modifier: Modifier = Modifier,
 ) = Row(
@ -140,7 +141,7 @@ fun ReactionContent(
    modifier = modifier,
 ) {
    Text(
-        text = reaction.key,
+        text = reaction.displayKey,
        fontSize = 15.sp, lineHeight = reactionEmojiLineHeight
    )
    if (reaction.count > 1) {
@ -148,7 +149,7 @@ fun ReactionContent(
        Text(
            text = reaction.count.toString(),
            color = if (reaction.isHighlighted) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.secondary,
-            fontSize = 14.sp
+            fontSize = 14.sp,
        )
    }
 }
@ -174,6 +175,12 @@ internal fun MessagesReactionExtraButtonsPreview() = ElementPreview {
            content = MessagesReactionsButtonContent.Text("12 more"),
            onClick = {}
        )
+        MessagesReactionButton(
+            content = MessagesReactionsButtonContent.Reaction(aTimelineItemReactions().reactions.first().copy(
+                key = "A very long reaction with many characters that should be truncated"
+            )),
+            onClick = {}
+        )
    }
 }

--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
@ -14,13 +14,13 @@
 * limitations under the License.
 */

-@file:OptIn(ExperimentalMaterial3Api::class)
-
 package io.element.android.features.messages.impl.timeline.components

 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.gestures.draggable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@ -28,6 +28,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.absoluteOffset
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@ -35,26 +36,25 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.DismissDirection
-import androidx.compose.material3.DismissState
-import androidx.compose.material3.DismissValue
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.SwipeToDismiss
-import androidx.compose.material3.rememberDismissState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.platform.LocalViewConfiguration
+import androidx.compose.ui.platform.ViewConfiguration
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
@ -66,6 +66,7 @@ import io.element.android.features.messages.impl.timeline.aTimelineItemReactions
 import io.element.android.features.messages.impl.timeline.components.event.TimelineItemEventContentView
 import io.element.android.features.messages.impl.timeline.components.event.toExtraPadding
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition
 import io.element.android.features.messages.impl.timeline.model.bubble.BubbleState
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemImageContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
@ -78,6 +79,9 @@ import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.swipe.SwipeableActionsState
+import io.element.android.libraries.designsystem.swipe.rememberSwipeableActionsState
+import io.element.android.libraries.designsystem.text.toPx
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UserId
@ -93,7 +97,10 @@ import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailInfo
 import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailType
 import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.coroutines.launch
 import org.jsoup.Jsoup
+import kotlin.math.abs
+import kotlin.math.roundToInt

@Composable
 fun TimelineItemEventRow(
@ -110,6 +117,7 @@ fun TimelineItemEventRow(
    onSwipeToReply: () -> Unit,
    modifier: Modifier = Modifier
 ) {
+    val coroutineScope = rememberCoroutineScope()
    val interactionSource = remember { MutableInteractionSource() }

    fun onUserDataClicked() {
@ -121,56 +129,88 @@ fun TimelineItemEventRow(
        inReplyToClick(inReplyToEventId)
    }

-    if (canReply) {
-        val dismissState = rememberDismissState(
-            confirmValueChange = {
-                if (it == DismissValue.DismissedToEnd) {
-                    onSwipeToReply()
+    Column(modifier = modifier.fillMaxWidth()) {
+        if (event.groupPosition.isNew()) {
+            Spacer(modifier = Modifier.height(16.dp))
+        } else {
+            Spacer(modifier = Modifier.height(2.dp))
+        }
+        if (canReply) {
+            val state: SwipeableActionsState = rememberSwipeableActionsState()
+            val offset = state.offset.value
+            val swipeThresholdPx = 40.dp.toPx()
+            val thresholdCrossed = abs(offset) > swipeThresholdPx
+            SwipeSensitivity(3f) {
+                Box(Modifier.fillMaxWidth()) {
+                    Row(modifier = Modifier.matchParentSize()) {
+                        ReplySwipeIndicator({ offset / 120 })
+                    }
+                    TimelineItemEventRowContent(
+                        modifier = Modifier
+                            .absoluteOffset { IntOffset(x = offset.roundToInt(), y = 0) }
+                            .draggable(
+                                orientation = Orientation.Horizontal,
+                                enabled = !state.isResettingOnRelease,
+                                onDragStopped = {
+                                    coroutineScope.launch {
+                                        if (thresholdCrossed) {
+                                            onSwipeToReply()
+                                        }
+                                        state.resetOffset()
+                                    }
+                                },
+                                state = state.draggableState,
+                            ),
+                        event = event,
+                        isHighlighted = isHighlighted,
+                        interactionSource = interactionSource,
+                        onClick = onClick,
+                        onLongClick = onLongClick,
+                        onTimestampClicked = onTimestampClicked,
+                        inReplyToClicked = ::inReplyToClicked,
+                        onUserDataClicked = ::onUserDataClicked,
+                        onReactionClicked = { emoji -> onReactionClick(emoji, event) },
+                        onMoreReactionsClicked = { onMoreReactionsClick(event) },
+                    )
                }
-                // Do not dismiss the message, return false!
-                false
            }
-        )
-        SwipeToDismiss(
-            state = dismissState,
-            background = {
-                ReplySwipeIndicator({ dismissState.toSwipeProgress() })
-            },
-            directions = setOf(DismissDirection.StartToEnd),
-            dismissContent = {
-                TimelineItemEventRowContent(
-                    event = event,
-                    isHighlighted = isHighlighted,
-                    interactionSource = interactionSource,
-                    onClick = onClick,
-                    onLongClick = onLongClick,
-                    onTimestampClicked = onTimestampClicked,
-                    inReplyToClicked = ::inReplyToClicked,
-                    onUserDataClicked = ::onUserDataClicked,
-                    onReactionClicked = { emoji -> onReactionClick(emoji, event) },
-                    onMoreReactionsClicked = { onMoreReactionsClick(event) },
-                )
-            }
-        )
-    } else {
-        TimelineItemEventRowContent(
-            event = event,
-            isHighlighted = isHighlighted,
-            interactionSource = interactionSource,
-            onClick = onClick,
-            onLongClick = onLongClick,
-            onTimestampClicked = onTimestampClicked,
-            inReplyToClicked = ::inReplyToClicked,
-            onUserDataClicked = ::onUserDataClicked,
-            onReactionClicked = { emoji -> onReactionClick(emoji, event) },
-            onMoreReactionsClicked = { onMoreReactionsClick(event) },
-        )
+        } else {
+            TimelineItemEventRowContent(
+                event = event,
+                isHighlighted = isHighlighted,
+                interactionSource = interactionSource,
+                onClick = onClick,
+                onLongClick = onLongClick,
+                onTimestampClicked = onTimestampClicked,
+                inReplyToClicked = ::inReplyToClicked,
+                onUserDataClicked = ::onUserDataClicked,
+                onReactionClicked = { emoji -> onReactionClick(emoji, event) },
+                onMoreReactionsClicked = { onMoreReactionsClick(event) },
+            )
+        }
    }
-    // This is assuming that we are in a ColumnScope, but this is OK, for both Preview and real usage.
-    if (event.groupPosition.isNew()) {
-        Spacer(modifier = modifier.height(16.dp))
-    } else {
-        Spacer(modifier = modifier.height(2.dp))
+}
+
+/**
+ * Impact ViewConfiguration.touchSlop by [sensitivityFactor].
+ * Inspired from https://issuetracker.google.com/u/1/issues/269627294.
+ * @param sensitivityFactor the factor to multiply the touchSlop by. The highest value, the more the user will
+ * have to drag to start the drag.
+ * @param content the content to display.
+ */
+@Composable
+fun SwipeSensitivity(
+    sensitivityFactor: Float,
+    content: @Composable () -> Unit,
+) {
+    val current = LocalViewConfiguration.current
+    CompositionLocalProvider(
+        LocalViewConfiguration provides object : ViewConfiguration by current {
+            override val touchSlop: Float
+                get() = current.touchSlop * sensitivityFactor
+        }
+    ) {
+        content()
    }
 }

@ -266,14 +306,6 @@ private fun TimelineItemEventRowContent(
    }
 }

-private fun DismissState.toSwipeProgress(): Float {
-    return when (targetValue) {
-        DismissValue.Default -> 0f
-        DismissValue.DismissedToEnd -> progress * 3
-        DismissValue.DismissedToStart -> progress * 3
-    }
-}
-
@Composable
 private fun MessageSenderInformation(
    sender: String,
@ -544,6 +576,7 @@ private fun ContentToPreview() {
                        body = "A long text which will be displayed on several lines and" +
                            " hopefully can be manually adjusted to test different behaviors."
                    ),
+                    groupPosition = TimelineItemGroupPosition.First,
                ),
                isHighlighted = false,
                canReply = true,
@ -562,6 +595,7 @@ private fun ContentToPreview() {
                    content = aTimelineItemImageContent().copy(
                        aspectRatio = 5f
                    ),
+                    groupPosition = TimelineItemGroupPosition.Last,
                ),
                isHighlighted = false,
                canReply = true,
@ -606,7 +640,8 @@ private fun ContentToPreviewWithReply() {
                        body = "A long text which will be displayed on several lines and" +
                            " hopefully can be manually adjusted to test different behaviors."
                    ),
-                    inReplyTo = aInReplyToReady(replyContent)
+                    inReplyTo = aInReplyToReady(replyContent),
+                    groupPosition = TimelineItemGroupPosition.First,
                ),
                isHighlighted = false,
                canReply = true,
@ -625,7 +660,8 @@ private fun ContentToPreviewWithReply() {
                    content = aTimelineItemImageContent().copy(
                        aspectRatio = 5f
                    ),
-                    inReplyTo = aInReplyToReady(replyContent)
+                    inReplyTo = aInReplyToReady(replyContent),
+                    groupPosition = TimelineItemGroupPosition.Last,
                ),
                isHighlighted = false,
                canReply = true,
@ -699,7 +735,6 @@ private fun ContentTimestampToPreview(event: TimelineItem.Event) {
    }
 }

-
@Preview
@Composable
 internal fun TimelineItemEventRowWithManyReactionsLightPreview() =
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReaction.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReaction.kt
@ -16,8 +16,18 @@

 package io.element.android.features.messages.impl.timeline.model

+import io.element.android.libraries.core.extensions.ellipsize
+
 /**
- * @property key the reaction key (e.g. "👍")
+ * Length at which we ellipsize a reaction key for display
+ *
+ * Reactions can be free text, so we need to limit the length
+ * displayed on screen.
+ */
+private const val MAX_DISPLAY_CHARS = 16
+
+/**
+ * @property key the full reaction key (e.g. "👍", "YES!")
 * @property count the number of users who reacted with this key
 * @property isHighlighted true if the reaction has (also) been sent by the current user.
 */
@ -25,4 +35,14 @@ data class AggregatedReaction(
    val key: String,
    val count: Int,
    val isHighlighted: Boolean = false
-)
+) {
+
+    /**
+     * The key to be displayed on screen.
+     *
+     * See [MAX_DISPLAY_CHARS].
+     */
+    val displayKey: String by lazy {
+        key.ellipsize(MAX_DISPLAY_CHARS)
+    }
+}
--- a/features/messages/impl/src/main/res/values-de/translations.xml
+++ b/features/messages/impl/src/main/res/values-de/translations.xml
@ -10,11 +10,14 @@
  <string name="screen_room_attachment_source_files">"Anhang"</string>
  <string name="screen_room_attachment_source_gallery">"Foto- &amp; Video-Bibliothek"</string>
  <string name="screen_room_attachment_source_location">"Standort"</string>
+  <string name="screen_room_encrypted_history_banner">"Der Nachrichtenverlauf ist in diesem Raum derzeit nicht verfügbar"</string>
  <string name="screen_room_error_failed_retrieving_user_details">"Benutzerdetails konnten nicht abgerufen werden"</string>
  <string name="screen_room_invite_again_alert_message">"Möchtest du sie wieder einladen?"</string>
  <string name="screen_room_invite_again_alert_title">"Du bist allein in diesem Chat"</string>
  <string name="screen_room_message_copied">"Nachricht kopiert"</string>
  <string name="screen_room_no_permission_to_post">"Du bist keine Berechtigung, um in diesem Raum zu posten"</string>
+  <string name="screen_room_reactions_show_less">"Weniger anzeigen"</string>
+  <string name="screen_room_reactions_show_more">"Mehr anzeigen"</string>
  <string name="screen_room_retry_send_menu_send_again_action">"Erneut senden"</string>
  <string name="screen_room_retry_send_menu_title">"Ihre Nachricht konnte nicht gesendet werden"</string>
  <string name="screen_room_error_failed_processing_media">"Fehler bei der Verarbeitung von Medien zum Hochladen, bitte versuchen Sie es erneut."</string>
--- a/features/messages/impl/src/main/res/values-sk/translations.xml
+++ b/features/messages/impl/src/main/res/values-sk/translations.xml
@ -11,11 +11,14 @@
  <string name="screen_room_attachment_source_files">"Príloha"</string>
  <string name="screen_room_attachment_source_gallery">"Knižnica fotografií a videí"</string>
  <string name="screen_room_attachment_source_location">"Poloha"</string>
+  <string name="screen_room_encrypted_history_banner">"História správ v tejto miestnosti nie je momentálne k dispozícii"</string>
  <string name="screen_room_error_failed_retrieving_user_details">"Nepodarilo sa získať údaje o používateľovi"</string>
  <string name="screen_room_invite_again_alert_message">"Chceli by ste ich pozvať späť?"</string>
  <string name="screen_room_invite_again_alert_title">"V tomto rozhovore ste sami"</string>
  <string name="screen_room_message_copied">"Správa skopírovaná"</string>
  <string name="screen_room_no_permission_to_post">"Nemáte povolenie uverejňovať príspevky v tejto miestnosti"</string>
+  <string name="screen_room_reactions_show_less">"Zobraziť menej"</string>
+  <string name="screen_room_reactions_show_more">"Zobraziť viac"</string>
  <string name="screen_room_retry_send_menu_send_again_action">"Odoslať znova"</string>
  <string name="screen_room_retry_send_menu_title">"Vašu správu sa nepodarilo odoslať"</string>
  <string name="screen_room_error_failed_processing_media">"Nepodarilo sa spracovať médiá na odoslanie, skúste to prosím znova."</string>
--- a/features/messages/impl/src/main/res/values/localazy.xml
+++ b/features/messages/impl/src/main/res/values/localazy.xml
@ -4,11 +4,9 @@
    <item quantity="one">"%1$d room change"</item>
    <item quantity="other">"%1$d room changes"</item>
  </plurals>
-  <string name="screen_room_timeline_less_reactions">"Show less"</string>
  <plurals name="screen_room_timeline_more_reactions">
    <item quantity="other">"%1$d more"</item>
  </plurals>
-  <string name="screen_room_timeline_add_reaction">"Add emoji"</string>
  <string name="screen_room_attachment_source_camera">"Camera"</string>
  <string name="screen_room_attachment_source_camera_photo">"Take photo"</string>
  <string name="screen_room_attachment_source_camera_video">"Record a video"</string>
@ -25,6 +23,8 @@
  <string name="screen_room_reactions_show_more">"Show more"</string>
  <string name="screen_room_retry_send_menu_send_again_action">"Send again"</string>
  <string name="screen_room_retry_send_menu_title">"Your message failed to send"</string>
+  <string name="screen_room_timeline_add_reaction">"Add emoji"</string>
+  <string name="screen_room_timeline_less_reactions">"Show less"</string>
  <string name="screen_room_error_failed_processing_media">"Failed processing media to upload, please try again."</string>
  <string name="screen_room_retry_send_menu_remove_action">"Remove"</string>
 </resources>
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/timeline/model/AggregatedReactionTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/timeline/model/AggregatedReactionTest.kt
@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.messages.timeline.model
+
+import io.element.android.features.messages.impl.timeline.model.AggregatedReaction
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class AggregatedReactionTest {
+    @Test
+    fun `reaction display key is shortened`() {
+        val reaction = AggregatedReaction(
+                key = "1234567890123456790",
+                count = 1,
+                isHighlighted = false
+        )
+
+        assertEquals("1234567890123456…", reaction.displayKey)
+    }
+}
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenter.kt
@ -28,6 +28,8 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import io.element.android.features.logout.api.LogoutPreferencePresenter
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.meta.BuildType
+import io.element.android.libraries.designsystem.utils.SnackbarDispatcher
+import io.element.android.libraries.designsystem.utils.collectSnackbarMessageAsState
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.api.user.getCurrentUser
@ -43,6 +45,7 @@ class PreferencesRootPresenter @Inject constructor(
    private val sessionVerificationService: SessionVerificationService,
    private val buildType: BuildType,
    private val versionFormatter: VersionFormatter,
+    private val snackbarDispatcher: SnackbarDispatcher,
 ) : Presenter<PreferencesRootState> {

    @Composable
@ -54,6 +57,8 @@ class PreferencesRootPresenter @Inject constructor(
            initialLoad(matrixUser)
        }

+        val snackbarMessage by snackbarDispatcher.collectSnackbarMessageAsState()
+
        // Session verification status (unknown, not verified, verified)
        val sessionVerifiedStatus by sessionVerificationService.sessionVerifiedStatus.collectAsState()
        val sessionIsNotVerified by remember {
@ -67,7 +72,8 @@ class PreferencesRootPresenter @Inject constructor(
            myUser = matrixUser.value,
            version = versionFormatter.get(),
            showCompleteVerification = sessionIsNotVerified,
-            showDeveloperSettings = showDeveloperSettings
+            showDeveloperSettings = showDeveloperSettings,
+            snackbarMessage = snackbarMessage,
        )
    }

--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootState.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootState.kt
@ -17,6 +17,7 @@
 package io.element.android.features.preferences.impl.root

 import io.element.android.features.logout.api.LogoutPreferenceState
+import io.element.android.libraries.designsystem.utils.SnackbarMessage
 import io.element.android.libraries.matrix.api.user.MatrixUser

 data class PreferencesRootState(
@ -24,5 +25,6 @@ data class PreferencesRootState(
    val myUser: MatrixUser?,
    val version: String,
    val showCompleteVerification: Boolean,
-    val showDeveloperSettings: Boolean
+    val showDeveloperSettings: Boolean,
+    val snackbarMessage: SnackbarMessage?,
 )
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootStateProvider.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootStateProvider.kt
@ -17,11 +17,14 @@
 package io.element.android.features.preferences.impl.root

 import io.element.android.features.logout.api.aLogoutPreferenceState
+import io.element.android.libraries.designsystem.utils.SnackbarMessage
+import io.element.android.libraries.ui.strings.CommonStrings

 fun aPreferencesRootState() = PreferencesRootState(
    logoutState = aLogoutPreferenceState(),
    myUser = null,
    version = "Version 1.1 (1)",
    showCompleteVerification = true,
-    showDeveloperSettings = true
+    showDeveloperSettings = true,
+    snackbarMessage = SnackbarMessage(CommonStrings.common_verification_complete),
 )
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt
@ -24,6 +24,8 @@ import androidx.compose.material.icons.outlined.DeveloperMode
 import androidx.compose.material.icons.outlined.Help
 import androidx.compose.material.icons.outlined.InsertChart
 import androidx.compose.material.icons.outlined.VerifiedUser
+import androidx.compose.material3.Snackbar
+import androidx.compose.material3.SnackbarHost
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@ -39,6 +41,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.preview.LargeHeightPreview
 import io.element.android.libraries.designsystem.theme.components.Divider
 import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.utils.rememberSnackbarHostState
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.components.MatrixUserProvider
 import io.element.android.libraries.theme.ElementTheme
@ -55,11 +58,20 @@ fun PreferencesRootView(
    onOpenDeveloperSettings: () -> Unit,
    modifier: Modifier = Modifier,
 ) {
+    val snackbarHostState = rememberSnackbarHostState(snackbarMessage = state.snackbarMessage)
+
    // Include pref from other modules
    PreferenceView(
        modifier = modifier,
        onBackPressed = onBackPressed,
-        title = stringResource(id = CommonStrings.common_settings)
+        title = stringResource(id = CommonStrings.common_settings),
+        snackbarHost = {
+            SnackbarHost(snackbarHostState) { data ->
+                Snackbar(
+                    snackbarData = data,
+                )
+            }
+        }
    ) {
        UserPreferences(state.myUser)
        if (state.showCompleteVerification) {
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt
@ -23,6 +23,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.features.logout.impl.DefaultLogoutPreferencePresenter
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.core.meta.BuildType
+import io.element.android.libraries.designsystem.utils.SnackbarDispatcher
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.test.AN_AVATAR_URL
 import io.element.android.libraries.matrix.test.A_USER_NAME
@ -41,7 +42,8 @@ class PreferencesRootPresenterTest {
            matrixClient,
            FakeSessionVerificationService(),
            BuildType.DEBUG,
-            FakeVersionFormatter()
+            FakeVersionFormatter(),
+            SnackbarDispatcher(),
        )
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
@ -22,7 +22,7 @@ import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import io.element.android.features.leaveroom.api.LeaveRoomEvent
 import io.element.android.features.leaveroom.api.LeaveRoomPresenter
@ -55,14 +55,14 @@ class RoomDetailsPresenter @Inject constructor(
        val canEditTopic by getCanSendStateEvent(membersState, StateEventType.ROOM_TOPIC)
        val dmMember by room.getDirectRoomMember(membersState)
        val roomMemberDetailsPresenter = roomMemberDetailsPresenter(dmMember)
-        val roomType = getRoomType(dmMember)
+        val roomType by getRoomType(dmMember)

-        val topicState = remember(canEditTopic, room.topic) {
+        val topicState = remember(canEditTopic, room.topic, roomType) {
            val topic = room.topic

            when {
                !topic.isNullOrBlank() -> RoomTopicState.ExistingTopic(topic)
-                canEditTopic -> RoomTopicState.CanAddTopic
+                canEditTopic && roomType is RoomDetailsType.Room -> RoomTopicState.CanAddTopic
                else -> RoomTopicState.Hidden
            }
        }
@ -85,8 +85,8 @@ class RoomDetailsPresenter @Inject constructor(
            memberCount = room.joinedMemberCount,
            isEncrypted = room.isEncrypted,
            canInvite = canInvite,
-            canEdit = canEditAvatar || canEditName || canEditTopic,
-            roomType = roomType.value,
+            canEdit = (canEditAvatar || canEditName || canEditTopic) && roomType == RoomDetailsType.Room,
+            roomType = roomType,
            roomMemberDetailsState = roomMemberDetailsState,
            leaveRoomState = leaveRoomState,
            eventSink = ::handleEvents,
@ -112,20 +112,12 @@ class RoomDetailsPresenter @Inject constructor(
    }

    @Composable
-    private fun getCanInvite(membersState: MatrixRoomMembersState): State<Boolean> {
-        val canInvite = remember(membersState) { mutableStateOf(false) }
-        LaunchedEffect(membersState) {
-            canInvite.value = room.canInvite().getOrElse { false }
-        }
-        return canInvite
+    private fun getCanInvite(membersState: MatrixRoomMembersState) = produceState(false, membersState) {
+        value = room.canInvite().getOrElse { false }
    }

    @Composable
-    private fun getCanSendStateEvent(membersState: MatrixRoomMembersState, type: StateEventType): State<Boolean> {
-        val canSendEvent = remember(membersState) { mutableStateOf(false) }
-        LaunchedEffect(membersState) {
-            canSendEvent.value = room.canSendStateEvent(type).getOrElse { false }
-        }
-        return canSendEvent
+    private fun getCanSendStateEvent(membersState: MatrixRoomMembersState, type: StateEventType) = produceState(false, membersState) {
+        value = room.canSendStateEvent(type).getOrElse { false }
    }
 }
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt
@ -68,11 +68,11 @@ import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
-import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.ui.components.AvatarActionBottomSheet
 import io.element.android.libraries.matrix.ui.components.UnsavedAvatar
 import io.element.android.libraries.ui.strings.CommonStrings
@ -102,7 +102,7 @@ fun RoomDetailsEditView(
    Scaffold(
        modifier = modifier.clearFocusOnTap(focusManager),
        topBar = {
-            CenterAlignedTopAppBar(
+            TopAppBar(
                title = {
                    Text(
                        text = stringResource(id = R.string.screen_room_details_edit_room_title),
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt
@ -39,13 +39,13 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
-import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
 import io.element.android.libraries.designsystem.theme.components.Divider
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.SearchBar
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.components.CheckableUnresolvedUserRow
 import io.element.android.libraries.matrix.ui.components.CheckableUserRow
@ -117,7 +117,7 @@ fun RoomInviteMembersTopBar(
    onBackPressed: () -> Unit = {},
    onSendPressed: () -> Unit = {},
 ) {
-    CenterAlignedTopAppBar(
+    TopAppBar(
        modifier = modifier,
        title = {
            Text(
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
@ -49,13 +49,13 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
-import io.element.android.libraries.designsystem.theme.components.CenterAlignedTopAppBar
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.SearchBar
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.user.MatrixUser
@ -203,7 +203,7 @@ private fun RoomMemberListTopBar(
    onBackPressed: () -> Unit = {},
    onInvitePressed: () -> Unit = {},
 ) {
-    CenterAlignedTopAppBar(
+    TopAppBar(
        modifier = modifier,
        title = {
            Text(
--- a/features/roomdetails/impl/src/main/res/values-de/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-de/translations.xml
@ -13,7 +13,7 @@
  <string name="screen_room_details_encryption_enabled_subtitle">"Nachrichten sind mit Schlössern gesichert. Nur du und der Empfänger haben die eindeutigen Schlüssel, um sie zu entsperren."</string>
  <string name="screen_room_details_encryption_enabled_title">"Nachrichtenverschlüsselung aktiviert"</string>
  <string name="screen_room_details_invite_people_title">"Personen einladen"</string>
-  <string name="screen_room_details_notification_title">"Benachrichtigung"</string>
+  <string name="screen_room_details_notification_title">"Benachrichtigungen"</string>
  <string name="screen_room_details_room_name_label">"Raumname"</string>
  <string name="screen_room_details_share_room_title">"Raum teilen"</string>
  <string name="screen_room_details_updating_room">"Aktualisiere Raum…"</string>
--- a/features/roomdetails/impl/src/main/res/values-sk/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-sk/translations.xml
@ -14,7 +14,7 @@
  <string name="screen_room_details_encryption_enabled_subtitle">"Správy sú zabezpečené zámkami. Jedine vy a príjemcovia máte jedinečné kľúče na ich odomknutie."</string>
  <string name="screen_room_details_encryption_enabled_title">"Šifrovanie správ je zapnuté"</string>
  <string name="screen_room_details_invite_people_title">"Pozvať ľudí"</string>
-  <string name="screen_room_details_notification_title">"Oznámenie"</string>
+  <string name="screen_room_details_notification_title">"Oznámenia"</string>
  <string name="screen_room_details_room_name_label">"Názov miestnosti"</string>
  <string name="screen_room_details_share_room_title">"Zdieľať miestnosť"</string>
  <string name="screen_room_details_updating_room">"Aktualizácia miestnosti…"</string>
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/RoomDetailsPresenterTests.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/RoomDetailsPresenterTests.kt
@ -20,7 +20,10 @@ import app.cash.molecule.RecompositionClock
 import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
+import io.element.android.features.leaveroom.api.LeaveRoomEvent
+import io.element.android.features.leaveroom.api.LeaveRoomPresenter
 import io.element.android.features.leaveroom.fake.LeaveRoomPresenterFake
+import io.element.android.features.roomdetails.impl.RoomDetailsEvent
 import io.element.android.features.roomdetails.impl.RoomDetailsPresenter
 import io.element.android.features.roomdetails.impl.RoomDetailsType
 import io.element.android.features.roomdetails.impl.RoomTopicState
@ -44,13 +47,13 @@ import org.junit.Test
@ExperimentalCoroutinesApi
 class RoomDetailsPresenterTests {

-    private fun aRoomDetailsPresenter(room: MatrixRoom): RoomDetailsPresenter {
+    private fun aRoomDetailsPresenter(room: MatrixRoom, leaveRoomPresenter: LeaveRoomPresenter = LeaveRoomPresenterFake()): RoomDetailsPresenter {
        val roomMemberDetailsPresenterFactory = object : RoomMemberDetailsPresenter.Factory {
            override fun create(roomMemberId: UserId): RoomMemberDetailsPresenter {
                return RoomMemberDetailsPresenter(FakeMatrixClient(), room, roomMemberId)
            }
        }
-        return RoomDetailsPresenter(room, roomMemberDetailsPresenterFactory, LeaveRoomPresenterFake())
+        return RoomDetailsPresenter(room, roomMemberDetailsPresenterFactory, leaveRoomPresenter)
    }

    @Test
@ -173,6 +176,64 @@ class RoomDetailsPresenterTests {
        }
    }

+    @Test
+    fun `present - initial state when user can edit attributes in a DM`() = runTest {
+        val myRoomMember = aRoomMember(A_SESSION_ID)
+        val otherRoomMember = aRoomMember(A_USER_ID_2)
+        val room = aMatrixRoom(
+            isEncrypted = true,
+            isDirect = true,
+        ).apply {
+            val roomMembers = listOf(myRoomMember, otherRoomMember)
+            givenRoomMembersState(MatrixRoomMembersState.Ready(roomMembers))
+
+            givenCanSendStateResult(StateEventType.ROOM_TOPIC, Result.success(true))
+            givenCanSendStateResult(StateEventType.ROOM_NAME, Result.success(true))
+            givenCanSendStateResult(StateEventType.ROOM_AVATAR, Result.success(true))
+            givenCanInviteResult(Result.success(false))
+        }
+        val presenter = aRoomDetailsPresenter(room)
+        moleculeFlow(RecompositionClock.Immediate) {
+            presenter.present()
+        }.test {
+            // Initially false
+            assertThat(awaitItem().canEdit).isFalse()
+            // Then the asynchronous check completes, but editing is still disallowed because it's a DM
+            val settledState = awaitItem()
+            assertThat(settledState.canEdit).isFalse()
+            // If there is a topic, it's visible
+            assertThat(settledState.roomTopic).isEqualTo(RoomTopicState.ExistingTopic(room.topic!!))
+
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+    @Test
+    fun `present - initial state when in a DM with no topic`() = runTest {
+        val myRoomMember = aRoomMember(A_SESSION_ID)
+        val otherRoomMember = aRoomMember(A_USER_ID_2)
+        val room = aMatrixRoom(
+            isEncrypted = true,
+            isDirect = true,
+            topic = null,
+        ).apply {
+            val roomMembers = listOf(myRoomMember, otherRoomMember)
+            givenRoomMembersState(MatrixRoomMembersState.Ready(roomMembers))
+
+            givenCanSendStateResult(StateEventType.ROOM_TOPIC, Result.success(true))
+        }
+        val presenter = aRoomDetailsPresenter(room)
+        moleculeFlow(RecompositionClock.Immediate) {
+            presenter.present()
+        }.test {
+            skipItems(1)
+
+            // There's no topic, so we hide the entire UI for DMs
+            assertThat(awaitItem().roomTopic).isEqualTo(RoomTopicState.Hidden)
+
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
    @Test
    fun `present - initial state when user can edit all attributes`() = runTest {
        val room = aMatrixRoom().apply {
@ -247,6 +308,22 @@ class RoomDetailsPresenterTests {
            cancelAndIgnoreRemainingEvents()
        }
    }
+
+    @Test
+    fun `present - leave room event is passed on to leave room presenter`() = runTest {
+        val leaveRoomPresenter = LeaveRoomPresenterFake()
+        val room = aMatrixRoom()
+        val presenter = aRoomDetailsPresenter(room, leaveRoomPresenter)
+        moleculeFlow(RecompositionClock.Immediate) {
+            presenter.present()
+        }.test {
+            awaitItem().eventSink(RoomDetailsEvent.LeaveRoom)
+
+            assertThat(leaveRoomPresenter.events).contains(LeaveRoomEvent.ShowConfirmation(room.roomId))
+
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
 }

 fun aMatrixRoom(
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
@ -231,8 +231,6 @@ fun RoomListContent(
            SnackbarHost(snackbarHostState) { data ->
                Snackbar(
                    snackbarData = data,
-                    containerColor = MaterialTheme.colorScheme.surfaceVariant,
-                    contentColor = MaterialTheme.colorScheme.primary
                )
            }
        },
--- a/features/roomlist/impl/src/main/res/values-sk/translations.xml
+++ b/features/roomlist/impl/src/main/res/values-sk/translations.xml
@ -2,6 +2,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="screen_roomlist_a11y_create_message">"Vytvorte novú konverzáciu alebo miestnosť"</string>
  <string name="screen_roomlist_main_space_title">"Všetky konverzácie"</string>
-  <string name="session_verification_banner_message">"Vyzerá to tak, že používate nové zariadenie. Overte, či ste to vy, aby ste mali prístup k zašifrovaným správam."</string>
-  <string name="session_verification_banner_title">"Získajte prístup k histórii vašich správ"</string>
+  <string name="session_verification_banner_message">"Vyzerá to tak, že používate nové zariadenie. Overte svoj prístup k zašifrovaným správam pomocou vášho druhého zariadenia."</string>
+  <string name="session_verification_banner_title">"Overte, že ste to vy"</string>
 </resources>