diff --git 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
index 735a25fef9..0292ec927e 100644
--- 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
@@ -28,7 +28,6 @@ import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.location.api.R
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-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
 import io.element.android.libraries.ui.strings.CommonStrings
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationShareRow.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationShareRow.kt
index d2c7ba5966..83db9a9c61 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationShareRow.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/ui/LocationShareRow.kt
@@ -93,7 +93,7 @@ fun LocationShareRow(
                 Text(
                     text = if (item.isLive) stringResource(CommonStrings.screen_room_live_location_banner) else item.formattedTimestamp,
                     style = ElementTheme.typography.fontBodySmRegular,
-                    color = if(item.isLive) ElementTheme.colors.textPrimary else ElementTheme.colors.textSecondary,
+                    color = if (item.isLive) ElementTheme.colors.textPrimary else ElementTheme.colors.textSecondary,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
                 )
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenter.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenter.kt
index 10501409fe..6b05e473c6 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenter.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenter.kt
@@ -43,7 +43,7 @@ import io.element.android.libraries.matrix.api.room.joinedRoomMembers
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.toolbox.api.strings.StringProvider
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.combine
 
 @AssistedInject
@@ -161,7 +161,7 @@ class ShowLocationPresenter(
                                 isLive = true,
                                 assetType = lastLocation.assetType,
                             )
-                        }.toPersistentList()
+                        }.toImmutableList()
                     }.collect { value = it }
                 }.value
             }
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt
index c5120928dc..5369c441f8 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt
@@ -434,7 +434,7 @@ class ShowLocationPresenterTest {
             senderName = senderName,
             senderId = senderId,
             senderAvatarUrl = avatarUrl,
-            timestamp = 1234567890L,
+            timestamp = 0L,
             assetType = AssetType.SENDER,
         )
 
@@ -468,7 +468,7 @@ class ShowLocationPresenterTest {
 private fun aLiveLocationShare(
     userId: UserId,
     geoUri: String = "geo:48.8584,2.2945",
-    timestamp: Long = 1234567890L,
+    timestamp: Long = 0L,
     endTimestamp: Long = Long.MAX_VALUE,
     assetType: AssetType = AssetType.SENDER,
 ): LiveLocationShare {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
index 5affdb4484..690f895e07 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
@@ -570,7 +570,7 @@ class MessagesFlowNode(
                 )
             }
             is TimelineItemLocationContent -> {
-                val mode = when(event.content.mode){
+                val mode = when (event.content.mode) {
                     is TimelineItemLocationContent.Mode.Live -> ShowLocationMode.Live(event.senderId)
                     is TimelineItemLocationContent.Mode.Static -> ShowLocationMode.Static(
                         location = event.content.mode.location,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
index 9f3b2afd2a..ef446e36cf 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
@@ -289,7 +289,7 @@ private fun MessageSummary(
         is TimelineItemRedactedContent,
         is TimelineItemUnknownContent -> content = { ContentForBody(textContent) }
         is TimelineItemLocationContent -> {
-            val body = when(event.content.mode) {
+            val body = when (event.content.mode) {
                 is TimelineItemLocationContent.Mode.Live -> stringResource(CommonStrings.common_shared_live_location)
                 is TimelineItemLocationContent.Mode.Static -> stringResource(CommonStrings.common_shared_location)
             }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLocationView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLocationView.kt
index 1c35216c38..f00b6b0b5b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLocationView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemLocationView.kt
@@ -33,7 +33,6 @@ import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.location.api.StaticMapView
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemLocationContentProvider
-import io.element.android.features.messages.impl.timeline.model.event.ensureActiveLiveLocation
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
@@ -129,7 +128,6 @@ private fun LiveLocationOverlay(
                 } else {
                     stringResource(CommonStrings.common_live_location_ended)
                 },
-
                 style = ElementTheme.typography.fontBodySmMedium,
                 color = ElementTheme.colors.textPrimary,
             )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLocationContent.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLocationContent.kt
index 8fb4d50427..40af75c82c 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLocationContent.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/event/TimelineItemLocationContent.kt
@@ -88,7 +88,7 @@ data class TimelineItemLocationContent(
 internal fun TimelineItemLocationContent.ensureActiveLiveLocation(
     currentTimeMillis: () -> Long = System::currentTimeMillis,
 ): TimelineItemLocationContent {
-    return when (val mode = mode) {
+    return when (mode) {
         is TimelineItemLocationContent.Mode.Live -> {
             val isActive = rememberIsLiveLocationActive(mode, currentTimeMillis)
             copy(mode = mode.copy(isActive = isActive))
@@ -102,7 +102,6 @@ private fun rememberIsLiveLocationActive(
     mode: TimelineItemLocationContent.Mode.Live,
     currentTimeMillis: () -> Long,
 ): Boolean {
-
     fun TimelineItemLocationContent.Mode.Live.isActive(): Boolean {
         return isActive && endTimestamp > currentTimeMillis()
     }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/DefaultMessageSummaryFormatter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/DefaultMessageSummaryFormatter.kt
index a92dedae0f..c48f2dae40 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/DefaultMessageSummaryFormatter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/DefaultMessageSummaryFormatter.kt
@@ -41,7 +41,7 @@ class DefaultMessageSummaryFormatter(
             is TimelineItemTextBasedContent -> content.plainText
             is TimelineItemProfileChangeContent -> content.body
             is TimelineItemStateContent -> content.body
-            is TimelineItemLocationContent -> when(content.mode) {
+            is TimelineItemLocationContent -> when (content.mode) {
                 is TimelineItemLocationContent.Mode.Live -> context.getString(CommonStrings.common_shared_live_location)
                 is TimelineItemLocationContent.Mode.Static -> context.getString(CommonStrings.common_shared_location)
             }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt
index e6ef18d00d..fa837f1492 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactoryTest.kt
@@ -78,9 +78,7 @@ import org.robolectric.RobolectricTestRunner
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
 
-@Suppress("LargeClass")
-@RunWith(RobolectricTestRunner::class)
-class TimelineItemContentMessageFactoryTest {
+@Suppress("LargeClass") @RunWith(RobolectricTestRunner::class) class TimelineItemContentMessageFactoryTest {
     @Test
     fun `test create OtherMessageType`() = runTest {
         val sut = createTimelineItemContentMessageFactory()
@@ -164,16 +162,11 @@ class TimelineItemContentMessageFactoryTest {
             senderProfile = aProfileDetails(),
             eventId = AN_EVENT_ID,
         ) as TimelineItemTextContent
-        val expected = TimelineItemTextContent(
-            body = "https://www.example.org",
-            htmlDocument = null,
-            isEdited = false,
-            formattedBody = buildSpannedString {
-                inSpans(URLSpan("https://www.example.org")) {
-                    append("https://www.example.org")
-                }
+        val expected = TimelineItemTextContent(body = "https://www.example.org", htmlDocument = null, isEdited = false, formattedBody = buildSpannedString {
+            inSpans(URLSpan("https://www.example.org")) {
+                append("https://www.example.org")
             }
-        )
+        })
         assertThat(result.body).isEqualTo(expected.body)
         assertThat(result.htmlDocument).isEqualTo(expected.htmlDocument)
         assertThat(result.plainText).isEqualTo(expected.plainText)
@@ -198,9 +191,7 @@ class TimelineItemContentMessageFactoryTest {
                 append("and manually added link")
             }
         }.toSpannable()
-        val sut = createTimelineItemContentMessageFactory(
-            domConverterTransform = { expected }
-        )
+        val sut = createTimelineItemContentMessageFactory(domConverterTransform = { expected })
         val result = sut.create(
             content = createMessageContent(
                 type = TextMessageType(
@@ -217,9 +208,7 @@ class TimelineItemContentMessageFactoryTest {
 
     @Test
     fun `test create TextMessageType with unknown formatted body does nothing`() = runTest {
-        val sut = createTimelineItemContentMessageFactory(
-            htmlConverterTransform = { it }
-        )
+        val sut = createTimelineItemContentMessageFactory(htmlConverterTransform = { it })
         val result = sut.create(
             content = createMessageContent(
                 type = TextMessageType(
@@ -354,10 +343,10 @@ class TimelineItemContentMessageFactoryTest {
                     formattedCaption = null,
                     source = MediaSource("url"),
                     info = AudioInfo(
-                        duration = 1.minutes,
-                        size = 123L,
-                        mimetype = MimeTypes.Mp3,
-                    )
+                    duration = 1.minutes,
+                    size = 123L,
+                    mimetype = MimeTypes.Mp3,
+                )
                 ),
                 isEdited = true,
             ),
@@ -595,16 +584,16 @@ class TimelineItemContentMessageFactoryTest {
                     formattedCaption = null,
                     source = MediaSource("url"),
                     info = FileInfo(
-                        mimetype = MimeTypes.Pdf,
-                        size = 123L,
-                        thumbnailInfo = ThumbnailInfo(
-                            height = 10L,
-                            width = 5L,
-                            mimetype = MimeTypes.Jpeg,
-                            size = 111L,
-                        ),
-                        thumbnailSource = MediaSource("url_thumbnail"),
-                    )
+                    mimetype = MimeTypes.Pdf,
+                    size = 123L,
+                    thumbnailInfo = ThumbnailInfo(
+                        height = 10L,
+                        width = 5L,
+                        mimetype = MimeTypes.Jpeg,
+                        size = 111L,
+                    ),
+                    thumbnailSource = MediaSource("url_thumbnail"),
+                )
                 ),
                 isEdited = true,
             ),
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/LiveLocationSharesFlow.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/LiveLocationSharesFlow.kt
index 4f4ddac667..8922cd6627 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/LiveLocationSharesFlow.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/LiveLocationSharesFlow.kt
@@ -71,4 +71,3 @@ private fun RustLiveLocationShare.into(): LiveLocationShare {
         endTimestamp = (startTs + timeout).toLong()
     )
 }
-
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/TimedLiveLocationSharesFlow.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/TimedLiveLocationSharesFlow.kt
index 5a570d04d5..9bfddf280f 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/TimedLiveLocationSharesFlow.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/location/TimedLiveLocationSharesFlow.kt
@@ -52,5 +52,4 @@ internal fun Flow<List<LiveLocationShare>>.timedByExpiry(
         send(liveShares)
         reschedule(liveShares)
     }
-
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/location/TimedLiveLocationSharesFlowTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/location/TimedLiveLocationSharesFlowTest.kt
index 886b927b9a..6c78fcc51b 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/location/TimedLiveLocationSharesFlowTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/location/TimedLiveLocationSharesFlowTest.kt
@@ -12,9 +12,8 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.location.LiveLocationShare
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.advanceTimeBy
 import kotlinx.coroutines.test.runTest
@@ -22,7 +21,6 @@ import org.junit.Test
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class TimedLiveLocationSharesFlowTest {
-
     @Test
     fun `it keeps emitting shares for subsequent expiries without upstream changes`() = runTest {
         val shares = listOf(
diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/SemanticsNodeInteractionsProviderExtensions.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/SemanticsNodeInteractionsProviderExtensions.kt
index 5de2cf76da..d78f570a31 100644
--- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/SemanticsNodeInteractionsProviderExtensions.kt
+++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/SemanticsNodeInteractionsProviderExtensions.kt
@@ -66,5 +66,3 @@ fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.assertNodeWithTe
     val text = activity.getString(res)
     onNodeWithText(text).assertIsDisplayed()
 }
-
-