Make Wait.kt's text-wait resilient to recomposition.

Rework UiObject2.waitForText into BySelector.waitForText that re-resolves the selector on each poll, absorbing StaleObjectException from mid-poll recomposition. Bypass the findObject() extension (which lies about nullability) by calling device.findObject(this) directly. Accept a mustBeEqual flag so the channel-preview assertion can substring-match and avoid timing out when the rendered preview has trailing whitespace. Update the 4 robot call sites.

Author: andremion

stream-chat-android-compose-sample/src/androidTestE2eDebug/kotlin/io/getstream/chat/android/compose/robots/UserRobotChannelListAsserts.kt

@@ -37,7 +37,10 @@ fun UserRobot.assertMessageInChannelPreview(text: String, fromCurrentUser: Boole
         false -> "${ParticipantRobot.name}: $text"
         null -> text
     }
-    assertEquals(expectedPreview, Channel.messagePreview.waitToAppear().waitForText(expectedPreview).text.trimEnd())
+    assertEquals(
+        expectedPreview,
+        Channel.messagePreview.waitForText(expectedPreview, mustBeEqual = false).trimEnd(),
+    )
     return this
 }
 

stream-chat-android-compose-sample/src/androidTestE2eDebug/kotlin/io/getstream/chat/android/compose/robots/UserRobotMessageListAsserts.kt

@@ -143,7 +143,7 @@ fun UserRobot.assertDeletedMessage(text: String? = null, hard: Boolean = false):
 fun UserRobot.assertQuotedMessage(text: String, quote: String = "", isDisplayed: Boolean = true): UserRobot {
     val quotedMessageInList = Message.quotedMessage.hasAncestor(MessageListPage.MessageList.messages)
     if (isDisplayed) {
-        assertEquals(quote, quotedMessageInList.waitToAppear().waitForText(quote).text)
+        assertEquals(quote, quotedMessageInList.waitForText(quote))
     } else {
         assertFalse(quotedMessageInList.waitToDisappear().isDisplayed())
     }
@@ -231,7 +231,7 @@ fun UserRobot.assertMentionWasApplied(): UserRobot {
     val additionalSpace = " "
     val userName = ParticipantRobot.name
     val expectedText = "@${userName}$additionalSpace"
-    val actualText = Composer.inputField.findObject().waitForText(expectedText).text
+    val actualText = Composer.inputField.waitForText(expectedText)
     assertEquals(expectedText, actualText)
     return this
 }
@@ -352,7 +352,7 @@ fun UserRobot.assertThreadReplyLabel(replies: Int, inThread: Boolean = false): U
         )
         assertEquals(
             expectedResult,
-            ThreadPage.ThreadList.repliesCountLabel.waitToAppear().waitForText(expectedResult).text,
+            ThreadPage.ThreadList.repliesCountLabel.waitForText(expectedResult),
         )
     } else {
         val expectedResult = appContext.resources.getQuantityString(

stream-chat-android-e2e-test/src/main/kotlin/io/getstream/chat/android/e2e/test/uiautomator/Wait.kt

@@ -17,6 +17,7 @@
 package io.getstream.chat.android.compose.uiautomator
 
 import androidx.test.uiautomator.BySelector
+import androidx.test.uiautomator.StaleObjectException
 import androidx.test.uiautomator.UiObject2
 import androidx.test.uiautomator.Until
 
@@ -44,17 +45,40 @@ public fun BySelector.waitToDisappear(timeOutMillis: Long = defaultTimeout): ByS
     return this
 }
 
-public fun UiObject2.waitForText(
+/**
+ * Polls by re-finding the object on each iteration so a mid-poll recomposition does not produce
+ * a [StaleObjectException]. Returns the text that was observed when the match succeeded, or the
+ * last observed text on timeout — never throws. Callers typically wrap the result in an
+ * assertion to surface mismatch/timeout.
+ *
+ * @param expectedText The text to match.
+ * @param mustBeEqual When `true`, requires exact match; otherwise a substring match.
+ * @param timeOutMillis Maximum time to keep polling before returning the last observed text.
+ */
+public fun BySelector.waitForText(
     expectedText: String,
     mustBeEqual: Boolean = true,
     timeOutMillis: Long = defaultTimeout,
-): UiObject2 {
+): String {
     val endTime = System.currentTimeMillis() + timeOutMillis
-    var textPresent = false
-    while (!textPresent && System.currentTimeMillis() < endTime) {
-        textPresent = if (mustBeEqual) text == expectedText else text.contains(expectedText)
+    var lastText = ""
+    while (System.currentTimeMillis() < endTime) {
+        val actual = currentTextOrNull()
+        if (actual != null) {
+            lastText = actual
+            val matches = if (mustBeEqual) actual == expectedText else actual.contains(expectedText)
+            if (matches) return actual
+        }
     }
-    return this
+    return lastText
+}
+
+// Call [device] directly — [findObject] lies about nullability and NPEs when the selector hasn't
+// matched yet, which is the normal case during polling.
+private fun BySelector.currentTextOrNull(): String? = try {
+    device.findObject(this)?.text
+} catch (_: StaleObjectException) {
+    null
 }
 
 public fun BySelector.waitForCount(count: Int, timeOutMillis: Long = defaultTimeout): List<UiObject2> {