Merge remote-tracking branch 'origin/develop' into feature/bma/mutliAccountNotification

2025-11-04 16:20:42 +01:00 · 2025-11-04 16:20:42 +01:00 · 1bba0d4dda
commit 1bba0d4dda
parent d968d5aff0 d6360e82e0
421 changed files with 4365 additions and 4190 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -53,7 +53,7 @@ jobs:
        run: ./gradlew :app:assembleGplayDebug app:assembleFDroidDebug -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
      - name: Upload debug APKs
        if: ${{ matrix.variant == 'debug' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: elementx-debug
          path: |
@ -61,7 +61,7 @@ jobs:
            app/build/outputs/apk/fdroid/debug/*-universal-debug.apk
      - name: Upload x86_64 APK for Maestro
        if: ${{ matrix.variant == 'debug' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: elementx-apk-maestro
          path: |
--- a/.github/workflows/build_enterprise.yml
+++ b/.github/workflows/build_enterprise.yml
@ -61,7 +61,7 @@ jobs:
        run: ./gradlew :app:assembleGplayDebug -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
      - name: Upload debug Enterprise APKs
        if: ${{ matrix.variant == 'debug' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: elementx-enterprise-debug
          path: |
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@ -20,7 +20,7 @@ jobs:
      - run: |
          npm install --save-dev @babel/plugin-transform-flow-strip-types
      - name: Danger
-        uses: danger/danger-js@bdccecb77e0144055fbaea9224f10cf8b1229b68 # 13.0.4
+        uses: danger/danger-js@67ed2c1f42fd2fc198cc3c14b43c8f83351f4fe9 # 13.0.5
        with:
          args: "--dangerfile ./tools/danger/dangerfile.js"
        env:
--- a/.github/workflows/maestro-local.yml
+++ b/.github/workflows/maestro-local.yml
@ -44,7 +44,7 @@ jobs:
          ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
          ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
      - name: Upload APK as artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: elementx-apk-maestro
          path: |
@ -69,7 +69,7 @@ jobs:
          # https://github.com/actions/checkout/issues/881
          ref: ${{ github.ref }}
      - name: Download APK artifact from previous job
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
        with:
          name: elementx-apk-maestro
      - name: Enable KVM group perms
@ -102,7 +102,7 @@ jobs:
          script: |
            .github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh app-gplay-x86_64-debug.apk
      - name: Upload test results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: test-results
          path: |
--- a/.github/workflows/nightlyReports.yml
+++ b/.github/workflows/nightlyReports.yml
@ -42,7 +42,7 @@ jobs:

      - name: ✅ Upload kover report
        if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: kover-results
          path: |
@ -74,7 +74,7 @@ jobs:
        run: ./gradlew dependencyCheckAnalyze $CI_GRADLE_ARG_PROPERTIES
      - name: Upload dependency analysis
        if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: dependency-analysis
          path: build/reports/dependency-check-report.html
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@ -97,7 +97,7 @@ jobs:
        run: ./gradlew :tests:konsist:testDebugUnitTest $CI_GRADLE_ARG_PROPERTIES --no-daemon
      - name: Upload reports
        if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: konsist-report
          path: |
@ -174,7 +174,7 @@ jobs:
        run: ./gradlew :app:lintGplayDebug :app:lintFdroidDebug lintDebug $CI_GRADLE_ARG_PROPERTIES --continue
      - name: Upload reports
        if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: linting-report
          path: |
@ -214,7 +214,7 @@ jobs:
        run: ./gradlew detekt $CI_GRADLE_ARG_PROPERTIES --no-daemon
      - name: Upload reports
        if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: detekt-report
          path: |
@ -254,7 +254,7 @@ jobs:
        run: ./gradlew ktlintCheck $CI_GRADLE_ARG_PROPERTIES
      - name: Upload reports
        if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: ktlint-report
          path: |
@ -317,7 +317,7 @@ jobs:
          # https://github.com/actions/checkout/issues/881
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
      - name: Download reports from previous jobs
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
      - name: Prepare Danger
        if: always()
        run: |
@ -326,7 +326,7 @@ jobs:
          yarn add danger-plugin-lint-report --dev
      - name: Danger lint
        if: always()
-        uses: danger/danger-js@bdccecb77e0144055fbaea9224f10cf8b1229b68 # 13.0.4
+        uses: danger/danger-js@67ed2c1f42fd2fc198cc3c14b43c8f83351f4fe9 # 13.0.5
        with:
          args: "--dangerfile ./tools/danger/dangerfile-lint.js"
        env:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -38,7 +38,7 @@ jobs:
          ELEMENT_CALL_RAGESHAKE_URL: ${{ secrets.ELEMENT_CALL_RAGESHAKE_URL }}
        run: ./gradlew bundleGplayRelease $CI_GRADLE_ARG_PROPERTIES
      - name: Upload bundle as artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: elementx-app-gplay-bundle-unsigned
          path: |
@ -74,7 +74,7 @@ jobs:
          ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
        run: ./gradlew bundleGplayRelease $CI_GRADLE_ARG_PROPERTIES
      - name: Upload bundle as artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: elementx-enterprise-app-gplay-bundle-unsigned
          path: |
@ -102,7 +102,7 @@ jobs:
          ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
        run: ./gradlew assembleFdroidRelease $CI_GRADLE_ARG_PROPERTIES
      - name: Upload apks as artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: elementx-app-fdroid-apks-unsigned
          path: |
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@ -61,7 +61,7 @@ jobs:

      - name: 🚫 Upload kover failed coverage reports
        if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: kover-error-report
          path: |
@ -73,7 +73,7 @@ jobs:

      - name: 🚫 Upload test results on error
        if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
        with:
          name: tests-and-screenshot-tests-results
          path: |
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,3 +1,12 @@
+Changes in Element X v25.11.0
+=============================
+
+Hotfix release.
+
+Includes https://github.com/element-hq/element-x-android/pull/5615, which fixes an issue that prevented Element Call notifications from being displayed sometimes.
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.10.1...v25.11.0
+
 Changes in Element X v25.10.1
 =============================

--- a/app/src/main/kotlin/io/element/android/x/di/RoomGraph.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/RoomGraph.kt
@ -9,13 +9,14 @@ package io.element.android.x.di

 import dev.zacsweers.metro.GraphExtension
 import dev.zacsweers.metro.Provides
+import io.element.android.appnav.di.TimelineBindings
 import io.element.android.libraries.architecture.NodeFactoriesBindings
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.JoinedRoom

@GraphExtension(RoomScope::class)
-interface RoomGraph : NodeFactoriesBindings {
+interface RoomGraph : NodeFactoriesBindings, TimelineBindings {
    @GraphExtension.Factory
    interface Factory {
        fun create(
--- a/appnav/build.gradle.kts
+++ b/appnav/build.gradle.kts
@ -59,6 +59,7 @@ dependencies {
    testImplementation(projects.libraries.preferences.test)
    testImplementation(projects.libraries.push.test)
    testImplementation(projects.libraries.pushproviders.test)
+    testImplementation(projects.features.forward.test)
    testImplementation(projects.features.networkmonitor.test)
    testImplementation(projects.features.rageshake.test)
    testImplementation(projects.services.appnavstate.test)
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInAppScopeFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInAppScopeFlowNode.kt
@ -21,13 +21,13 @@ import com.bumble.appyx.core.navigation.model.permanent.PermanentNavModel
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.node.ParentNode
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.appnav.di.SessionGraphFactory
 import io.element.android.libraries.architecture.NodeInputs
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.DependencyInjectionGraphOwner
@ -56,10 +56,12 @@ class LoggedInAppScopeFlowNode(
    plugins = plugins
 ), DependencyInjectionGraphOwner {
    interface Callback : Plugin {
-        fun onOpenBugReport()
-        fun onAddAccount()
+        fun navigateToBugReport()
+        fun navigateToAddAccount()
    }

+    private val callback: Callback = callback()
+
    @Parcelize
    object NavTarget : Parcelable

@ -81,12 +83,12 @@ class LoggedInAppScopeFlowNode(

    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
        val callback = object : LoggedInFlowNode.Callback {
-            override fun onOpenBugReport() {
-                plugins<Callback>().forEach { it.onOpenBugReport() }
+            override fun navigateToBugReport() {
+                callback.navigateToBugReport()
            }

-            override fun onAddAccount() {
-                plugins<Callback>().forEach { it.onAddAccount() }
+            override fun navigateToAddAccount() {
+                callback.navigateToAddAccount()
            }
        }
        return createNode<LoggedInFlowNode>(buildContext, listOf(callback))
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@ -24,7 +24,6 @@ import com.bumble.appyx.core.navigation.NavKey
 import com.bumble.appyx.core.navigation.model.permanent.PermanentNavModel
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.BackStack.State.ACTIVE
 import com.bumble.appyx.navmodel.backstack.BackStack.State.CREATED
@ -67,6 +66,7 @@ import io.element.android.features.userprofile.api.UserProfileEntryPoint
 import io.element.android.features.verifysession.api.IncomingVerificationEntryPoint
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.waitForChildAttached
 import io.element.android.libraries.architecture.waitForNavTargetAttached
@ -148,10 +148,11 @@ class LoggedInFlowNode(
    plugins = plugins
 ) {
    interface Callback : Plugin {
-        fun onOpenBugReport()
-        fun onAddAccount()
+        fun navigateToBugReport()
+        fun navigateToAddAccount()
    }

+    private val callback: Callback = callback()
    private val loggedInFlowProcessor = LoggedInEventProcessor(
        snackbarDispatcher = snackbarDispatcher,
        roomMembershipObserver = matrixClient.roomMembershipObserver,
@ -282,7 +283,7 @@ class LoggedInFlowNode(
        data object Ftue : NavTarget

        @Parcelize
-        data object RoomDirectorySearch : NavTarget
+        data object RoomDirectory : NavTarget

        @Parcelize
        data class IncomingShare(val intent: Intent) : NavTarget
@ -304,46 +305,47 @@ class LoggedInFlowNode(
            }
            NavTarget.Home -> {
                val callback = object : HomeEntryPoint.Callback {
-                    override fun onRoomClick(roomId: RoomId) {
+                    override fun navigateToRoom(roomId: RoomId) {
                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias()))
                    }

-                    override fun onSettingsClick() {
+                    override fun navigateToSettings() {
                        backstack.push(NavTarget.Settings())
                    }

-                    override fun onStartChatClick() {
+                    override fun navigateToCreateRoom() {
                        backstack.push(NavTarget.CreateRoom)
                    }

-                    override fun onSetUpRecoveryClick() {
+                    override fun navigateToSetUpRecovery() {
                        backstack.push(NavTarget.SecureBackup(initialElement = SecureBackupEntryPoint.InitialTarget.Root))
                    }

-                    override fun onSessionConfirmRecoveryKeyClick() {
+                    override fun navigateToEnterRecoveryKey() {
                        backstack.push(NavTarget.SecureBackup(initialElement = SecureBackupEntryPoint.InitialTarget.EnterRecoveryKey))
                    }

-                    override fun onRoomSettingsClick(roomId: RoomId) {
+                    override fun navigateToRoomSettings(roomId: RoomId) {
                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), initialElement = RoomNavigationTarget.Details))
                    }

-                    override fun onReportBugClick() {
-                        plugins<Callback>().forEach { it.onOpenBugReport() }
+                    override fun navigateToBugReport() {
+                        callback.navigateToBugReport()
                    }
                }
-                homeEntryPoint
-                    .nodeBuilder(this, buildContext)
-                    .callback(callback)
-                    .build()
+                homeEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = callback,
+                )
            }
            is NavTarget.Room -> {
                val joinedRoomCallback = object : JoinedRoomLoadedFlowNode.Callback {
-                    override fun onOpenRoom(roomId: RoomId, serverNames: List<String>) {
+                    override fun navigateToRoom(roomId: RoomId, serverNames: List<String>) {
                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), serverNames))
                    }

-                    override fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean) {
+                    override fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean) {
                        when (data) {
                            is PermalinkData.UserLink -> {
                                // Should not happen (handled by MessagesNode)
@ -369,7 +371,7 @@ class LoggedInFlowNode(
                        }
                    }

-                    override fun onOpenGlobalNotificationSettings() {
+                    override fun navigateToGlobalNotificationSettings() {
                        backstack.push(NavTarget.Settings(PreferencesEntryPoint.InitialTarget.NotificationSettings))
                    }
                }
@ -384,76 +386,85 @@ class LoggedInFlowNode(
            }
            is NavTarget.UserProfile -> {
                val callback = object : UserProfileEntryPoint.Callback {
-                    override fun onOpenRoom(roomId: RoomId) {
+                    override fun navigateToRoom(roomId: RoomId) {
                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias()))
                    }
                }
-                userProfileEntryPoint.nodeBuilder(this, buildContext)
-                    .params(UserProfileEntryPoint.Params(userId = navTarget.userId))
-                    .callback(callback)
-                    .build()
+                userProfileEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = UserProfileEntryPoint.Params(userId = navTarget.userId),
+                    callback = callback,
+                )
            }
            is NavTarget.Settings -> {
                val callback = object : PreferencesEntryPoint.Callback {
-                    override fun onAddAccount() {
-                        plugins<Callback>().forEach { it.onAddAccount() }
+                    override fun navigateToAddAccount() {
+                        callback.navigateToAddAccount()
                    }

-                    override fun onOpenBugReport() {
-                        plugins<Callback>().forEach { it.onOpenBugReport() }
+                    override fun navigateToBugReport() {
+                        callback.navigateToBugReport()
                    }

-                    override fun onSecureBackupClick() {
+                    override fun navigateToSecureBackup() {
                        backstack.push(NavTarget.SecureBackup())
                    }

-                    override fun onOpenRoomNotificationSettings(roomId: RoomId) {
+                    override fun navigateToRoomNotificationSettings(roomId: RoomId) {
                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), initialElement = RoomNavigationTarget.NotificationSettings))
                    }

-                    override fun navigateTo(roomId: RoomId, eventId: EventId) {
+                    override fun navigateToEvent(roomId: RoomId, eventId: EventId) {
                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), initialElement = RoomNavigationTarget.Root(eventId)))
                    }
                }
                val inputs = PreferencesEntryPoint.Params(navTarget.initialElement)
-                preferencesEntryPoint.nodeBuilder(this, buildContext)
-                    .params(inputs)
-                    .callback(callback)
-                    .build()
+                preferencesEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = inputs,
+                    callback = callback,
+                )
            }
            NavTarget.CreateRoom -> {
                val callback = object : StartChatEntryPoint.Callback {
-                    override fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>) {
+                    override fun onRoomCreated(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>) {
                        backstack.replace(NavTarget.Room(roomIdOrAlias = roomIdOrAlias, serverNames = serverNames))
                    }

-                    override fun onOpenRoomDirectory() {
-                        backstack.push(NavTarget.RoomDirectorySearch)
+                    override fun navigateToRoomDirectory() {
+                        backstack.push(NavTarget.RoomDirectory)
                    }
                }

-                startChatEntryPoint
-                    .nodeBuilder(this, buildContext)
-                    .callback(callback)
-                    .build()
+                startChatEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = callback,
+                )
            }
            is NavTarget.SecureBackup -> {
-                secureBackupEntryPoint.nodeBuilder(this, buildContext)
-                    .params(SecureBackupEntryPoint.Params(initialElement = navTarget.initialElement))
-                    .callback(object : SecureBackupEntryPoint.Callback {
+                secureBackupEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = SecureBackupEntryPoint.Params(initialElement = navTarget.initialElement),
+                    callback = object : SecureBackupEntryPoint.Callback {
                        override fun onDone() {
                            backstack.pop()
                        }
-                    })
-                    .build()
+                    },
+                )
            }
            NavTarget.Ftue -> {
                ftueEntryPoint.createNode(this, buildContext)
            }
-            NavTarget.RoomDirectorySearch -> {
-                roomDirectoryEntryPoint.nodeBuilder(this, buildContext)
-                    .callback(object : RoomDirectoryEntryPoint.Callback {
-                        override fun onResultClick(roomDescription: RoomDescription) {
+            NavTarget.RoomDirectory -> {
+                roomDirectoryEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = object : RoomDirectoryEntryPoint.Callback {
+                        override fun navigateToRoom(roomDescription: RoomDescription) {
                            backstack.push(
                                NavTarget.Room(
                                    roomIdOrAlias = roomDescription.roomId.toRoomIdOrAlias(),
@ -462,31 +473,35 @@ class LoggedInFlowNode(
                                )
                            )
                        }
-                    })
-                    .build()
+                    },
+                )
            }
            is NavTarget.IncomingShare -> {
-                shareEntryPoint.nodeBuilder(this, buildContext)
-                    .callback(object : ShareEntryPoint.Callback {
+                shareEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = ShareEntryPoint.Params(intent = navTarget.intent),
+                    callback = object : ShareEntryPoint.Callback {
                        override fun onDone(roomIds: List<RoomId>) {
                            navigateUp()
                            roomIds.singleOrNull()?.let { roomId ->
                                backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias()))
                            }
                        }
-                    })
-                    .params(ShareEntryPoint.Params(intent = navTarget.intent))
-                    .build()
+                    },
+                )
            }
            is NavTarget.IncomingVerificationRequest -> {
-                incomingVerificationEntryPoint.nodeBuilder(this, buildContext)
-                    .params(IncomingVerificationEntryPoint.Params(navTarget.data))
-                    .callback(object : IncomingVerificationEntryPoint.Callback {
+                incomingVerificationEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = IncomingVerificationEntryPoint.Params(navTarget.data),
+                    callback = object : IncomingVerificationEntryPoint.Callback {
                        override fun onDone() {
                            backstack.pop()
                        }
-                    })
-                    .build()
+                    },
+                )
            }
        }
    }
--- a/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
@ -18,7 +18,6 @@ import com.bumble.appyx.core.lifecycle.subscribe
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.Assisted
@ -29,6 +28,7 @@ import io.element.android.features.login.api.LoginParams
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.NodeInputs
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.designsystem.utils.ForceOrientationInMobileDevices
 import io.element.android.libraries.designsystem.utils.ScreenOrientation
@ -55,9 +55,10 @@ class NotLoggedInFlowNode(
    ) : NodeInputs

    interface Callback : Plugin {
-        fun onOpenBugReport()
+        fun navigateToBugReport()
    }

+    private val callback: Callback = callback()
    private val inputs = inputs<Params>()

    override fun onBuilt() {
@ -78,20 +79,19 @@ class NotLoggedInFlowNode(
        return when (navTarget) {
            NavTarget.Root -> {
                val callback = object : LoginEntryPoint.Callback {
-                    override fun onReportProblem() {
-                        plugins<Callback>().forEach { it.onOpenBugReport() }
+                    override fun navigateToBugReport() {
+                        callback.navigateToBugReport()
                    }
                }
-                loginEntryPoint
-                    .nodeBuilder(this, buildContext)
-                    .params(
-                        LoginEntryPoint.Params(
-                            accountProvider = inputs.loginParams?.accountProvider,
-                            loginHint = inputs.loginParams?.loginHint,
-                        )
-                    )
-                    .callback(callback)
-                    .build()
+                loginEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = LoginEntryPoint.Params(
+                        accountProvider = inputs.loginParams?.accountProvider,
+                        loginHint = inputs.loginParams?.loginHint,
+                    ),
+                    callback = callback,
+                )
            }
        }
    }
--- a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
@ -227,11 +227,11 @@ class RootFlowNode(
                    }
                val inputs = LoggedInAppScopeFlowNode.Inputs(matrixClient)
                val callback = object : LoggedInAppScopeFlowNode.Callback {
-                    override fun onOpenBugReport() {
+                    override fun navigateToBugReport() {
                        backstack.push(NavTarget.BugReport)
                    }

-                    override fun onAddAccount() {
+                    override fun navigateToAddAccount() {
                        backstack.push(NavTarget.NotLoggedInFlow(null))
                    }
                }
@ -239,7 +239,7 @@ class RootFlowNode(
            }
            is NavTarget.NotLoggedInFlow -> {
                val callback = object : NotLoggedInFlowNode.Callback {
-                    override fun onOpenBugReport() {
+                    override fun navigateToBugReport() {
                        backstack.push(NavTarget.BugReport)
                    }
                }
@ -249,11 +249,13 @@ class RootFlowNode(
                createNode<NotLoggedInFlowNode>(buildContext, plugins = listOf(params, callback))
            }
            is NavTarget.SignedOutFlow -> {
-                signedOutEntryPoint.nodeBuilder(this, buildContext).params(
-                    SignedOutEntryPoint.Params(
-                        sessionId = navTarget.sessionId
-                    )
-                ).build()
+                signedOutEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = SignedOutEntryPoint.Params(
+                        sessionId = navTarget.sessionId,
+                    ),
+                )
            }
            NavTarget.SplashScreen -> emptyNode(buildContext)
            NavTarget.BugReport -> {
@ -262,11 +264,15 @@ class RootFlowNode(
                        backstack.pop()
                    }
                }
-                bugReportEntryPoint.nodeBuilder(this, buildContext).callback(callback).build()
+                bugReportEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = callback,
+                )
            }
            is NavTarget.AccountSelect -> {
                val callback: AccountSelectEntryPoint.Callback = object : AccountSelectEntryPoint.Callback {
-                    override fun onSelectAccount(sessionId: SessionId) {
+                    override fun onAccountSelected(sessionId: SessionId) {
                        lifecycleScope.launch {
                            if (sessionId == navTarget.currentSessionId) {
                                // Ensure that the account selection Node is removed from the backstack
@ -287,7 +293,11 @@ class RootFlowNode(
                        backstack.pop()
                    }
                }
-                accountSelectEntryPoint.nodeBuilder(this, buildContext).callback(callback).build()
+                accountSelectEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    callback = callback,
+                )
            }
        }
    }
@ -339,7 +349,7 @@ class RootFlowNode(
        } else {
            // wait for the current session to be restored
            val loggedInFlowNode = attachSession(latestSessionId)
-            if (sessionStore.getAllSessions().size > 1) {
+            if (sessionStore.numberOfSessions() > 1) {
                // Several accounts, let the user choose which one to use
                backstack.push(
                    NavTarget.AccountSelect(
@ -369,7 +379,7 @@ class RootFlowNode(
                is PermalinkData.FallbackLink -> Unit
                is PermalinkData.RoomEmailInviteLink -> Unit
                else -> {
-                    if (sessionStore.getAllSessions().size > 1) {
+                    if (sessionStore.numberOfSessions() > 1) {
                        // Several accounts, let the user choose which one to use
                        backstack.push(
                            NavTarget.AccountSelect(
--- a/appnav/src/main/kotlin/io/element/android/appnav/di/TimelineBindings.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/di/TimelineBindings.kt
@ -0,0 +1,16 @@
+/*
+ * Copyright 2025 New Vector 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.appnav.di
+
+import io.element.android.features.messages.api.pinned.PinnedEventsTimelineProvider
+import io.element.android.libraries.matrix.api.timeline.TimelineProvider
+
+interface TimelineBindings {
+    val timelineProvider: TimelineProvider
+    val pinnedEventsTimelineProvider: PinnedEventsTimelineProvider
+}
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInNode.kt
@ -12,10 +12,10 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope

@ContributesNode(SessionScope::class)
@ -32,18 +32,14 @@ class LoggedInNode(
        fun navigateToNotificationTroubleshoot()
    }

-    private fun navigateToNotificationTroubleshoot() {
-        plugins<Callback>().forEach {
-            it.navigateToNotificationTroubleshoot()
-        }
-    }
+    private val callback: Callback = callback()

    @Composable
    override fun View(modifier: Modifier) {
        val loggedInState = loggedInPresenter.present()
        LoggedInView(
            state = loggedInState,
-            navigateToNotificationTroubleshoot = ::navigateToNotificationTroubleshoot,
+            navigateToNotificationTroubleshoot = callback::navigateToNotificationTroubleshoot,
            modifier = modifier
        )
    }
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
@ -180,10 +180,12 @@ class RoomFlowNode(
                    }
                }
                val params = Params(navTarget.roomAlias)
-                roomAliasResolverEntryPoint.nodeBuilder(this, buildContext)
-                    .callback(callback)
-                    .params(params)
-                    .build()
+                roomAliasResolverEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = params,
+                    callback = callback,
+                )
            }
            is NavTarget.JoinRoom -> {
                val inputs = JoinRoomEntryPoint.Inputs(
@ -193,7 +195,11 @@ class RoomFlowNode(
                    serverNames = navTarget.serverNames,
                    trigger = navTarget.trigger,
                )
-                joinRoomEntryPoint.createNode(this, buildContext, inputs)
+                joinRoomEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    inputs = inputs,
+                )
            }
            is NavTarget.JoinedRoom -> {
                val roomFlowNodeCallback = plugins<JoinedRoomLoadedFlowNode.Callback>()
@ -205,10 +211,12 @@ class RoomFlowNode(
            }
            is NavTarget.JoinedSpace -> {
                val spaceCallback = plugins<SpaceEntryPoint.Callback>().single()
-                spaceEntryPoint.nodeBuilder(this, buildContext)
-                    .inputs(SpaceEntryPoint.Inputs(roomId = navTarget.spaceId))
-                    .callback(spaceCallback)
-                    .build()
+                spaceEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    inputs = SpaceEntryPoint.Inputs(roomId = navTarget.spaceId),
+                    callback = spaceCallback,
+                )
            }
        }
    }
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
@ -22,15 +22,16 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.appnav.di.RoomGraphFactory
+import io.element.android.appnav.di.TimelineBindings
 import io.element.android.appnav.room.RoomNavigationTarget
 import io.element.android.features.forward.api.ForwardEntryPoint
 import io.element.android.features.messages.api.MessagesEntryPoint
-import io.element.android.features.messages.api.MessagesEntryPointNode
 import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint
 import io.element.android.features.space.api.SpaceEntryPoint
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.NodeInputs
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.architecture.waitForChildAttached
 import io.element.android.libraries.di.DependencyInjectionGraphOwner
@ -46,8 +47,6 @@ import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.services.appnavstate.api.ActiveRoomsHolder
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber
@ -76,9 +75,9 @@ class JoinedRoomLoadedFlowNode(
    plugins = plugins,
 ), DependencyInjectionGraphOwner {
    interface Callback : Plugin {
-        fun onOpenRoom(roomId: RoomId, serverNames: List<String>)
-        fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
-        fun onOpenGlobalNotificationSettings()
+        fun navigateToRoom(roomId: RoomId, serverNames: List<String>)
+        fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
+        fun navigateToGlobalNotificationSettings()
    }

    data class Inputs(
@ -87,7 +86,7 @@ class JoinedRoomLoadedFlowNode(
    ) : NodeInputs

    private val inputs: Inputs = inputs()
-    private val callbacks = plugins.filterIsInstance<Callback>()
+    private val callback: Callback = callback()
    override val graph = roomGraphFactory.create(inputs.room)

    init {
@ -123,26 +122,28 @@ class JoinedRoomLoadedFlowNode(

    private fun createRoomDetailsNode(buildContext: BuildContext, initialTarget: RoomDetailsEntryPoint.InitialTarget): Node {
        val callback = object : RoomDetailsEntryPoint.Callback {
-            override fun onOpenGlobalNotificationSettings() {
-                callbacks.forEach { it.onOpenGlobalNotificationSettings() }
+            override fun navigateToGlobalNotificationSettings() {
+                callback.navigateToGlobalNotificationSettings()
            }

-            override fun onOpenRoom(roomId: RoomId, serverNames: List<String>) {
-                callbacks.forEach { it.onOpenRoom(roomId, serverNames) }
+            override fun navigateToRoom(roomId: RoomId, serverNames: List<String>) {
+                callback.navigateToRoom(roomId, serverNames)
            }

-            override fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean) {
-                callbacks.forEach { it.onPermalinkClick(data, pushToBackstack) }
+            override fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean) {
+                callback.handlePermalinkClick(data, pushToBackstack)
            }

-            override fun forwardEvent(eventId: EventId) {
-                backstack.push(NavTarget.ForwardEvent(eventId))
+            override fun startForwardEventFlow(eventId: EventId, fromPinnedEvents: Boolean) {
+                backstack.push(NavTarget.ForwardEvent(eventId, fromPinnedEvents))
            }
        }
-        return roomDetailsEntryPoint.nodeBuilder(this, buildContext)
-            .params(RoomDetailsEntryPoint.Params(initialTarget))
-            .callback(callback)
-            .build()
+        return roomDetailsEntryPoint.createNode(
+            parentNode = this,
+            buildContext = buildContext,
+            params = RoomDetailsEntryPoint.Params(initialTarget),
+            callback = callback,
+        )
    }

    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
@ -166,42 +167,50 @@ class JoinedRoomLoadedFlowNode(
                createSpaceNode(buildContext)
            }
            is NavTarget.ForwardEvent -> {
-                val timelineProvider = { MutableStateFlow(inputs.room.liveTimeline).asStateFlow() }
+                val timelineProvider = if (navTarget.fromPinnedEvents) {
+                    (graph as TimelineBindings).pinnedEventsTimelineProvider
+                } else {
+                    (graph as TimelineBindings).timelineProvider
+                }
                val params = ForwardEntryPoint.Params(navTarget.eventId, timelineProvider)
                val callback = object : ForwardEntryPoint.Callback {
                    override fun onDone(roomIds: List<RoomId>) {
                        backstack.pop()
                        roomIds.singleOrNull()?.let { roomId ->
-                            callbacks.forEach { it.onOpenRoom(roomId, emptyList()) }
+                            callback.navigateToRoom(roomId, emptyList())
                        }
                    }
                }
-                forwardEntryPoint.nodeBuilder(this, buildContext)
-                    .params(params)
-                    .callback(callback)
-                    .build()
+                forwardEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = params,
+                    callback = callback,
+                )
            }
        }
    }

    private fun createSpaceNode(buildContext: BuildContext): Node {
        val callback = object : SpaceEntryPoint.Callback {
-            override fun onOpenRoom(roomId: RoomId, viaParameters: List<String>) {
-                callbacks.forEach { it.onOpenRoom(roomId, viaParameters) }
+            override fun navigateToRoom(roomId: RoomId, viaParameters: List<String>) {
+                callback.navigateToRoom(roomId, viaParameters)
            }

-            override fun onOpenDetails() {
+            override fun navigateToRoomDetails() {
                backstack.push(NavTarget.RoomDetails)
            }

-            override fun onOpenMemberList() {
+            override fun navigateToRoomMemberList() {
                backstack.push(NavTarget.RoomMemberList)
            }
        }
-        return spaceEntryPoint.nodeBuilder(this, buildContext)
-            .inputs(SpaceEntryPoint.Inputs(roomId = inputs.room.roomId))
-            .callback(callback)
-            .build()
+        return spaceEntryPoint.createNode(
+            parentNode = this,
+            buildContext = buildContext,
+            inputs = SpaceEntryPoint.Inputs(roomId = inputs.room.roomId),
+            callback = callback,
+        )
    }

    private fun createMessagesNode(
@ -209,33 +218,35 @@ class JoinedRoomLoadedFlowNode(
        navTarget: NavTarget.Messages,
    ): Node {
        val callback = object : MessagesEntryPoint.Callback {
-            override fun onRoomDetailsClick() {
+            override fun navigateToRoomDetails() {
                backstack.push(NavTarget.RoomDetails)
            }

-            override fun onUserDataClick(userId: UserId) {
+            override fun navigateToRoomMemberDetails(userId: UserId) {
                backstack.push(NavTarget.RoomMemberDetails(userId))
            }

-            override fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean) {
-                callbacks.forEach { it.onPermalinkClick(data, pushToBackstack) }
+            override fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean) {
+                callback.handlePermalinkClick(data, pushToBackstack)
            }

-            override fun forwardEvent(eventId: EventId) {
-                backstack.push(NavTarget.ForwardEvent(eventId))
+            override fun forwardEvent(eventId: EventId, fromPinnedEvents: Boolean) {
+                backstack.push(NavTarget.ForwardEvent(eventId, fromPinnedEvents))
            }

-            override fun openRoom(roomId: RoomId) {
-                callbacks.forEach { it.onOpenRoom(roomId, emptyList()) }
+            override fun navigateToRoom(roomId: RoomId) {
+                callback.navigateToRoom(roomId, emptyList())
            }
        }
        val params = MessagesEntryPoint.Params(
            MessagesEntryPoint.InitialTarget.Messages(navTarget.focusedEventId)
        )
-        return messagesEntryPoint.nodeBuilder(this, buildContext)
-            .params(params)
-            .callback(callback)
-            .build()
+        return messagesEntryPoint.createNode(
+            parentNode = this,
+            buildContext = buildContext,
+            params = params,
+            callback = callback,
+        )
    }

    sealed interface NavTarget : Parcelable {
@ -257,7 +268,7 @@ class JoinedRoomLoadedFlowNode(
        data class RoomMemberDetails(val userId: UserId) : NavTarget

        @Parcelize
-        data class ForwardEvent(val eventId: EventId) : NavTarget
+        data class ForwardEvent(val eventId: EventId, val fromPinnedEvents: Boolean) : NavTarget

        @Parcelize
        data object RoomNotificationSettings : NavTarget
@ -267,7 +278,7 @@ class JoinedRoomLoadedFlowNode(
        val messageNode = waitForChildAttached<Node, NavTarget> { navTarget ->
            navTarget is NavTarget.Messages
        }
-        (messageNode as? MessagesEntryPointNode)?.attachThread(threadId, focusedEventId)
+        (messageNode as? MessagesEntryPoint.NodeProxy)?.attachThread(threadId, focusedEventId)
    }

    @Composable
--- a/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt
@ -19,8 +19,10 @@ import com.bumble.appyx.testing.unit.common.helper.parentNodeTestHelper
 import com.google.common.truth.Truth.assertThat
 import io.element.android.appnav.di.RoomGraphFactory
 import io.element.android.appnav.room.RoomNavigationTarget
+import io.element.android.appnav.room.joined.FakeJoinedRoomLoadedFlowNodeCallback
 import io.element.android.appnav.room.joined.JoinedRoomLoadedFlowNode
 import io.element.android.features.forward.api.ForwardEntryPoint
+import io.element.android.features.forward.test.FakeForwardEntryPoint
 import io.element.android.features.messages.api.MessagesEntryPoint
 import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint
 import io.element.android.features.space.api.SpaceEntryPoint
@ -48,29 +50,20 @@ class JoinedRoomLoadedFlowNodeTest {
    @get:Rule
    val mainDispatcherRule = MainDispatcherRule()

-    private class FakeMessagesEntryPoint : MessagesEntryPoint, MessagesEntryPoint.NodeBuilder {
-        var buildContext: BuildContext? = null
+    private class FakeMessagesEntryPoint : MessagesEntryPoint {
        var nodeId: String? = null
        var parameters: MessagesEntryPoint.Params? = null
        var callback: MessagesEntryPoint.Callback? = null

-        override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): MessagesEntryPoint.NodeBuilder {
-            this.buildContext = buildContext
-            return this
-        }
-
-        override fun params(params: MessagesEntryPoint.Params): MessagesEntryPoint.NodeBuilder {
+        override fun createNode(
+            parentNode: Node,
+            buildContext: BuildContext,
+            params: MessagesEntryPoint.Params,
+            callback: MessagesEntryPoint.Callback,
+        ): Node {
            parameters = params
-            return this
-        }
-
-        override fun callback(callback: MessagesEntryPoint.Callback): MessagesEntryPoint.NodeBuilder {
            this.callback = callback
-            return this
-        }
-
-        override fun build(): Node {
-            return node(buildContext!!) {}.also {
+            return node(buildContext) {}.also {
                nodeId = it.id
            }
        }
@ -85,54 +78,26 @@ class JoinedRoomLoadedFlowNodeTest {
    private class FakeRoomDetailsEntryPoint : RoomDetailsEntryPoint {
        var nodeId: String? = null

-        override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): RoomDetailsEntryPoint.NodeBuilder {
-            return object : RoomDetailsEntryPoint.NodeBuilder {
-                override fun params(params: RoomDetailsEntryPoint.Params): RoomDetailsEntryPoint.NodeBuilder {
-                    return this
-                }
-
-                override fun callback(callback: RoomDetailsEntryPoint.Callback): RoomDetailsEntryPoint.NodeBuilder {
-                    return this
-                }
-
-                override fun build(): Node {
-                    return node(buildContext) {}.also {
-                        nodeId = it.id
-                    }
-                }
-            }
+        override fun createNode(
+            parentNode: Node,
+            buildContext: BuildContext,
+            params: RoomDetailsEntryPoint.Params,
+            callback: RoomDetailsEntryPoint.Callback,
+        ) = node(buildContext) {}.also {
+            nodeId = it.id
        }
    }

    private class FakeSpaceEntryPoint : SpaceEntryPoint {
        var nodeId: String? = null

-        override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): SpaceEntryPoint.NodeBuilder {
-            return object : SpaceEntryPoint.NodeBuilder {
-                override fun inputs(inputs: SpaceEntryPoint.Inputs): SpaceEntryPoint.NodeBuilder {
-                    return this
-                }
-
-                override fun callback(callback: SpaceEntryPoint.Callback): SpaceEntryPoint.NodeBuilder {
-                    return this
-                }
-
-                override fun build(): Node {
-                    return node(buildContext) {}.also {
-                        nodeId = it.id
-                    }
-                }
-            }
-        }
-    }
-
-    private class FakeForwardEntryPoint : ForwardEntryPoint {
-        override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): ForwardEntryPoint.NodeBuilder {
-            return object : ForwardEntryPoint.NodeBuilder {
-                override fun params(params: ForwardEntryPoint.Params) = this
-                override fun callback(callback: ForwardEntryPoint.Callback) = this
-                override fun build() = node(buildContext) {}
-            }
+        override fun createNode(
+            parentNode: Node,
+            buildContext: BuildContext,
+            inputs: SpaceEntryPoint.Inputs,
+            callback: SpaceEntryPoint.Callback,
+        ) = node(buildContext) {}.also {
+            nodeId = it.id
        }
    }

@ -165,7 +130,7 @@ class JoinedRoomLoadedFlowNodeTest {
        val fakeMessagesEntryPoint = FakeMessagesEntryPoint()
        val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Root())
        val roomFlowNode = createJoinedRoomLoadedFlowNode(
-            plugins = listOf(inputs),
+            plugins = listOf(inputs, FakeJoinedRoomLoadedFlowNodeCallback()),
            messagesEntryPoint = fakeMessagesEntryPoint,
        )
        // WHEN
@ -185,7 +150,7 @@ class JoinedRoomLoadedFlowNodeTest {
        val spaceEntryPoint = FakeSpaceEntryPoint()
        val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Root())
        val roomFlowNode = createJoinedRoomLoadedFlowNode(
-            plugins = listOf(inputs),
+            plugins = listOf(inputs, FakeJoinedRoomLoadedFlowNodeCallback()),
            spaceEntryPoint = spaceEntryPoint,
        )
        // WHEN
@ -206,13 +171,13 @@ class JoinedRoomLoadedFlowNodeTest {
        val fakeRoomDetailsEntryPoint = FakeRoomDetailsEntryPoint()
        val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Root())
        val roomFlowNode = createJoinedRoomLoadedFlowNode(
-            plugins = listOf(inputs),
+            plugins = listOf(inputs, FakeJoinedRoomLoadedFlowNodeCallback()),
            messagesEntryPoint = fakeMessagesEntryPoint,
            roomDetailsEntryPoint = fakeRoomDetailsEntryPoint,
        )
        val roomFlowNodeTestHelper = roomFlowNode.parentNodeTestHelper()
        // WHEN
-        fakeMessagesEntryPoint.callback?.onRoomDetailsClick()
+        fakeMessagesEntryPoint.callback?.navigateToRoomDetails()
        // THEN
        roomFlowNodeTestHelper.assertChildHasLifecycle(JoinedRoomLoadedFlowNode.NavTarget.RoomDetails, Lifecycle.State.CREATED)
        val roomDetailsNode = roomFlowNode.childNode(JoinedRoomLoadedFlowNode.NavTarget.RoomDetails)!!
@ -228,7 +193,7 @@ class JoinedRoomLoadedFlowNodeTest {
        val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Root())
        val activeRoomsHolder = ActiveRoomsHolder()
        val roomFlowNode = createJoinedRoomLoadedFlowNode(
-            plugins = listOf(inputs),
+            plugins = listOf(inputs, FakeJoinedRoomLoadedFlowNodeCallback()),
            messagesEntryPoint = fakeMessagesEntryPoint,
            roomDetailsEntryPoint = fakeRoomDetailsEntryPoint,
            activeRoomsHolder = activeRoomsHolder,
@ -253,7 +218,7 @@ class JoinedRoomLoadedFlowNodeTest {
            addRoom(room)
        }
        val roomFlowNode = createJoinedRoomLoadedFlowNode(
-            plugins = listOf(inputs),
+            plugins = listOf(inputs, FakeJoinedRoomLoadedFlowNodeCallback()),
            messagesEntryPoint = fakeMessagesEntryPoint,
            roomDetailsEntryPoint = fakeRoomDetailsEntryPoint,
            activeRoomsHolder = activeRoomsHolder,
--- a/appnav/src/test/kotlin/io/element/android/appnav/room/joined/FakeJoinedRoomLoadedFlowNodeCallback.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/room/joined/FakeJoinedRoomLoadedFlowNodeCallback.kt
@ -0,0 +1,18 @@
+/*
+ * Copyright 2025 New Vector 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.appnav.room.joined
+
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.permalink.PermalinkData
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeJoinedRoomLoadedFlowNodeCallback : JoinedRoomLoadedFlowNode.Callback {
+    override fun navigateToRoom(roomId: RoomId, serverNames: List<String>) = lambdaError()
+    override fun handlePermalinkClick(data: PermalinkData, pushToBackstack: Boolean) = lambdaError()
+    override fun navigateToGlobalNotificationSettings() = lambdaError()
+}
--- a/fastlane/metadata/android/en-US/changelogs/202511000.txt
+++ b/fastlane/metadata/android/en-US/changelogs/202511000.txt
@ -0,0 +1,2 @@
+Main changes in this version: fixes an issue that prevented Element Call notifications from being displayed sometimes.
+Full changelog: https://github.com/element-hq/element-x-android/releases
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt
@ -201,7 +201,7 @@ class CallScreenPresenter(
            userAgent = userAgent,
            isCallActive = isWidgetLoaded,
            isInWidgetMode = isInWidgetMode,
-            eventSink = { handleEvents(it) },
+            eventSink = ::handleEvents,
        )
    }

--- a/features/changeroommemberroles/api/src/main/kotlin/io/element/android/features/changeroommemberroles/api/ChangeRoomMemberRolesEntryPoint.kt
+++ b/features/changeroommemberroles/api/src/main/kotlin/io/element/android/features/changeroommemberroles/api/ChangeRoomMemberRolesEntryPoint.kt
@ -5,7 +5,7 @@
 * Please see LICENSE files in the repository root for full details.
 */

-package io.element.android.features.changeroommemberroes.api
+package io.element.android.features.changeroommemberroles.api

 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
@ -15,13 +15,12 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.JoinedRoom

 fun interface ChangeRoomMemberRolesEntryPoint : FeatureEntryPoint {
-    fun builder(parentNode: Node, buildContext: BuildContext): Builder
-
-    interface Builder {
-        fun room(room: JoinedRoom): Builder
-        fun listType(changeRoomMemberRolesListType: ChangeRoomMemberRolesListType): Builder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        room: JoinedRoom,
+        listType: ChangeRoomMemberRolesListType,
+    ): Node

    interface NodeProxy {
        val roomId: RoomId
--- a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesNode.kt
+++ b/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesNode.kt
@ -17,7 +17,7 @@ import com.bumble.appyx.core.plugin.Plugin
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesListType
+import io.element.android.features.changeroommemberroles.api.ChangeRoomMemberRolesListType
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.appyx.launchMolecule
 import io.element.android.libraries.architecture.inputs
--- a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRoomMemberRolesRootNode.kt
+++ b/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRoomMemberRolesRootNode.kt
@ -20,8 +20,8 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.appnav.di.RoomGraphFactory
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesEntryPoint
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesListType
+import io.element.android.features.changeroommemberroles.api.ChangeRoomMemberRolesEntryPoint
+import io.element.android.features.changeroommemberroles.api.ChangeRoomMemberRolesListType
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.inputs
--- a/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/DefaultChangeRoomMemberRolesEntyPoint.kt
+++ b/features/changeroommemberroles/impl/src/main/kotlin/io/element/android/features/changeroommemberroles/impl/DefaultChangeRoomMemberRolesEntyPoint.kt
@ -10,37 +10,25 @@ package io.element.android.features.changeroommemberroles.impl
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import dev.zacsweers.metro.ContributesBinding
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesEntryPoint
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesListType
+import io.element.android.features.changeroommemberroles.api.ChangeRoomMemberRolesEntryPoint
+import io.element.android.features.changeroommemberroles.api.ChangeRoomMemberRolesListType
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.room.JoinedRoom

@ContributesBinding(SessionScope::class)
 class DefaultChangeRoomMemberRolesEntyPoint : ChangeRoomMemberRolesEntryPoint {
-    override fun builder(parentNode: Node, buildContext: BuildContext): ChangeRoomMemberRolesEntryPoint.Builder {
-        return object : ChangeRoomMemberRolesEntryPoint.Builder {
-            private lateinit var changeRoomMemberRolesListType: ChangeRoomMemberRolesListType
-            private lateinit var room: JoinedRoom
-
-            override fun room(room: JoinedRoom): ChangeRoomMemberRolesEntryPoint.Builder {
-                this.room = room
-                return this
-            }
-
-            override fun listType(changeRoomMemberRolesListType: ChangeRoomMemberRolesListType): ChangeRoomMemberRolesEntryPoint.Builder {
-                this.changeRoomMemberRolesListType = changeRoomMemberRolesListType
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<ChangeRoomMemberRolesRootNode>(
-                    buildContext = buildContext,
-                    plugins = listOf(
-                        ChangeRoomMemberRolesRootNode.Inputs(joinedRoom = room, listType = changeRoomMemberRolesListType),
-                    )
-                )
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        room: JoinedRoom,
+        listType: ChangeRoomMemberRolesListType,
+    ): Node {
+        return parentNode.createNode<ChangeRoomMemberRolesRootNode>(
+            buildContext = buildContext,
+            plugins = listOf(
+                ChangeRoomMemberRolesRootNode.Inputs(joinedRoom = room, listType = listType),
+            )
+        )
    }
 }
--- a/features/changeroommemberroles/impl/src/main/res/values-de/translations.xml
+++ b/features/changeroommemberroles/impl/src/main/res/values-de/translations.xml
@ -33,7 +33,7 @@
  <string name="screen_room_change_role_section_users">"Mitglieder"</string>
  <string name="screen_room_change_role_unsaved_changes_description">"Du hast nicht gespeicherte Änderungen."</string>
  <string name="screen_room_change_role_unsaved_changes_title">"Änderungen speichern?"</string>
-  <string name="screen_room_member_list_banned_empty">"In diesem Chat gibt es keine gesperrten Nutzer."</string>
+  <string name="screen_room_member_list_banned_empty">"Es gibt keine gesperrten Nutzer."</string>
  <plurals name="screen_room_member_list_header_title">
    <item quantity="one">"%1$d Person"</item>
    <item quantity="other">"%1$d Personen"</item>
--- a/features/changeroommemberroles/impl/src/main/res/values-et/translations.xml
+++ b/features/changeroommemberroles/impl/src/main/res/values-et/translations.xml
@ -33,7 +33,7 @@
  <string name="screen_room_change_role_section_users">"Liikmed"</string>
  <string name="screen_room_change_role_unsaved_changes_description">"Sul on salvestamata muudatusi"</string>
  <string name="screen_room_change_role_unsaved_changes_title">"Kas salvestame muudatused?"</string>
-  <string name="screen_room_member_list_banned_empty">"Jututoas pole suhtluskeeluga kasutajaid"</string>
+  <string name="screen_room_member_list_banned_empty">"Suhtluskeeluga kasutajaid pole"</string>
  <plurals name="screen_room_member_list_header_title">
    <item quantity="one">"%1$d osaleja"</item>
    <item quantity="other">"%1$d osalejat"</item>
--- a/features/changeroommemberroles/impl/src/main/res/values-sk/translations.xml
+++ b/features/changeroommemberroles/impl/src/main/res/values-sk/translations.xml
@ -33,7 +33,7 @@
  <string name="screen_room_change_role_section_users">"Členovia"</string>
  <string name="screen_room_change_role_unsaved_changes_description">"Máte neuložené zmeny."</string>
  <string name="screen_room_change_role_unsaved_changes_title">"Uložiť zmeny?"</string>
-  <string name="screen_room_member_list_banned_empty">"V tejto miestnosti nie sú žiadni zakázaní používatelia."</string>
+  <string name="screen_room_member_list_banned_empty">"Neexistujú žiadni zablokovaní používatelia."</string>
  <plurals name="screen_room_member_list_header_title">
    <item quantity="one">"%1$d osoba"</item>
    <item quantity="few">"%1$d osoby"</item>
--- a/features/changeroommemberroles/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/changeroommemberroles/impl/src/main/res/values-zh-rTW/translations.xml
@ -33,7 +33,7 @@
  <string name="screen_room_change_role_section_users">"成員"</string>
  <string name="screen_room_change_role_unsaved_changes_description">"您有尚未儲存的變更"</string>
  <string name="screen_room_change_role_unsaved_changes_title">"是否儲存變更？"</string>
-  <string name="screen_room_member_list_banned_empty">"此聊天室沒有黑名單。"</string>
+  <string name="screen_room_member_list_banned_empty">"沒有被封鎖的使用者。"</string>
  <plurals name="screen_room_member_list_header_title">
    <item quantity="other">"%1$d 位夥伴"</item>
  </plurals>
--- a/features/changeroommemberroles/impl/src/main/res/values/localazy.xml
+++ b/features/changeroommemberroles/impl/src/main/res/values/localazy.xml
@ -33,7 +33,7 @@
  <string name="screen_room_change_role_section_users">"Members"</string>
  <string name="screen_room_change_role_unsaved_changes_description">"You have unsaved changes."</string>
  <string name="screen_room_change_role_unsaved_changes_title">"Save changes?"</string>
-  <string name="screen_room_member_list_banned_empty">"There are no banned users in this room."</string>
+  <string name="screen_room_member_list_banned_empty">"There are no banned users."</string>
  <plurals name="screen_room_member_list_header_title">
    <item quantity="one">"%1$d person"</item>
    <item quantity="other">"%1$d people"</item>
--- a/features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesNodeTest.kt
+++ b/features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/ChangeRolesNodeTest.kt
@ -8,7 +8,7 @@
 package io.element.android.features.changeroommemberroles.impl

 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesListType
+import io.element.android.features.changeroommemberroles.api.ChangeRoomMemberRolesListType
 import io.element.android.libraries.matrix.api.room.RoomMember
 import org.junit.Test

--- a/features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/DefaultChangeRoomMemberRolesEntyPointTest.kt
+++ b/features/changeroommemberroles/impl/src/test/kotlin/io/element/android/features/changeroommemberroles/impl/DefaultChangeRoomMemberRolesEntyPointTest.kt
@ -10,7 +10,7 @@ package io.element.android.features.changeroommemberroles.impl
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.bumble.appyx.core.modality.BuildContext
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesListType
+import io.element.android.features.changeroommemberroles.api.ChangeRoomMemberRolesListType
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.tests.testutils.node.TestParentNode
 import kotlinx.coroutines.test.runTest
@ -31,10 +31,12 @@ class DefaultChangeRoomMemberRolesEntyPointTest {
        }
        val room = FakeJoinedRoom()
        val listType = ChangeRoomMemberRolesListType.Admins
-        val result = entryPoint.builder(parentNode, BuildContext.root(null))
-            .room(FakeJoinedRoom())
-            .listType(listType)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            room = FakeJoinedRoom(),
+            listType = listType,
+        )
        assertThat(result).isInstanceOf(ChangeRoomMemberRolesRootNode::class.java)
        // Search for the Inputs plugin
        val input = result.plugins.filterIsInstance<ChangeRoomMemberRolesRootNode.Inputs>().single()
--- a/features/changeroommemberroles/test/build.gradle.kts
+++ b/features/changeroommemberroles/test/build.gradle.kts
@ -0,0 +1,21 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.changeroommemberroles.test"
+}
+
+dependencies {
+    implementation(projects.features.changeroommemberroles.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.tests.testutils)
+}
--- a/features/changeroommemberroles/test/src/main/kotlin/io/element/android/features/changeroommemberroles/test/FakeChangeRoomMemberRolesEntryPoint.kt
+++ b/features/changeroommemberroles/test/src/main/kotlin/io/element/android/features/changeroommemberroles/test/FakeChangeRoomMemberRolesEntryPoint.kt
@ -0,0 +1,26 @@
+/*
+ * Copyright 2025 New Vector 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.features.changeroommemberroles.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.changeroommemberroles.api.ChangeRoomMemberRolesEntryPoint
+import io.element.android.features.changeroommemberroles.api.ChangeRoomMemberRolesListType
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeChangeRoomMemberRolesEntryPoint : ChangeRoomMemberRolesEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        room: JoinedRoom,
+        listType: ChangeRoomMemberRolesListType,
+    ): Node {
+        lambdaError()
+    }
+}
--- a/features/createroom/api/src/main/kotlin/io/element/android/features/createroom/api/CreateRoomEntryPoint.kt
+++ b/features/createroom/api/src/main/kotlin/io/element/android/features/createroom/api/CreateRoomEntryPoint.kt
@ -14,12 +14,11 @@ import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomId

 interface CreateRoomEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: Callback,
+    ): Node

    interface Callback : Plugin {
        fun onRoomCreated(roomId: RoomId)
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt
@ -13,7 +13,6 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.replace
 import dev.zacsweers.metro.Assisted
@ -24,6 +23,7 @@ import io.element.android.features.createroom.impl.addpeople.AddPeopleNode
 import io.element.android.features.createroom.impl.configureroom.ConfigureRoomNode
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.RoomId
@ -42,9 +42,7 @@ class CreateRoomFlowNode(
    buildContext = buildContext,
    plugins = plugins
 ) {
-    private fun onRoomCreated(roomId: RoomId) {
-        plugins<CreateRoomEntryPoint.Callback>().forEach { it.onRoomCreated(roomId) }
-    }
+    private val callback: CreateRoomEntryPoint.Callback = callback()

    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
        return when (navTarget) {
@ -60,7 +58,7 @@ class CreateRoomFlowNode(
                val inputs = AddPeopleNode.Inputs(navTarget.roomId)
                val callback: AddPeopleNode.Callback = object : AddPeopleNode.Callback {
                    override fun onFinish() {
-                        onRoomCreated(navTarget.roomId)
+                        callback.onRoomCreated(navTarget.roomId)
                    }
                }
                createNode<AddPeopleNode>(buildContext, plugins = listOf(inputs, callback))
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPoint.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPoint.kt
@ -9,7 +9,6 @@ package io.element.android.features.createroom.impl

 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
-import com.bumble.appyx.core.plugin.Plugin
 import dev.zacsweers.metro.ContributesBinding
 import io.element.android.features.createroom.api.CreateRoomEntryPoint
 import io.element.android.libraries.architecture.createNode
@ -17,18 +16,11 @@ import io.element.android.libraries.di.SessionScope

@ContributesBinding(SessionScope::class)
 class DefaultCreateRoomEntryPoint : CreateRoomEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): CreateRoomEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : CreateRoomEntryPoint.NodeBuilder {
-            override fun callback(callback: CreateRoomEntryPoint.Callback): CreateRoomEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<CreateRoomFlowNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: CreateRoomEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<CreateRoomFlowNode>(buildContext, listOf(callback))
    }
 }
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleNode.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleNode.kt
@ -12,13 +12,13 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.invitepeople.api.InvitePeoplePresenter
 import io.element.android.features.invitepeople.api.InvitePeopleRenderer
 import io.element.android.libraries.architecture.NodeInputs
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.RoomId
@ -39,10 +39,7 @@ class AddPeopleNode(
        fun onFinish()
    }

-    private fun onFinish() {
-        plugins<Callback>().forEach { it.onFinish() }
-    }
-
+    private val callback: Callback = callback()
    private val roomId = inputs<Inputs>().roomId
    private val invitePeoplePresenter = invitePeoplePresenterFactory.create(
        joinedRoom = null,
@ -54,7 +51,7 @@ class AddPeopleNode(
        val state = invitePeoplePresenter.present()
        AddPeopleView(
            state = state,
-            onFinish = ::onFinish,
+            onFinish = callback::onFinish,
        ) {
            invitePeopleRenderer.Render(state, Modifier)
        }
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt
@ -13,11 +13,11 @@ import com.bumble.appyx.core.lifecycle.subscribe
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.MobileScreen
 import io.element.android.annotations.ContributesNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.services.analytics.api.AnalyticsService
@ -42,9 +42,7 @@ class ConfigureRoomNode(
        )
    }

-    private fun onCreateRoomSuccess(roomId: RoomId) {
-        plugins<Callback>().forEach { it.onCreateRoomSuccess(roomId) }
-    }
+    private val callback: Callback = callback()

    @Composable
    override fun View(modifier: Modifier) {
@ -53,7 +51,7 @@ class ConfigureRoomNode(
            state = state,
            modifier = modifier,
            onBackClick = this::navigateUp,
-            onCreateRoomSuccess = ::onCreateRoomSuccess,
+            onCreateRoomSuccess = callback::onCreateRoomSuccess,
        )
    }
 }
--- a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPointTest.kt
+++ b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPointTest.kt
@ -38,9 +38,11 @@ class DefaultCreateRoomEntryPointTest {
        val callback = object : CreateRoomEntryPoint.Callback {
            override fun onRoomCreated(roomId: RoomId) = lambdaError()
        }
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            callback = callback,
+        )
        assertThat(result.plugins).contains(callback)
    }
 }
--- a/features/createroom/test/build.gradle.kts
+++ b/features/createroom/test/build.gradle.kts
@ -0,0 +1,19 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.createroom.test"
+}
+
+dependencies {
+    implementation(projects.features.createroom.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.tests.testutils)
+}
--- a/features/createroom/test/src/main/kotlin/io/element/android/features/createroom/api/FakeCreateRoomEntryPoint.kt
+++ b/features/createroom/test/src/main/kotlin/io/element/android/features/createroom/api/FakeCreateRoomEntryPoint.kt
@ -0,0 +1,20 @@
+/*
+ * Copyright 2025 New Vector 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.features.createroom.api
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeCreateRoomEntryPoint : CreateRoomEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: CreateRoomEntryPoint.Callback,
+    ): Node = lambdaError()
+}
--- a/features/deactivation/test/build.gradle.kts
+++ b/features/deactivation/test/build.gradle.kts
@ -0,0 +1,19 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.deactivation.test"
+}
+
+dependencies {
+    implementation(projects.features.deactivation.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.tests.testutils)
+}
--- a/features/deactivation/test/src/main/kotlin/io/element/android/features/deactivation/test/FakeAccountDeactivationEntryPoint.kt
+++ b/features/deactivation/test/src/main/kotlin/io/element/android/features/deactivation/test/FakeAccountDeactivationEntryPoint.kt
@ -0,0 +1,22 @@
+/*
+ * Copyright 2025 New Vector 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.features.deactivation.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.deactivation.api.AccountDeactivationEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeAccountDeactivationEntryPoint : AccountDeactivationEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+    ): Node {
+        lambdaError()
+    }
+}
--- a/features/forward/api/src/main/kotlin/io/element/android/features/forward/api/ForwardEntryPoint.kt
+++ b/features/forward/api/src/main/kotlin/io/element/android/features/forward/api/ForwardEntryPoint.kt
@ -17,12 +17,6 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.timeline.TimelineProvider

 interface ForwardEntryPoint : FeatureEntryPoint {
-    interface NodeBuilder {
-        fun params(params: Params): NodeBuilder
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
-
    interface Callback : Plugin {
        fun onDone(roomIds: List<RoomId>)
    }
@ -32,5 +26,10 @@ interface ForwardEntryPoint : FeatureEntryPoint {
        val timelineProvider: TimelineProvider,
    ) : NodeInputs

-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+        callback: Callback,
+    ): Node
 }
--- a/features/forward/impl/build.gradle.kts
+++ b/features/forward/impl/build.gradle.kts
@ -31,8 +31,10 @@ dependencies {
    implementation(projects.libraries.designsystem)
    implementation(projects.libraries.matrix.api)
    implementation(projects.libraries.roomselect.api)
+    implementation(projects.libraries.uiStrings)

    testCommonDependencies(libs, true)
    testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.libraries.roomselect.test)
    testImplementation(projects.libraries.testtags)
 }
--- a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPoint.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPoint.kt
@ -9,7 +9,6 @@ package io.element.android.features.forward.impl

 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
-import com.bumble.appyx.core.plugin.Plugin
 import dev.zacsweers.metro.ContributesBinding
 import io.element.android.features.forward.api.ForwardEntryPoint
 import io.element.android.libraries.architecture.createNode
@ -17,26 +16,21 @@ import io.element.android.libraries.di.SessionScope

@ContributesBinding(SessionScope::class)
 class DefaultForwardEntryPoint : ForwardEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): ForwardEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : ForwardEntryPoint.NodeBuilder {
-            override fun params(params: ForwardEntryPoint.Params): ForwardEntryPoint.NodeBuilder {
-                plugins += ForwardMessagesNode.Inputs(
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: ForwardEntryPoint.Params,
+        callback: ForwardEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<ForwardMessagesNode>(
+            buildContext = buildContext,
+            plugins = listOf(
+                ForwardMessagesNode.Inputs(
                    eventId = params.eventId,
                    timelineProvider = params.timelineProvider,
-                )
-                return this
-            }
-
-            override fun callback(callback: ForwardEntryPoint.Callback): ForwardEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<ForwardMessagesNode>(buildContext, plugins)
-            }
-        }
+                ),
+                callback,
+            )
+        )
    }
 }
--- a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt
@ -22,6 +22,7 @@ import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.forward.api.ForwardEntryPoint
 import io.element.android.libraries.architecture.NodeInputs
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.EventId
@ -55,8 +56,8 @@ class ForwardMessagesNode(
    ) : NodeInputs

    private val inputs = inputs<Inputs>()
+    private val callback: ForwardEntryPoint.Callback = callback()
    private val presenter = presenterFactory.create(inputs.eventId.value, inputs.timelineProvider)
-    private val callbacks = plugins.filterIsInstance<ForwardEntryPoint.Callback>()

    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
        val callback = object : RoomSelectEntryPoint.Callback {
@ -65,14 +66,16 @@ class ForwardMessagesNode(
            }

            override fun onCancel() {
-                onForwardDone(emptyList())
+                callback.onDone(emptyList())
            }
        }

-        return roomSelectEntryPoint.nodeBuilder(this, buildContext)
-            .callback(callback)
-            .params(RoomSelectEntryPoint.Params(mode = RoomSelectMode.Forward))
-            .build()
+        return roomSelectEntryPoint.createNode(
+            parentNode = this,
+            buildContext = buildContext,
+            params = RoomSelectEntryPoint.Params(mode = RoomSelectMode.Forward),
+            callback = callback,
+        )
    }

    @Composable
@ -86,12 +89,8 @@ class ForwardMessagesNode(
            val state = presenter.present()
            ForwardMessagesView(
                state = state,
-                onForwardSuccess = ::onForwardDone,
+                onForwardSuccess = callback::onDone,
            )
        }
    }
-
-    private fun onForwardDone(roomIds: List<RoomId>) {
-        callbacks.forEach { it.onDone(roomIds) }
-    }
 }
--- a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenter.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenter.kt
@ -23,6 +23,7 @@ import io.element.android.libraries.matrix.api.timeline.TimelineProvider
 import io.element.android.libraries.matrix.api.timeline.getActiveTimeline
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import timber.log.Timber

@AssistedInject
 class ForwardMessagesPresenter(
@ -54,7 +55,7 @@ class ForwardMessagesPresenter(

        return ForwardMessagesState(
            forwardAction = forwardingActionState.value,
-            eventSink = { handleEvents(it) }
+            eventSink = ::handleEvents,
        )
    }

@ -63,7 +64,11 @@ class ForwardMessagesPresenter(
        roomIds: List<RoomId>,
    ) = launch {
        suspend {
-            timelineProvider.getActiveTimeline().forwardEvent(eventId, roomIds).getOrThrow()
+            timelineProvider.getActiveTimeline().forwardEvent(eventId, roomIds)
+                .onFailure {
+                    Timber.e(it, "Error while forwarding event")
+                }
+                .getOrThrow()
            roomIds
        }.runCatchingUpdatingState(forwardingActionState)
    }
--- a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesView.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesView.kt
@ -8,11 +8,13 @@
 package io.element.android.features.forward.impl

 import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.ui.strings.CommonStrings

@Composable
 fun ForwardMessagesView(
@ -24,6 +26,9 @@ fun ForwardMessagesView(
        onSuccess = {
            onForwardSuccess(it)
        },
+        errorMessage = {
+            stringResource(id = CommonStrings.error_unknown)
+        },
        onErrorDismiss = {
            state.eventSink(ForwardMessagesEvents.ClearError)
        },
--- a/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPointTest.kt
+++ b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPointTest.kt
@ -9,14 +9,13 @@ package io.element.android.features.forward.impl

 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.forward.api.ForwardEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.timeline.FakeTimelineProvider
-import io.element.android.libraries.roomselect.api.RoomSelectEntryPoint
+import io.element.android.libraries.roomselect.test.FakeRoomSelectEntryPoint
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
 import kotlinx.coroutines.test.runTest
@ -38,11 +37,7 @@ class DefaultForwardEntryPointTest {
                buildContext = buildContext,
                plugins = plugins,
                presenterFactory = { _, _ -> createForwardMessagesPresenter() },
-                roomSelectEntryPoint = object : RoomSelectEntryPoint {
-                    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): RoomSelectEntryPoint.NodeBuilder {
-                        lambdaError()
-                    }
-                }
+                roomSelectEntryPoint = FakeRoomSelectEntryPoint(),
            )
        }
        val callback = object : ForwardEntryPoint.Callback {
@ -52,10 +47,12 @@ class DefaultForwardEntryPointTest {
            eventId = AN_EVENT_ID,
            timelineProvider = FakeTimelineProvider(),
        )
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .params(params)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            params = params,
+            callback = callback,
+        )
        assertThat(result).isInstanceOf(ForwardMessagesNode::class.java)
        assertThat(result.plugins).contains(
            ForwardMessagesNode.Inputs(
--- a/features/forward/test/build.gradle.kts
+++ b/features/forward/test/build.gradle.kts
@ -0,0 +1,20 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.forward.test"
+}
+
+dependencies {
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.features.forward.api)
+    implementation(projects.tests.testutils)
+}
--- a/features/forward/test/src/main/kotlin/io/element/android/features/forward/test/FakeForwardEntryPoint.kt
+++ b/features/forward/test/src/main/kotlin/io/element/android/features/forward/test/FakeForwardEntryPoint.kt
@ -0,0 +1,22 @@
+/*
+ * Copyright 2025 New Vector 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.features.forward.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.forward.api.ForwardEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeForwardEntryPoint : ForwardEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: ForwardEntryPoint.Params,
+        callback: ForwardEntryPoint.Callback,
+    ): Node = lambdaError()
+}
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/FtueFlowNode.kt
@ -110,9 +110,12 @@ class FtueFlowNode(
                        defaultFtueService.updateFtueStep()
                    }
                }
-                lockScreenEntryPoint.nodeBuilder(this, buildContext, LockScreenEntryPoint.Target.Setup)
-                    .callback(callback)
-                    .build()
+                lockScreenEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    navTarget = LockScreenEntryPoint.Target.Setup,
+                    callback = callback,
+                )
            }
        }
    }
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/FtueSessionVerificationFlowNode.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/FtueSessionVerificationFlowNode.kt
@ -15,7 +15,6 @@ import androidx.lifecycle.lifecycleScope
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.newRoot
 import com.bumble.appyx.navmodel.backstack.operation.pop
@ -29,6 +28,7 @@ import io.element.android.features.securebackup.api.SecureBackupEntryPoint
 import io.element.android.features.verifysession.api.OutgoingVerificationEntryPoint
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.designsystem.utils.OpenUrlInTabView
 import io.element.android.libraries.di.SessionScope
@ -69,6 +69,8 @@ class FtueSessionVerificationFlowNode(
        fun onDone()
    }

+    private val callback: Callback = callback()
+
    private val secureBackupEntryPointCallback = object : SecureBackupEntryPoint.Callback {
        override fun onDone() {
            lifecycleScope.launch {
@ -82,62 +84,67 @@ class FtueSessionVerificationFlowNode(
        return when (navTarget) {
            is NavTarget.Root -> {
                val callback = object : ChooseSelfVerificationModeNode.Callback {
-                    override fun onUseAnotherDevice() {
+                    override fun navigateToUseAnotherDevice() {
                        backstack.push(NavTarget.UseAnotherDevice)
                    }

-                    override fun onUseRecoveryKey() {
+                    override fun navigateToUseRecoveryKey() {
                        backstack.push(NavTarget.EnterRecoveryKey)
                    }

-                    override fun onResetKey() {
+                    override fun navigateToResetKey() {
                        backstack.push(NavTarget.ResetIdentity)
                    }

-                    override fun onLearnMoreAboutEncryption() {
+                    override fun navigateToLearnMoreAboutEncryption() {
                        learnMoreUrl.value = LearnMoreConfig.DEVICE_VERIFICATION_URL
                    }
                }
-
                createNode<ChooseSelfVerificationModeNode>(buildContext, plugins = listOf(callback))
            }
            is NavTarget.UseAnotherDevice -> {
-                outgoingVerificationEntryPoint.nodeBuilder(this, buildContext)
-                    .params(OutgoingVerificationEntryPoint.Params(
+                outgoingVerificationEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = OutgoingVerificationEntryPoint.Params(
                        showDeviceVerifiedScreen = true,
                        verificationRequest = VerificationRequest.Outgoing.CurrentSession,
-                    ))
-                    .callback(object : OutgoingVerificationEntryPoint.Callback {
+                    ),
+                    callback = object : OutgoingVerificationEntryPoint.Callback {
                        override fun onDone() {
-                            plugins<Callback>().forEach { it.onDone() }
+                            callback.onDone()
                        }

                        override fun onBack() {
                            backstack.pop()
                        }

-                        override fun onLearnMoreAboutEncryption() {
+                        override fun navigateToLearnMoreAboutEncryption() {
                            // Note that this callback is never called. The "Learn more" link is not displayed
                            // for the self session interactive verification.
                        }
-                    })
-                    .build()
+                    }
+                )
            }
            is NavTarget.EnterRecoveryKey -> {
-                secureBackupEntryPoint.nodeBuilder(this, buildContext)
-                    .params(SecureBackupEntryPoint.Params(SecureBackupEntryPoint.InitialTarget.EnterRecoveryKey))
-                    .callback(secureBackupEntryPointCallback)
-                    .build()
+                secureBackupEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = SecureBackupEntryPoint.Params(SecureBackupEntryPoint.InitialTarget.EnterRecoveryKey),
+                    callback = secureBackupEntryPointCallback
+                )
            }
            is NavTarget.ResetIdentity -> {
-                secureBackupEntryPoint.nodeBuilder(this, buildContext)
-                    .params(SecureBackupEntryPoint.Params(SecureBackupEntryPoint.InitialTarget.ResetIdentity))
-                    .callback(object : SecureBackupEntryPoint.Callback {
+                secureBackupEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    params = SecureBackupEntryPoint.Params(SecureBackupEntryPoint.InitialTarget.ResetIdentity),
+                    callback = object : SecureBackupEntryPoint.Callback {
                        override fun onDone() {
-                            plugins<Callback>().forEach { it.onDone() }
+                            callback.onDone()
                        }
-                    })
-                    .build()
+                    },
+                )
            }
        }
    }
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeNode.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/sessionverification/choosemode/ChooseSelfVerificationModeNode.kt
@ -12,12 +12,12 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.logout.api.direct.DirectLogoutView
 import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope

@ContributesNode(SessionScope::class)
@ -29,13 +29,13 @@ class ChooseSelfVerificationModeNode(
    private val directLogoutView: DirectLogoutView,
 ) : Node(buildContext, plugins = plugins) {
    interface Callback : Plugin {
-        fun onUseAnotherDevice()
-        fun onUseRecoveryKey()
-        fun onResetKey()
-        fun onLearnMoreAboutEncryption()
+        fun navigateToUseAnotherDevice()
+        fun navigateToUseRecoveryKey()
+        fun navigateToResetKey()
+        fun navigateToLearnMoreAboutEncryption()
    }

-    private val callback = plugins<Callback>().first()
+    private val callback: Callback = callback()

    @Composable
    override fun View(modifier: Modifier) {
@ -43,10 +43,10 @@ class ChooseSelfVerificationModeNode(

        ChooseSelfVerificationModeView(
            state = state,
-            onUseAnotherDevice = callback::onUseAnotherDevice,
-            onUseRecoveryKey = callback::onUseRecoveryKey,
-            onResetKey = callback::onResetKey,
-            onLearnMore = callback::onLearnMoreAboutEncryption,
+            onUseAnotherDevice = callback::navigateToUseAnotherDevice,
+            onUseRecoveryKey = callback::navigateToUseRecoveryKey,
+            onResetKey = callback::navigateToResetKey,
+            onLearnMore = callback::navigateToLearnMoreAboutEncryption,
            modifier = modifier,
        )

--- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPointTest.kt
+++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPointTest.kt
@ -7,13 +7,11 @@

 package io.element.android.features.ftue.impl

-import android.content.Context
-import android.content.Intent
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.lockscreen.api.LockScreenEntryPoint
+import io.element.android.features.lockscreen.test.FakeLockScreenEntryPoint
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.node.TestParentNode
 import kotlinx.coroutines.test.runTest
@ -36,19 +34,7 @@ class DefaultFtueEntryPointTest {
                plugins = plugins,
                analyticsEntryPoint = { _, _ -> lambdaError() },
                defaultFtueService = createDefaultFtueService(),
-                lockScreenEntryPoint = object : LockScreenEntryPoint {
-                    override fun nodeBuilder(
-                        parentNode: com.bumble.appyx.core.node.Node,
-                        buildContext: BuildContext,
-                        navTarget: LockScreenEntryPoint.Target
-                    ): LockScreenEntryPoint.NodeBuilder {
-                        lambdaError()
-                    }
-
-                    override fun pinUnlockIntent(context: Context): Intent {
-                        lambdaError()
-                    }
-                },
+                lockScreenEntryPoint = FakeLockScreenEntryPoint(),
            )
        }
        val result = entryPoint.createNode(parentNode, BuildContext.root(null))
--- a/features/home/api/src/main/kotlin/io/element/android/features/home/api/HomeEntryPoint.kt
+++ b/features/home/api/src/main/kotlin/io/element/android/features/home/api/HomeEntryPoint.kt
@ -14,19 +14,19 @@ import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.matrix.api.core.RoomId

 interface HomeEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: Callback,
+    ): Node

    interface Callback : Plugin {
-        fun onRoomClick(roomId: RoomId)
-        fun onStartChatClick()
-        fun onSettingsClick()
-        fun onSetUpRecoveryClick()
-        fun onSessionConfirmRecoveryKeyClick()
-        fun onRoomSettingsClick(roomId: RoomId)
-        fun onReportBugClick()
+        fun navigateToRoom(roomId: RoomId)
+        fun navigateToCreateRoom()
+        fun navigateToSettings()
+        fun navigateToSetUpRecovery()
+        fun navigateToEnterRecoveryKey()
+        fun navigateToRoomSettings(roomId: RoomId)
+        fun navigateToBugReport()
    }
 }
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPoint.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPoint.kt
@ -9,7 +9,6 @@ package io.element.android.features.home.impl

 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
-import com.bumble.appyx.core.plugin.Plugin
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import io.element.android.features.home.api.HomeEntryPoint
@ -17,18 +16,11 @@ import io.element.android.libraries.architecture.createNode

@ContributesBinding(AppScope::class)
 class DefaultHomeEntryPoint : HomeEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): HomeEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : HomeEntryPoint.NodeBuilder {
-            override fun callback(callback: HomeEntryPoint.Callback): HomeEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<HomeFlowNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        callback: HomeEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<HomeFlowNode>(buildContext, listOf(callback))
    }
 }
--- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeFlowNode.kt
+++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/HomeFlowNode.kt
@ -21,7 +21,6 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.node.node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
@ -29,8 +28,8 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.MobileScreen
 import io.element.android.annotations.ContributesNode
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesEntryPoint
-import io.element.android.features.changeroommemberroes.api.ChangeRoomMemberRolesListType
+import io.element.android.features.changeroommemberroles.api.ChangeRoomMemberRolesEntryPoint
+import io.element.android.features.changeroommemberroles.api.ChangeRoomMemberRolesListType
 import io.element.android.features.home.api.HomeEntryPoint
 import io.element.android.features.home.impl.components.RoomListMenuAction
 import io.element.android.features.home.impl.model.RoomListRoomSummary
@ -44,6 +43,7 @@ import io.element.android.features.reportroom.api.ReportRoomEntryPoint
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.appyx.launchMolecule
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.deeplink.api.usecase.InviteFriendsUseCase
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
@ -78,6 +78,7 @@ class HomeFlowNode(
    buildContext = buildContext,
    plugins = plugins
 ) {
+    private val callback: HomeEntryPoint.Callback = callback()
    private val stateFlow = launchMolecule { presenter.present() }

    override fun onBuilt() {
@ -115,35 +116,11 @@ class HomeFlowNode(
        data class SelectNewOwnersWhenLeavingRoom(val roomId: RoomId) : NavTarget
    }

-    private fun onRoomClick(roomId: RoomId) {
-        plugins<HomeEntryPoint.Callback>().forEach { it.onRoomClick(roomId) }
-    }
-
-    private fun onOpenSettings() {
-        plugins<HomeEntryPoint.Callback>().forEach { it.onSettingsClick() }
-    }
-
-    private fun onStartChatClick() {
-        plugins<HomeEntryPoint.Callback>().forEach { it.onStartChatClick() }
-    }
-
-    private fun onSetUpRecoveryClick() {
-        plugins<HomeEntryPoint.Callback>().forEach { it.onSetUpRecoveryClick() }
-    }
-
-    private fun onSessionConfirmRecoveryKeyClick() {
-        plugins<HomeEntryPoint.Callback>().forEach { it.onSessionConfirmRecoveryKeyClick() }
-    }
-
-    private fun onRoomSettingsClick(roomId: RoomId) {
-        plugins<HomeEntryPoint.Callback>().forEach { it.onRoomSettingsClick(roomId) }
-    }
-
-    private fun onReportRoomClick(roomId: RoomId) {
+    private fun navigateToReportRoom(roomId: RoomId) {
        backstack.push(NavTarget.ReportRoom(roomId))
    }

-    private fun onDeclineInviteAndBlockUserClick(roomSummary: RoomListRoomSummary) {
+    private fun navigateToDeclineInviteAndBlockUser(roomSummary: RoomListRoomSummary) {
        backstack.push(NavTarget.DeclineInviteAndBlockUser(roomSummary.toInviteData()))
    }

@ -153,12 +130,12 @@ class HomeFlowNode(
                inviteFriendsUseCase.execute(activity)
            }
            RoomListMenuAction.ReportBug -> {
-                plugins<HomeEntryPoint.Callback>().forEach { it.onReportBugClick() }
+                callback.navigateToBugReport()
            }
        }
    }

-    private fun onSelectNewOwnersWhenLeavingRoom(roomId: RoomId) {
+    private fun navigateToSelectNewOwnersWhenLeavingRoom(roomId: RoomId) {
        backstack.push(NavTarget.SelectNewOwnersWhenLeavingRoom(roomId))
    }

@ -172,20 +149,20 @@ class HomeFlowNode(
            val activity = requireNotNull(LocalActivity.current)
            HomeView(
                homeState = state,
-                onRoomClick = this::onRoomClick,
-                onSettingsClick = this::onOpenSettings,
-                onStartChatClick = this::onStartChatClick,
-                onSetUpRecoveryClick = this::onSetUpRecoveryClick,
-                onConfirmRecoveryKeyClick = this::onSessionConfirmRecoveryKeyClick,
-                onRoomSettingsClick = this::onRoomSettingsClick,
+                onRoomClick = callback::navigateToRoom,
+                onSettingsClick = callback::navigateToSettings,
+                onStartChatClick = callback::navigateToCreateRoom,
+                onSetUpRecoveryClick = callback::navigateToSetUpRecovery,
+                onConfirmRecoveryKeyClick = callback::navigateToEnterRecoveryKey,
+                onRoomSettingsClick = callback::navigateToRoomSettings,
                onMenuActionClick = { onMenuActionClick(activity, it) },
-                onReportRoomClick = this::onReportRoomClick,
-                onDeclineInviteAndBlockUser = this::onDeclineInviteAndBlockUserClick,
+                onReportRoomClick = ::navigateToReportRoom,
+                onDeclineInviteAndBlockUser = ::navigateToDeclineInviteAndBlockUser,
                modifier = modifier,
                acceptDeclineInviteView = {
                    acceptDeclineInviteView.Render(
                        state = state.roomListState.acceptDeclineInviteState,
-                        onAcceptInviteSuccess = this::onRoomClick,
+                        onAcceptInviteSuccess = callback::navigateToRoom,
                        onDeclineInviteSuccess = { },
                        modifier = Modifier
                    )
@ -193,7 +170,7 @@ class HomeFlowNode(
                leaveRoomView = {
                    leaveRoomRenderer.Render(
                        state = state.roomListState.leaveRoomState,
-                        onSelectNewOwners = this::onSelectNewOwnersWhenLeavingRoom,
+                        onSelectNewOwners = ::navigateToSelectNewOwnersWhenLeavingRoom,
                        modifier = Modifier
                    )
                }
@ -209,14 +186,28 @@ class HomeFlowNode(

    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
        return when (navTarget) {
-            is NavTarget.ReportRoom -> reportRoomEntryPoint.createNode(this, buildContext, navTarget.roomId)
-            is NavTarget.DeclineInviteAndBlockUser -> declineInviteAndBlockUserEntryPoint.createNode(this, buildContext, navTarget.inviteData)
+            is NavTarget.ReportRoom -> {
+                reportRoomEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    roomId = navTarget.roomId,
+                )
+            }
+            is NavTarget.DeclineInviteAndBlockUser -> {
+                declineInviteAndBlockUserEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    inviteData = navTarget.inviteData,
+                )
+            }
            is NavTarget.SelectNewOwnersWhenLeavingRoom -> {
                val room = runBlocking { matrixClient.getJoinedRoom(navTarget.roomId) } ?: error("Room ${navTarget.roomId} not found")
-                changeRoomMemberRolesEntryPoint.builder(this, buildContext)
-                    .room(room)
-                    .listType(ChangeRoomMemberRolesListType.SelectNewOwnersWhenLeaving)
-                    .build()
+                changeRoomMemberRolesEntryPoint.createNode(
+                    parentNode = this,
+                    buildContext = buildContext,
+                    room = room,
+                    listType = ChangeRoomMemberRolesListType.SelectNewOwnersWhenLeaving,
+                )
            }
            NavTarget.Root -> rootNode(buildContext)
        }
--- a/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPointTest.kt
+++ b/features/home/impl/src/test/kotlin/io/element/android/features/home/impl/DefaultHomeEntryPointTest.kt
@ -36,22 +36,24 @@ class DefaultHomeEntryPointTest {
                directLogoutView = { _ -> lambdaError() },
                reportRoomEntryPoint = { _, _, _ -> lambdaError() },
                declineInviteAndBlockUserEntryPoint = { _, _, _ -> lambdaError() },
-                changeRoomMemberRolesEntryPoint = { _, _ -> lambdaError() },
+                changeRoomMemberRolesEntryPoint = { _, _, _, _ -> lambdaError() },
                leaveRoomRenderer = { _, _, _ -> lambdaError() },
            )
        }
        val callback = object : HomeEntryPoint.Callback {
-            override fun onRoomClick(roomId: RoomId) = lambdaError()
-            override fun onStartChatClick() = lambdaError()
-            override fun onSettingsClick() = lambdaError()
-            override fun onSetUpRecoveryClick() = lambdaError()
-            override fun onSessionConfirmRecoveryKeyClick() = lambdaError()
-            override fun onRoomSettingsClick(roomId: RoomId) = lambdaError()
-            override fun onReportBugClick() = lambdaError()
+            override fun navigateToRoom(roomId: RoomId) = lambdaError()
+            override fun navigateToCreateRoom() = lambdaError()
+            override fun navigateToSettings() = lambdaError()
+            override fun navigateToSetUpRecovery() = lambdaError()
+            override fun navigateToEnterRecoveryKey() = lambdaError()
+            override fun navigateToRoomSettings(roomId: RoomId) = lambdaError()
+            override fun navigateToBugReport() = lambdaError()
        }
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            callback = callback,
+        )
        assertThat(result).isInstanceOf(HomeFlowNode::class.java)
        assertThat(result.plugins).contains(callback)
    }
--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/declineandblock/DeclineInviteAndBlockEntryPoint.kt
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/declineandblock/DeclineInviteAndBlockEntryPoint.kt
@ -13,5 +13,9 @@ import io.element.android.features.invite.api.InviteData
 import io.element.android.libraries.architecture.FeatureEntryPoint

 fun interface DeclineInviteAndBlockEntryPoint : FeatureEntryPoint {
-    fun createNode(parentNode: Node, buildContext: BuildContext, inviteData: InviteData): Node
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inviteData: InviteData,
+    ): Node
 }
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DefaultDeclineAndBlockEntryPoint.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DefaultDeclineAndBlockEntryPoint.kt
@ -17,7 +17,11 @@ import io.element.android.libraries.architecture.createNode

@ContributesBinding(AppScope::class)
 class DefaultDeclineAndBlockEntryPoint : DeclineInviteAndBlockEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, inviteData: InviteData): Node {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inviteData: InviteData,
+    ): Node {
        val inputs = DeclineAndBlockNode.Inputs(inviteData)
        return parentNode.createNode<DeclineAndBlockNode>(buildContext, plugins = listOf(inputs))
    }
--- a/features/invite/test/build.gradle.kts
+++ b/features/invite/test/build.gradle.kts
@ -26,5 +26,6 @@ dependencies {
    implementation(libs.coroutines.core)
    implementation(projects.libraries.matrix.api)
    implementation(projects.libraries.matrix.test)
+    implementation(projects.tests.testutils)
    api(projects.features.invite.api)
 }
--- a/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/declineandblock/FakeDeclineInviteAndBlockEntryPoint.kt
+++ b/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/declineandblock/FakeDeclineInviteAndBlockEntryPoint.kt
@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 New Vector 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.features.invite.test.declineandblock
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.invite.api.InviteData
+import io.element.android.features.invite.api.declineandblock.DeclineInviteAndBlockEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeDeclineInviteAndBlockEntryPoint : DeclineInviteAndBlockEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inviteData: InviteData,
+    ): Node {
+        lambdaError()
+    }
+}
--- a/features/joinroom/api/src/main/kotlin/io/element/android/features/joinroom/api/JoinRoomEntryPoint.kt
+++ b/features/joinroom/api/src/main/kotlin/io/element/android/features/joinroom/api/JoinRoomEntryPoint.kt
@ -18,7 +18,11 @@ import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
 import java.util.Optional

 interface JoinRoomEntryPoint : FeatureEntryPoint {
-    fun createNode(parentNode: Node, buildContext: BuildContext, inputs: Inputs): Node
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inputs: Inputs,
+    ): Node

    data class Inputs(
        val roomId: RoomId,
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPoint.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPoint.kt
@ -16,7 +16,11 @@ import io.element.android.libraries.architecture.createNode

@ContributesBinding(AppScope::class)
 class DefaultJoinRoomEntryPoint : JoinRoomEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, inputs: JoinRoomEntryPoint.Inputs): Node {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inputs: JoinRoomEntryPoint.Inputs,
+    ): Node {
        return parentNode.createNode<JoinRoomFlowNode>(
            buildContext = buildContext,
            plugins = listOf(inputs)
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomFlowNode.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomFlowNode.kt
@ -64,7 +64,11 @@ class JoinRoomFlowNode(

    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
        return when (navTarget) {
-            is NavTarget.DeclineInviteAndBlockUser -> declineAndBlockEntryPoint.createNode(this, buildContext, navTarget.inviteData)
+            is NavTarget.DeclineInviteAndBlockUser -> declineAndBlockEntryPoint.createNode(
+                parentNode = this,
+                buildContext = buildContext,
+                inviteData = navTarget.inviteData,
+            )
            NavTarget.Root -> rootNode(buildContext)
        }
    }
--- a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPointTest.kt
+++ b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPointTest.kt
@ -9,12 +9,10 @@ package io.element.android.features.joinroom.impl

 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.JoinedRoom
-import io.element.android.features.invite.api.InviteData
-import io.element.android.features.invite.api.declineandblock.DeclineInviteAndBlockEntryPoint
+import io.element.android.features.invite.test.declineandblock.FakeDeclineInviteAndBlockEntryPoint
 import io.element.android.features.joinroom.api.JoinRoomEntryPoint
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
 import io.element.android.libraries.matrix.test.A_ROOM_ID
@ -40,9 +38,7 @@ class DefaultJoinRoomEntryPointTest {
                plugins = plugins,
                presenterFactory = { _, _, _, _, _ -> createJoinRoomPresenter() },
                acceptDeclineInviteView = { _, _, _, _ -> lambdaError() },
-                declineAndBlockEntryPoint = object : DeclineInviteAndBlockEntryPoint {
-                    override fun createNode(parentNode: Node, buildContext: BuildContext, inviteData: InviteData) = lambdaError()
-                }
+                declineAndBlockEntryPoint = FakeDeclineInviteAndBlockEntryPoint(),
            )
        }
        val inputs = JoinRoomEntryPoint.Inputs(
@ -52,7 +48,11 @@ class DefaultJoinRoomEntryPointTest {
            serverNames = emptyList(),
            trigger = JoinedRoom.Trigger.RoomDirectory,
        )
-        val result = entryPoint.createNode(parentNode, BuildContext.root(null), inputs)
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            inputs = inputs,
+        )
        assertThat(result).isInstanceOf(JoinRoomFlowNode::class.java)
        assertThat(result.plugins).contains(inputs)
    }
--- a/features/knockrequests/test/build.gradle.kts
+++ b/features/knockrequests/test/build.gradle.kts
@ -0,0 +1,21 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.knockrequests.test"
+}
+
+dependencies {
+    implementation(projects.features.knockrequests.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.tests.testutils)
+}
--- a/features/knockrequests/test/src/main/kotlin/io/element/android/features/knockrequests/test/FakeKnockRequestsListEntryPoint.kt
+++ b/features/knockrequests/test/src/main/kotlin/io/element/android/features/knockrequests/test/FakeKnockRequestsListEntryPoint.kt
@ -0,0 +1,20 @@
+/*
+ * Copyright 2025 New Vector 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.features.knockrequests.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.knockrequests.api.list.KnockRequestsListEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeKnockRequestsListEntryPoint : KnockRequestsListEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+    ): Node = lambdaError()
+}
--- a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/DependenciesFlowNode.kt
+++ b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/DependenciesFlowNode.kt
@ -52,7 +52,7 @@ class DependenciesFlowNode(
        return when (navTarget) {
            is NavTarget.LicensesList -> {
                val callback = object : DependencyLicensesListNode.Callback {
-                    override fun onOpenLicense(license: DependencyLicenseItem) {
+                    override fun navigateToLicense(license: DependencyLicenseItem) {
                        backstack.push(NavTarget.LicenseDetails(license))
                    }
                }
--- a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListNode.kt
+++ b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/list/DependencyLicensesListNode.kt
@ -12,12 +12,12 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
 import io.element.android.features.licenses.impl.model.DependencyLicenseItem
+import io.element.android.libraries.architecture.callback

@ContributesNode(AppScope::class)
@AssistedInject
@ -30,13 +30,10 @@ class DependencyLicensesListNode(
    plugins = plugins
 ) {
    interface Callback : Plugin {
-        fun onOpenLicense(license: DependencyLicenseItem)
+        fun navigateToLicense(license: DependencyLicenseItem)
    }

-    private fun onOpenLicense(license: DependencyLicenseItem) {
-        plugins<Callback>()
-            .forEach { it.onOpenLicense(license) }
-    }
+    private val callback: Callback = callback()

    @Composable
    override fun View(modifier: Modifier) {
@ -44,7 +41,7 @@ class DependencyLicensesListNode(
        DependencyLicensesListView(
            state = state,
            onBackClick = ::navigateUp,
-            onOpenLicense = ::onOpenLicense,
+            onOpenLicense = callback::navigateToLicense,
        )
    }
 }
--- a/features/licenses/test/build.gradle.kts
+++ b/features/licenses/test/build.gradle.kts
@ -0,0 +1,19 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+plugins {
+    id("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.features.licenses.test"
+}
+
+dependencies {
+    implementation(projects.features.licenses.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.tests.testutils)
+}
--- a/features/licenses/test/src/main/kotlin/io/element/android/features/licenses/test/FakeOpenSourceLicensesEntryPoint.kt
+++ b/features/licenses/test/src/main/kotlin/io/element/android/features/licenses/test/FakeOpenSourceLicensesEntryPoint.kt
@ -0,0 +1,22 @@
+/*
+ * Copyright 2025 New Vector 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.features.licenses.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.licenses.api.OpenSourceLicensesEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeOpenSourceLicensesEntryPoint : OpenSourceLicensesEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+    ): Node {
+        lambdaError()
+    }
+}
--- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/SendLocationEntryPoint.kt
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/SendLocationEntryPoint.kt
@ -18,8 +18,9 @@ import io.element.android.libraries.matrix.api.timeline.Timeline
 * Allows a user to share a location message within a room.
 */
 interface SendLocationEntryPoint : FeatureEntryPoint {
-    fun builder(timelineMode: Timeline.Mode): Builder
-    interface Builder {
-        fun build(parentNode: Node, buildContext: BuildContext): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        timelineMode: Timeline.Mode,
+    ): Node
 }
--- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/ShowLocationEntryPoint.kt
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/ShowLocationEntryPoint.kt
@ -13,7 +13,14 @@ import io.element.android.libraries.architecture.FeatureEntryPoint
 import io.element.android.libraries.architecture.NodeInputs

 interface ShowLocationEntryPoint : FeatureEntryPoint {
-    data class Inputs(val location: Location, val description: String?) : NodeInputs
+    data class Inputs(
+        val location: Location,
+        val description: String?,
+    ) : NodeInputs

-    fun createNode(parentNode: Node, buildContext: BuildContext, inputs: Inputs): Node
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inputs: Inputs,
+    ): Node
 }
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/DefaultSendLocationEntryPoint.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/DefaultSendLocationEntryPoint.kt
@ -17,16 +17,14 @@ import io.element.android.libraries.matrix.api.timeline.Timeline

@ContributesBinding(AppScope::class)
 class DefaultSendLocationEntryPoint : SendLocationEntryPoint {
-    override fun builder(timelineMode: Timeline.Mode): SendLocationEntryPoint.Builder {
-        return Builder(timelineMode)
-    }
-
-    class Builder(private val timelineMode: Timeline.Mode) : SendLocationEntryPoint.Builder {
-        override fun build(parentNode: Node, buildContext: BuildContext): Node {
-            return parentNode.createNode<SendLocationNode>(
-                buildContext = buildContext,
-                plugins = listOf(SendLocationNode.Inputs(timelineMode))
-            )
-        }
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        timelineMode: Timeline.Mode,
+    ): Node {
+        return parentNode.createNode<SendLocationNode>(
+            buildContext = buildContext,
+            plugins = listOf(SendLocationNode.Inputs(timelineMode))
+        )
    }
 }
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/DefaultShowLocationEntryPoint.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/DefaultShowLocationEntryPoint.kt
@ -16,7 +16,11 @@ import io.element.android.libraries.architecture.createNode

@ContributesBinding(AppScope::class)
 class DefaultShowLocationEntryPoint : ShowLocationEntryPoint {
-    override fun createNode(parentNode: Node, buildContext: BuildContext, inputs: ShowLocationEntryPoint.Inputs): Node {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inputs: ShowLocationEntryPoint.Inputs,
+    ): Node {
        return parentNode.createNode<ShowLocationNode>(buildContext, listOf(inputs))
    }
 }
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/DefaultSendLocationEntryPointTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/DefaultSendLocationEntryPointTest.kt
@ -47,8 +47,11 @@ class DefaultSendLocationEntryPointTest {
            )
        }
        val timelineMode = Timeline.Mode.Live
-        val result = entryPoint.builder(timelineMode)
-            .build(parentNode, BuildContext.root(null))
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            timelineMode = timelineMode,
+        )
        assertThat(result).isInstanceOf(SendLocationNode::class.java)
        assertThat(result.plugins).contains(SendLocationNode.Inputs(timelineMode))
    }
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/DefaultShowLocationEntryPointTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/DefaultShowLocationEntryPointTest.kt
@ -48,8 +48,8 @@ class DefaultShowLocationEntryPointTest {
            description = "My location",
        )
        val result = entryPoint.createNode(
-            parentNode,
-            BuildContext.root(null),
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
            inputs = inputs,
        )
        assertThat(result).isInstanceOf(ShowLocationNode::class.java)
--- a/features/location/test/build.gradle.kts
+++ b/features/location/test/build.gradle.kts
@ -14,5 +14,8 @@ android {
 }

 dependencies {
-    implementation(projects.features.location.api)
+    api(projects.features.location.api)
+    implementation(projects.libraries.matrix.api)
+    implementation(libs.appyx.core)
+    implementation(projects.tests.testutils)
 }
--- a/features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeSendLocationEntryPoint.kt
+++ b/features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeSendLocationEntryPoint.kt
@ -0,0 +1,22 @@
+/*
+ * Copyright 2025 New Vector 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.features.location.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.location.api.SendLocationEntryPoint
+import io.element.android.libraries.matrix.api.timeline.Timeline
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeSendLocationEntryPoint : SendLocationEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        timelineMode: Timeline.Mode,
+    ): Node = lambdaError()
+}
--- a/features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeShowLocationEntryPoint.kt
+++ b/features/location/test/src/main/kotlin/io/element/android/features/location/test/FakeShowLocationEntryPoint.kt
@ -0,0 +1,21 @@
+/*
+ * Copyright 2025 New Vector 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.features.location.test
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.location.api.ShowLocationEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeShowLocationEntryPoint : ShowLocationEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        inputs: ShowLocationEntryPoint.Inputs,
+    ): Node = lambdaError()
+}
--- a/features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/LockScreenEntryPoint.kt
+++ b/features/lockscreen/api/src/main/kotlin/io/element/android/features/lockscreen/api/LockScreenEntryPoint.kt
@ -15,13 +15,14 @@ import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint

 interface LockScreenEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext, navTarget: Target): NodeBuilder
-    fun pinUnlockIntent(context: Context): Intent
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        navTarget: Target,
+        callback: Callback,
+    ): Node

-    interface NodeBuilder {
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun pinUnlockIntent(context: Context): Intent

    interface Callback : Plugin {
        fun onSetupDone()
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPoint.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPoint.kt
@ -19,26 +19,24 @@ import io.element.android.libraries.architecture.createNode

@ContributesBinding(AppScope::class)
 class DefaultLockScreenEntryPoint : LockScreenEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext, navTarget: LockScreenEntryPoint.Target): LockScreenEntryPoint.NodeBuilder {
-        val callbacks = mutableListOf<LockScreenEntryPoint.Callback>()
-
-        return object : LockScreenEntryPoint.NodeBuilder {
-            override fun callback(callback: LockScreenEntryPoint.Callback): LockScreenEntryPoint.NodeBuilder {
-                callbacks += callback
-                return this
-            }
-
-            override fun build(): Node {
-                val inputs = LockScreenFlowNode.Inputs(
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        navTarget: LockScreenEntryPoint.Target,
+        callback: LockScreenEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<LockScreenFlowNode>(
+            buildContext = buildContext,
+            plugins = listOf(
+                LockScreenFlowNode.Inputs(
                    when (navTarget) {
                        LockScreenEntryPoint.Target.Setup -> LockScreenFlowNode.NavTarget.Setup
                        LockScreenEntryPoint.Target.Settings -> LockScreenFlowNode.NavTarget.Settings
                    }
-                )
-                val plugins = listOf(inputs) + callbacks
-                return parentNode.createNode<LockScreenFlowNode>(buildContext, plugins)
-            }
-        }
+                ),
+                callback,
+            )
+        )
    }

    override fun pinUnlockIntent(context: Context): Intent {
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt
@ -110,7 +110,7 @@ class LockScreenSettingsFlowNode(
            }
            NavTarget.Settings -> {
                val callback = object : LockScreenSettingsNode.Callback {
-                    override fun onChangePinClick() {
+                    override fun navigateToSetupPin() {
                        backstack.push(NavTarget.SetupPin)
                    }
                }
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsNode.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsNode.kt
@ -12,10 +12,10 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope

@ContributesNode(SessionScope::class)
@ -26,12 +26,10 @@ class LockScreenSettingsNode(
    private val presenter: LockScreenSettingsPresenter,
 ) : Node(buildContext, plugins = plugins) {
    interface Callback : Plugin {
-        fun onChangePinClick()
+        fun navigateToSetupPin()
    }

-    private fun onChangePinClick() {
-        plugins<Callback>().forEach { it.onChangePinClick() }
-    }
+    private val callback: Callback = callback()

    @Composable
    override fun View(modifier: Modifier) {
@ -39,7 +37,7 @@ class LockScreenSettingsNode(
        LockScreenSettingsView(
            state = state,
            onBackClick = this::navigateUp,
-            onChangePinClick = this::onChangePinClick,
+            onChangePinClick = callback::navigateToSetupPin,
            modifier = modifier,
        )
    }
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/LockScreenSetupFlowNode.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/LockScreenSetupFlowNode.kt
@ -14,7 +14,6 @@ import com.bumble.appyx.core.lifecycle.subscribe
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.newRoot
 import dev.zacsweers.metro.Assisted
@ -27,6 +26,7 @@ import io.element.android.features.lockscreen.impl.setup.biometric.SetupBiometri
 import io.element.android.features.lockscreen.impl.setup.pin.SetupPinNode
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
 import kotlinx.parcelize.Parcelize
@ -50,9 +50,7 @@ class LockScreenSetupFlowNode(
        fun onSetupDone()
    }

-    private fun onSetupDone() {
-        plugins<Callback>().forEach { it.onSetupDone() }
-    }
+    private val callback: Callback = callback()

    sealed interface NavTarget : Parcelable {
        @Parcelize
@ -67,7 +65,7 @@ class LockScreenSetupFlowNode(
            if (biometricAuthenticatorManager.hasAvailableAuthenticator) {
                backstack.newRoot(NavTarget.Biometric)
            } else {
-                onSetupDone()
+                callback.onSetupDone()
            }
        }
    }
@ -91,7 +89,7 @@ class LockScreenSetupFlowNode(
            NavTarget.Biometric -> {
                val callback = object : SetupBiometricNode.Callback {
                    override fun onBiometricSetupDone() {
-                        onSetupDone()
+                        callback.onSetupDone()
                    }
                }
                createNode<SetupBiometricNode>(buildContext, plugins = listOf(callback))
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricNode.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricNode.kt
@ -13,10 +13,10 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope

@ContributesNode(SessionScope::class)
@ -30,16 +30,14 @@ class SetupBiometricNode(
        fun onBiometricSetupDone()
    }

-    private fun onSetupDone() {
-        plugins<Callback>().forEach { it.onBiometricSetupDone() }
-    }
+    private val callback: Callback = callback()

    @Composable
    override fun View(modifier: Modifier) {
        val state = presenter.present()
        LaunchedEffect(state.isBiometricSetupDone) {
            if (state.isBiometricSetupDone) {
-                onSetupDone()
+                callback.onBiometricSetupDone()
            }
        }
        SetupBiometricView(
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockNode.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockNode.kt
@ -13,10 +13,10 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import io.element.android.annotations.ContributesNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope

@ContributesNode(SessionScope::class)
@ -30,18 +30,14 @@ class PinUnlockNode(
        fun onUnlock()
    }

-    private fun onUnlock() {
-        plugins<Callback>().forEach {
-            it.onUnlock()
-        }
-    }
+    private val callback: Callback = callback()

    @Composable
    override fun View(modifier: Modifier) {
        val state = presenter.present()
        LaunchedEffect(state.isUnlocked) {
            if (state.isUnlocked) {
-                onUnlock()
+                callback.onUnlock()
            }
        }
        PinUnlockView(
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPointTest.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/DefaultLockScreenEntryPointTest.kt
@ -37,9 +37,12 @@ class DefaultLockScreenEntryPointTest {
            override fun onSetupDone() = lambdaError()
        }
        val navTarget = LockScreenEntryPoint.Target.Setup
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null), navTarget)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            navTarget = navTarget,
+            callback = callback,
+        )
        assertThat(result).isInstanceOf(LockScreenFlowNode::class.java)
        assertThat(result.plugins).contains(LockScreenFlowNode.Inputs(LockScreenFlowNode.NavTarget.Setup))
        assertThat(result.plugins).contains(callback)
@ -58,9 +61,12 @@ class DefaultLockScreenEntryPointTest {
            override fun onSetupDone() = lambdaError()
        }
        val navTarget = LockScreenEntryPoint.Target.Settings
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null), navTarget)
-            .callback(callback)
-            .build()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            navTarget = navTarget,
+            callback = callback,
+        )
        assertThat(result).isInstanceOf(LockScreenFlowNode::class.java)
        assertThat(result.plugins).contains(LockScreenFlowNode.Inputs(LockScreenFlowNode.NavTarget.Settings))
        assertThat(result.plugins).contains(callback)
--- a/features/lockscreen/test/build.gradle.kts
+++ b/features/lockscreen/test/build.gradle.kts
@ -14,6 +14,8 @@ android {
 }

 dependencies {
-    implementation(libs.coroutines.core)
    api(projects.features.lockscreen.api)
+    implementation(libs.coroutines.core)
+    implementation(projects.libraries.architecture)
+    implementation(projects.tests.testutils)
 }
--- a/features/lockscreen/test/src/main/kotlin/io/element/android/features/lockscreen/test/FakeLockScreenEntryPoint.kt
+++ b/features/lockscreen/test/src/main/kotlin/io/element/android/features/lockscreen/test/FakeLockScreenEntryPoint.kt
@ -0,0 +1,26 @@
+/*
+ * Copyright 2025 New Vector 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.features.lockscreen.test
+
+import android.content.Context
+import android.content.Intent
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.lockscreen.api.LockScreenEntryPoint
+import io.element.android.tests.testutils.lambda.lambdaError
+
+class FakeLockScreenEntryPoint : LockScreenEntryPoint {
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        navTarget: LockScreenEntryPoint.Target,
+        callback: LockScreenEntryPoint.Callback,
+    ): Node = lambdaError()
+
+    override fun pinUnlockIntent(context: Context): Intent = lambdaError()
+}
--- a/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginEntryPoint.kt
+++ b/features/login/api/src/main/kotlin/io/element/android/features/login/api/LoginEntryPoint.kt
@ -19,14 +19,13 @@ interface LoginEntryPoint : FeatureEntryPoint {
    )

    interface Callback : Plugin {
-        fun onReportProblem()
+        fun navigateToBugReport()
    }

-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun params(params: Params): NodeBuilder
-        fun callback(callback: Callback): NodeBuilder
-        fun build(): Node
-    }
+    fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: Params,
+        callback: Callback,
+    ): Node
 }
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPoint.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPoint.kt
@ -9,7 +9,6 @@ package io.element.android.features.login.impl

 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
-import com.bumble.appyx.core.plugin.Plugin
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import io.element.android.features.login.api.LoginEntryPoint
@ -17,26 +16,21 @@ import io.element.android.libraries.architecture.createNode

@ContributesBinding(AppScope::class)
 class DefaultLoginEntryPoint : LoginEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): LoginEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : LoginEntryPoint.NodeBuilder {
-            override fun params(params: LoginEntryPoint.Params): LoginEntryPoint.NodeBuilder {
-                plugins += LoginFlowNode.Params(
+    override fun createNode(
+        parentNode: Node,
+        buildContext: BuildContext,
+        params: LoginEntryPoint.Params,
+        callback: LoginEntryPoint.Callback,
+    ): Node {
+        return parentNode.createNode<LoginFlowNode>(
+            buildContext = buildContext,
+            plugins = listOf(
+                LoginFlowNode.Params(
                    accountProvider = params.accountProvider,
                    loginHint = params.loginHint,
-                )
-                return this
-            }
-
-            override fun callback(callback: LoginEntryPoint.Callback): LoginEntryPoint.NodeBuilder {
-                plugins += callback
-                return this
-            }
-
-            override fun build(): Node {
-                return parentNode.createNode<LoginFlowNode>(buildContext, plugins)
-            }
-        }
+                ),
+                callback,
+            )
+        )
    }
 }
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt
@ -18,7 +18,6 @@ import com.bumble.appyx.core.lifecycle.subscribe
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.push
 import com.bumble.appyx.navmodel.backstack.operation.singleTop
@ -41,6 +40,7 @@ import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTa
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.NodeInputs
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.matrix.api.auth.OidcDetails
@ -70,6 +70,7 @@ class LoginFlowNode(
        val loginHint: String?,
    ) : NodeInputs

+    private val callback: LoginEntryPoint.Callback = callback()
    private var activity: Activity? = null
    private var darkTheme: Boolean = false

@ -126,13 +127,13 @@ class LoginFlowNode(
        return when (navTarget) {
            NavTarget.OnBoarding -> {
                val callback = object : OnBoardingNode.Callback {
-                    override fun onSignUp() {
+                    override fun navigateToSignUpFlow() {
                        backstack.push(
                            NavTarget.ConfirmAccountProvider(isAccountCreation = true)
                        )
                    }

-                    override fun onSignIn(mustChooseAccountProvider: Boolean) {
+                    override fun navigateToSignInFlow(mustChooseAccountProvider: Boolean) {
                        backstack.push(
                            if (mustChooseAccountProvider) {
                                NavTarget.ChooseAccountProvider
@ -142,23 +143,23 @@ class LoginFlowNode(
                        )
                    }

-                    override fun onSignInWithQrCode() {
+                    override fun navigateToQrCode() {
                        backstack.push(NavTarget.QrCode)
                    }

-                    override fun onReportProblem() {
-                        plugins<LoginEntryPoint.Callback>().forEach { it.onReportProblem() }
+                    override fun navigateToBugReport() {
+                        callback.navigateToBugReport()
                    }

-                    override fun onOidcDetails(oidcDetails: OidcDetails) {
+                    override fun navigateToOidc(oidcDetails: OidcDetails) {
                        navigateToMas(oidcDetails)
                    }

-                    override fun onCreateAccountContinue(url: String) {
+                    override fun navigateToCreateAccount(url: String) {
                        backstack.push(NavTarget.CreateAccount(url))
                    }

-                    override fun onLoginPasswordNeeded() {
+                    override fun navigateToLoginPassword() {
                        backstack.push(NavTarget.LoginPassword)
                    }
                }
@ -171,15 +172,15 @@ class LoginFlowNode(
            }
            NavTarget.ChooseAccountProvider -> {
                val callback = object : ChooseAccountProviderNode.Callback {
-                    override fun onOidcDetails(oidcDetails: OidcDetails) {
+                    override fun navigateToOidc(oidcDetails: OidcDetails) {
                        navigateToMas(oidcDetails)
                    }

-                    override fun onCreateAccountContinue(url: String) {
+                    override fun navigateToCreateAccount(url: String) {
                        backstack.push(NavTarget.CreateAccount(url))
                    }

-                    override fun onLoginPasswordNeeded() {
+                    override fun navigateToLoginPassword() {
                        backstack.push(NavTarget.LoginPassword)
                    }
                }
@ -193,19 +194,19 @@ class LoginFlowNode(
                    isAccountCreation = navTarget.isAccountCreation,
                )
                val callback = object : ConfirmAccountProviderNode.Callback {
-                    override fun onOidcDetails(oidcDetails: OidcDetails) {
+                    override fun navigateToOidc(oidcDetails: OidcDetails) {
                        navigateToMas(oidcDetails)
                    }

-                    override fun onCreateAccountContinue(url: String) {
+                    override fun navigateToCreateAccount(url: String) {
                        backstack.push(NavTarget.CreateAccount(url))
                    }

-                    override fun onLoginPasswordNeeded() {
+                    override fun navigateToLoginPassword() {
                        backstack.push(NavTarget.LoginPassword)
                    }

-                    override fun onChangeAccountProvider() {
+                    override fun navigateToChangeAccountProvider() {
                        backstack.push(NavTarget.ChangeAccountProvider)
                    }
                }
@ -221,7 +222,7 @@ class LoginFlowNode(
                        backstack.singleTop(confirmAccountProvider)
                    }

-                    override fun onOtherClick() {
+                    override fun navigateToSearchAccountProvider() {
                        backstack.push(NavTarget.SearchAccountProvider)
                    }
                }
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProvider.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/accountprovider/AccountProvider.kt
@ -13,5 +13,4 @@ data class AccountProvider(
    val subtitle: String? = null,
    val isPublic: Boolean = false,
    val isMatrixOrg: Boolean = false,
-    val isValid: Boolean = false,
 )
--- a/Show more
+++ b/Show more