Move SessionData.toMatrixUser() extension to a common place, then use it across the codebase.

libraries/accountselect/impl/src/main/kotlin/io/element/android/libraries/accountselect/impl/AccountSelectPresenter.kt

@@ -13,8 +13,8 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.produceState
 import dev.zacsweers.metro.Inject
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.matrix.api.user.toMatrixUser
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -29,14 +29,7 @@ class AccountSelectPresenter(
         val accounts by produceState<ImmutableList<MatrixUser>>(persistentListOf()) {
             // Do not use sessionStore.sessionsFlow() to not make it change when an account is selected.
             value = sessionStore.getAllSessions()
-                .map {
-                    MatrixUser(
-                        userId = UserId(it.userId),
-                        displayName = it.userDisplayName,
-                        avatarUrl = it.userAvatarUrl,
-                        avatarThumbnail = it.userAvatarData,
-                    )
-                }
+                .map { it.toMatrixUser() }
                 .toImmutableList()
         }
 

libraries/matrix/api/build.gradle.kts

@@ -54,6 +54,7 @@ dependencies {
     implementation(projects.libraries.androidutils)
     implementation(projects.libraries.architecture)
     implementation(projects.services.analytics.api)
+    implementation(projects.libraries.sessionStorage.api)
 
     testCommonDependencies(libs)
     testImplementation(projects.libraries.matrix.test)

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/user/SessionDataExtensions.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.user
+
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.sessionstorage.api.SessionData
+
+/**
+ * Create a [MatrixUser] from the profile data stored locally for the session.
+ * The avatar thumbnail is used as a fallback when the avatar cannot be loaded,
+ * for instance for a session which is not the current one.
+ */
+fun SessionData.toMatrixUser() = MatrixUser(
+    userId = UserId(userId),
+    displayName = userDisplayName,
+    avatarUrl = userAvatarUrl,
+    avatarThumbnail = userAvatarData,
+)