Merge branch 'dev' into disappear-2

2025-12-26 23:47:00 +00:00 · 2023-10-06 12:01:23 +10:30
parent 82a94eed74 84bc1dcb6b
commit 892e4b75ec
27 changed files with 156 additions and 459 deletions
--- a/app/src/androidTest/java/network/loki/messenger/HomeActivityTests.kt
+++ b/app/src/androidTest/java/network/loki/messenger/HomeActivityTests.kt
@@ -158,6 +158,7 @@ class HomeActivityTests {

        val dialogPromptText = InstrumentationRegistry.getInstrumentation().targetContext.getString(R.string.dialog_open_url_explanation, amazonPuny)

+        onView(isRoot()).perform(waitFor(1000)) // no other way for this to work apparently
        onView(withText(dialogPromptText)).check(matches(isDisplayed()))
    }