Merge branch 'develop' into feature/fga/timeline_thread_decoration

Author: ganfra

.maestro/tests/account/changeServer.yaml

@@ -15,7 +15,7 @@ appId: ${APP_ID}
 - tapOn: "gnuradio.org"
 - extendedWaitUntil:
     visible: "This server currently doesn’t support sliding sync."
-    timeout: 10_000
+    timeout: 10000
 - tapOn: "Cancel"
 - back
 - back

.maestro/tests/assertions/assertAnalyticsDisplayed.yaml

@@ -2,4 +2,4 @@ appId: ${APP_ID}
 ---
 - extendedWaitUntil:
     visible: "Help improve Element X dbg"
-    timeout: 10_000
+    timeout: 10000

.maestro/tests/assertions/assertHomeDisplayed.yaml

@@ -2,4 +2,4 @@ appId: ${APP_ID}
 ---
 - extendedWaitUntil:
     visible: "All Chats"
-    timeout: 10_000
+    timeout: 10000

.maestro/tests/assertions/assertInitDisplayed.yaml

@@ -2,4 +2,4 @@ appId: ${APP_ID}
 ---
 - extendedWaitUntil:
     visible: "Be in your element"
-    timeout: 10_000
+    timeout: 10000

.maestro/tests/assertions/assertLoginDisplayed.yaml

@@ -2,4 +2,4 @@ appId: ${APP_ID}
 ---
 - extendedWaitUntil:
     visible: "Change account provider"
-    timeout: 10_000
+    timeout: 10000

.maestro/tests/assertions/assertRoomListSynced.yaml

@@ -2,4 +2,4 @@ appId: ${APP_ID}
 ---
 - extendedWaitUntil:
     visible: ${ROOM_NAME}
-    timeout: 10_000
+    timeout: 10000

.maestro/tests/assertions/assertWelcomeScreenDisplayed.yaml

@@ -3,4 +3,4 @@ appId: ${APP_ID}
 - extendedWaitUntil:
     visible:
       id: "welcome_screen-title"
-    timeout: 10_000
+    timeout: 10000

.maestro/tests/roomList/timeline/messages/text.yaml

@@ -1,7 +1,8 @@
 appId: ${APP_ID}
 ---
 - takeScreenshot: build/maestro/510-Timeline
-- tapOn: "Message"
+- tapOn:
+    id: "rich_text_editor"
 - inputText: "Hello world!"
 - tapOn: "Send"
 - hideKeyboard

appnav/src/test/kotlin/io/element/android/appnav/RootPresenterTest.kt

@@ -37,8 +37,7 @@ import org.junit.Rule
 import org.junit.Test
 
 class RootPresenterTest {
-    @Rule
-    @JvmField
+    @get:Rule
     val warmUpRule = WarmUpRule()
 
     @Test

appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt

@@ -37,8 +37,7 @@ import org.junit.Test
 
 class LoggedInPresenterTest {
 
-    @Rule
-    @JvmField
+    @get:Rule
     val warmUpRule = WarmUpRule()
 
     @Test