Merge branch 'develop' into feature/fga/join_space

features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteView.kt

@@ -11,7 +11,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import io.element.android.libraries.matrix.api.core.RoomId
 
-interface AcceptDeclineInviteView {
+fun interface AcceptDeclineInviteView {
     @Composable
     fun Render(
         state: AcceptDeclineInviteState,

features/invite/api/src/main/kotlin/io/element/android/features/invite/api/declineandblock/DeclineInviteAndBlockEntryPoint.kt

@@ -12,6 +12,6 @@ import com.bumble.appyx.core.node.Node
 import io.element.android.features.invite.api.InviteData
 import io.element.android.libraries.architecture.FeatureEntryPoint
 
-interface DeclineInviteAndBlockEntryPoint : FeatureEntryPoint {
+fun interface DeclineInviteAndBlockEntryPoint : FeatureEntryPoint {
     fun createNode(parentNode: Node, buildContext: BuildContext, inviteData: InviteData): Node
 }

features/invite/impl/build.gradle.kts

@@ -1,4 +1,5 @@
 import extension.setupDependencyInjection
+import extension.testCommonDependencies
 
 /*
  * Copyright 2023, 2024 New Vector Ltd.
@@ -36,17 +37,9 @@ dependencies {
     implementation(projects.services.analytics.api)
     implementation(projects.libraries.push.api)
 
-    testImplementation(libs.test.junit)
-    testImplementation(libs.coroutines.test)
-    testImplementation(libs.molecule.runtime)
-    testImplementation(libs.test.truth)
-    testImplementation(libs.test.turbine)
-    testImplementation(libs.test.robolectric)
+    testCommonDependencies(libs, true)
     testImplementation(projects.features.invite.test)
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.push.test)
     testImplementation(projects.services.analytics.test)
-    testImplementation(projects.tests.testutils)
-    testImplementation(libs.androidx.compose.ui.test.junit)
-    testReleaseImplementation(libs.androidx.compose.ui.test.manifest)
 }

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenter.kt

@@ -35,7 +35,7 @@ class DeclineAndBlockPresenter(
     private val snackbarDispatcher: SnackbarDispatcher,
 ) : Presenter<DeclineAndBlockState> {
     @AssistedFactory
-    interface Factory {
+    fun interface Factory {
         fun create(inviteData: InviteData): DeclineAndBlockPresenter
     }
 

features/invite/impl/src/main/res/values-pt/translations.xml

@@ -7,7 +7,7 @@
   <string name="screen_decline_and_block_title">"Rejeitar e bloquear"</string>
   <string name="screen_invites_decline_chat_message">"Tens a certeza que queres rejeitar o convite para entra em %1$s?"</string>
   <string name="screen_invites_decline_chat_title">"Rejeitar convite"</string>
-  <string name="screen_invites_decline_direct_chat_message">"Tem a certeza que queres rejeitar esta conversa privada com %1$s?"</string>
+  <string name="screen_invites_decline_direct_chat_message">"Tens a certeza que queres rejeitar esta conversa privada com %1$s?"</string>
   <string name="screen_invites_decline_direct_chat_title">"Rejeitar conversa"</string>
   <string name="screen_invites_empty_list">"Sem convites"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) convidou-te"</string>

features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenterTest.kt

@@ -11,11 +11,11 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.features.invite.api.InviteData
 import io.element.android.features.invite.impl.DeclineInvite
 import io.element.android.features.invite.impl.fake.FakeDeclineInvite
+import io.element.android.features.invite.test.anInviteData
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.test.A_ROOM_ID
-import io.element.android.libraries.matrix.test.A_ROOM_NAME
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.assert
 import io.element.android.tests.testutils.lambda.lambdaRecorder
@@ -148,28 +148,16 @@ class DeclineAndBlockPresenterTest {
             .isCalledOnce()
             .with(value(A_ROOM_ID), value(true), value(false), value(""))
     }
-
-    private fun anInviteData(
-        roomId: RoomId = A_ROOM_ID,
-        name: String = A_ROOM_NAME,
-        isDm: Boolean = false,
-    ): InviteData {
-        return InviteData(
-            roomId = roomId,
-            roomName = name,
-            isDm = isDm,
-        )
-    }
-
-    private fun createDeclineAndBlockPresenter(
-        inviteData: InviteData = anInviteData(),
-        declineInvite: DeclineInvite = FakeDeclineInvite(),
-        snackbarDispatcher: SnackbarDispatcher = SnackbarDispatcher(),
-    ): DeclineAndBlockPresenter {
-        return DeclineAndBlockPresenter(
-            inviteData = inviteData,
-            declineInvite = declineInvite,
-            snackbarDispatcher = snackbarDispatcher,
-        )
-    }
+}
+
+internal fun createDeclineAndBlockPresenter(
+    inviteData: InviteData = anInviteData(),
+    declineInvite: DeclineInvite = FakeDeclineInvite(),
+    snackbarDispatcher: SnackbarDispatcher = SnackbarDispatcher(),
+): DeclineAndBlockPresenter {
+    return DeclineAndBlockPresenter(
+        inviteData = inviteData,
+        declineInvite = declineInvite,
+        snackbarDispatcher = snackbarDispatcher,
+    )
 }

features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DefaultDeclineAndBlockEntryPointTest.kt

@@ -0,0 +1,41 @@
+/*
+ * 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.impl.declineandblock
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.bumble.appyx.core.modality.BuildContext
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.invite.test.anInviteData
+import io.element.android.tests.testutils.node.TestParentNode
+import org.junit.Rule
+import org.junit.Test
+
+class DefaultDeclineAndBlockEntryPointTest {
+    @get:Rule
+    val instantTaskExecutorRule = InstantTaskExecutorRule()
+
+    @Test
+    fun `test node builder`() {
+        val entryPoint = DefaultDeclineAndBlockEntryPoint()
+        val parentNode = TestParentNode.create { buildContext, plugins ->
+            DeclineAndBlockNode(
+                buildContext = buildContext,
+                plugins = plugins,
+                presenterFactory = { inviteData -> createDeclineAndBlockPresenter() }
+            )
+        }
+        val inviteData = anInviteData()
+        val result = entryPoint.createNode(
+            parentNode = parentNode,
+            buildContext = BuildContext.root(null),
+            inviteData = inviteData
+        )
+        assertThat(result).isInstanceOf(DeclineAndBlockNode::class.java)
+        assertThat(result.plugins).contains(DeclineAndBlockNode.Inputs(inviteData))
+    }
+}