detox 20.31.0 → 20.33.0-prerelease.0

package/Detox-android/com/wix/detox/20.33.0-prerelease.0/detox-20.33.0-prerelease.0-sources.jar.md5

@@ -0,0 +1 @@
+1d5caeb258300c395eb77d0578fc82c0

package/Detox-android/com/wix/detox/20.33.0-prerelease.0/detox-20.33.0-prerelease.0-sources.jar.sha1

@@ -0,0 +1 @@
+f8170fd9458971b52edf5cac9c405b006897dfda

package/Detox-android/com/wix/detox/20.33.0-prerelease.0/detox-20.33.0-prerelease.0-sources.jar.sha256

@@ -0,0 +1 @@
+a8cf832ed05547b999c437611e921271ae2aaafe7a19bfda8bc6737e4d3ba7d0

package/Detox-android/com/wix/detox/20.33.0-prerelease.0/detox-20.33.0-prerelease.0-sources.jar.sha512

@@ -0,0 +1 @@
+8bd107bedd83c2784c3d19782e9a1f8ee6d7d66eb8bd4fe04a2a7603a23d257ac6cc516552a8238ec8e13fbabcd406cb1a458ae270d18f1b45094f22a69b3e6a

package/Detox-android/com/wix/detox/20.33.0-prerelease.0/detox-20.33.0-prerelease.0.aar.md5

@@ -0,0 +1 @@
+4ab2c960e9f1d12a9daa555f3db6554c

package/Detox-android/com/wix/detox/20.33.0-prerelease.0/detox-20.33.0-prerelease.0.aar.sha1

@@ -0,0 +1 @@
+4068d06887f8949b32a0cf36fed6f3e70bb4f922

package/Detox-android/com/wix/detox/20.33.0-prerelease.0/detox-20.33.0-prerelease.0.aar.sha256

@@ -0,0 +1 @@
+189187fc397bdb111df5485b64ff7154c84ce232240594646896f11c6f433ef6

package/Detox-android/com/wix/detox/20.33.0-prerelease.0/detox-20.33.0-prerelease.0.aar.sha512

@@ -0,0 +1 @@
+3906c9b7a0dc913a2697a735819c907f62c4eb516f40e492bba0df74e54ee99927b36d5771f942e29054a94dd03c573bfed9a372756c5fcb42f0d3f0b53f85df

package/Detox-android/com/wix/detox/{20.30.0/detox-20.30.0.pom → 20.33.0-prerelease.0/detox-20.33.0-prerelease.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.30.0</version>
+  <version>20.33.0-prerelease.0</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>
@@ -84,6 +84,18 @@
       <version>2.2.0</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>androidx.test</groupId>
+      <artifactId>core-ktx</artifactId>
+      <version>1.6.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-reflect</artifactId>
+      <version>1.9.24</version>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>

package/Detox-android/com/wix/detox/20.33.0-prerelease.0/detox-20.33.0-prerelease.0.pom.md5

@@ -0,0 +1 @@
+92a1842fd8b468f7d2617fdd5818460d

package/Detox-android/com/wix/detox/20.33.0-prerelease.0/detox-20.33.0-prerelease.0.pom.sha1

@@ -0,0 +1 @@
+53fac1636a7713666c932f139c9ee11e57e1ebc2

package/Detox-android/com/wix/detox/20.33.0-prerelease.0/detox-20.33.0-prerelease.0.pom.sha256

@@ -0,0 +1 @@
+798ac5edd34d8550949f1ccd01997146980586ba5d2ddb898f55352119dd0cdc

package/Detox-android/com/wix/detox/20.33.0-prerelease.0/detox-20.33.0-prerelease.0.pom.sha512

@@ -0,0 +1 @@
+ad694f20be729a5ee85ce82a6c40c38d00519123e4fdba9147f460ee13e5fdde200007689394e1f358f66df81951153f3b25d2f99e1d9af7c504f16e14174dcd

package/Detox-android/com/wix/detox/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.30.0</latest>
-    <release>20.30.0</release>
+    <latest>20.33.0-prerelease.0</latest>
+    <release>20.33.0-prerelease.0</release>
     <versions>
-      <version>20.30.0</version>
+      <version>20.33.0-prerelease.0</version>
     </versions>
-    <lastUpdated>20241226125215</lastUpdated>
+    <lastUpdated>20250128142241</lastUpdated>
   </versioning>
 </metadata>

package/Detox-android/com/wix/detox/maven-metadata.xml.md5

@@ -1 +1 @@
-ad324f05689fe3b7b826d7d867e84f37
+f16f4bdb9f7dde7c65d8b063da273ae1

package/Detox-android/com/wix/detox/maven-metadata.xml.sha1

@@ -1 +1 @@
-70d396df4a41cca1caf0c5ba0e61dab492278a3e
+da85452d2eeb7463aece46e69ccb689c12c06844

package/Detox-android/com/wix/detox/maven-metadata.xml.sha256

@@ -1 +1 @@
-6351eb801890ff4733ba3c301fd62b8a296193a1bfd2397dbadc61c9c80796a9
+223da53f8133c03f92bd33fc684cff73fe42cedf782a035c6e54c885a8c6cae7

package/Detox-android/com/wix/detox/maven-metadata.xml.sha512

@@ -1 +1 @@
-6c94d87a91120ce7745700afc1d1f6c53a4abfe8b9ee10111448dffed21bb204c15ff991e07b6fe63fbd4fed4d4d7030593c490f15cb223c97adb37bc8c5e306
+5537372f15749a8bc0c294de80fb75a785a209fa10e7bd897696ee58947b316c17508ab02c7160f223ebc956a9d994f2e4a448d6bab473f074b682bcda309d0c

package/android/detox/build.gradle

@@ -147,6 +147,12 @@ dependencies {
     api('androidx.test.uiautomator:uiautomator:2.2.0') {
         because 'Needed by Detox but also makes UIAutomator seamlessly provided to Detox users with hybrid apps/E2E-tests.'
     }
+    api('androidx.test:core-ktx:1.6.1') {
+        because 'Needed by Detox but also makes AndroidX test core seamlessly provided to Detox users with hybrid apps/E2E-tests.'
+    }
+    implementation("org.jetbrains.kotlin:kotlin-reflect:$_kotlinVersion") {
+        because('Needed by Detox for kotlin reflection')
+    }
 }
 
 // Third-party/extension deps.
@@ -199,7 +205,6 @@ if (rootProject.hasProperty('isOfficialDetoxLib') ||
     dependencies {
         testImplementation 'org.spekframework.spek2:spek-dsl-jvm:2.0.15'
         testImplementation 'org.spekframework.spek2:spek-runner-junit5:2.0.15'
-        testImplementation "org.jetbrains.kotlin:kotlin-reflect:$_kotlinVersion"
     }
 }
 

package/android/detox/proguard-rules-app.pro

@@ -1,10 +1,18 @@
 -keepattributes InnerClasses, Exceptions
 
+-keep class com.facebook.react.fabric.FabricUIManager { *; }
+-keep class com.facebook.react.fabric.mounting.MountItemDispatcher { *; }
 -keep class com.facebook.react.modules.** { *; }
 -keep class com.facebook.react.uimanager.** { *; }
 -keep class com.facebook.react.animated.** { *; }
 -keep class com.facebook.react.ReactApplication { *; }
 -keep class com.facebook.react.ReactNativeHost { *; }
+-keep class com.facebook.react.ReactHost { *; }
+-keep class com.facebook.react.runtime.ReactHostImpl { *; }
+-keep class com.facebook.react.runtime.BridgelessReactContext { *; }
+-keep class com.facebook.react.runtime.ReactInstance { *; }
+-keep class com.facebook.react.modules.core.JavaTimerManager { *; }
+
 -keep class com.facebook.react.ReactInstanceManager { *; }
 -keep class com.facebook.react.ReactInstanceManager** { *; }
 -keep class com.facebook.react.ReactInstanceEventListener { *; }
@@ -18,6 +26,10 @@
 -keep class com.reactnativecommunity.asyncstorage.** { *; }
 
 -keep class kotlin.reflect.** { *; }
+-keep class kotlin.KotlinVersion { *; }
+-keep class kotlin.sequences.** { *; }
+-keep class kotlin.Triple { *; }
+-keep class kotlin.properties.** { *; }
 -keep class kotlin.coroutines.CoroutineDispatcher { *; }
 -keep class kotlin.coroutines.CoroutineScope { *; }
 -keep class kotlin.coroutines.CoroutineContext { *; }

package/android/detox/src/full/java/com/wix/detox/DetoxMain.kt

@@ -47,10 +47,11 @@ object DetoxMain {
      * not by instrumentation itself, but based on the `AppWillTerminateWithError` message; In it's own, it is a good
      * thing, but for a reason we're not sure of yet, it is ignored by the test runner at this point in the flow.
      */
-    @Synchronized
     private fun launchActivityOnCue(rnHostHolder: Context, activityLaunchHelper: ActivityLaunchHelper) {
-        awaitHandshake()
-        launchActivity(rnHostHolder, activityLaunchHelper)
+        synchronized(this) {
+            awaitHandshake()
+            launchActivity(rnHostHolder, activityLaunchHelper)
+        }
     }
 
     private fun awaitHandshake() {

package/android/detox/src/full/java/com/wix/detox/reactnative/ReactApplicationExt.kt

@@ -0,0 +1,34 @@
+package com.wix.detox.reactnative
+
+import android.annotation.SuppressLint
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactInstanceManager
+import com.facebook.react.bridge.ReactContext
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
+
+
+fun ReactApplication.getInstanceManagerSafe(): ReactInstanceManager {
+    return reactNativeHost.reactInstanceManager
+        ?: throw RuntimeException("ReactInstanceManager is null!")
+}
+
+@SuppressLint("VisibleForTests")
+fun ReactApplication.getCurrentReactContext(): ReactContext? {
+    return if (isFabricEnabled()) {
+        reactHost?.currentReactContext
+    } else {
+        getInstanceManagerSafe().currentReactContext
+    }
+}
+
+fun ReactApplication.getCurrentReactContextSafe(): ReactContext {
+    return getCurrentReactContext()
+        ?: throw RuntimeException("ReactContext is null!")
+}
+
+/**
+ * A method to check if Fabric is enabled in the React Native application.
+ */
+fun isFabricEnabled(): Boolean {
+    return DefaultNewArchitectureEntryPoint.fabricEnabled
+}

package/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeExtension.kt

@@ -5,10 +5,10 @@ import android.content.Context
 import android.util.Log
 import androidx.test.platform.app.InstrumentationRegistry
 import com.facebook.react.ReactApplication
-import com.facebook.react.ReactInstanceManager
 import com.facebook.react.bridge.ReactContext
 import com.wix.detox.LaunchArgs
 import com.wix.detox.reactnative.idlingresources.ReactNativeIdlingResources
+import com.wix.detox.reactnative.reloader.ReactNativeReloaderFactory
 
 private const val LOG_TAG = "DetoxRNExt"
 
@@ -34,9 +34,9 @@ object ReactNativeExtension {
         }
 
         (applicationContext as ReactApplication).let {
-            val reactContext = awaitNewReactNativeContext(it, null)
+            awaitNewReactNativeContext(it, null)
 
-            enableOrDisableSynchronization(reactContext)
+            enableOrDisableSynchronization(it)
         }
     }
 
@@ -59,12 +59,12 @@ object ReactNativeExtension {
         (applicationContext as ReactApplication).let {
             clearIdlingResources()
 
-            val previousReactContext = getCurrentReactContextSafe(it)
+            val previousReactContext = it.getCurrentReactContext()
 
             reloadReactNativeInBackground(it)
-            val reactContext = awaitNewReactNativeContext(it, previousReactContext)
+            awaitNewReactNativeContext(it, previousReactContext)
 
-            enableOrDisableSynchronization(reactContext)
+            enableOrDisableSynchronization(it)
         }
     }
 
@@ -75,11 +75,7 @@ object ReactNativeExtension {
 
     @JvmStatic
     fun enableAllSynchronization(applicationContext: ReactApplication) {
-        val reactContext = getCurrentReactContextSafe(applicationContext)
-
-        if (reactContext != null) {
-            setupIdlingResources(reactContext)
-        }
+        setupIdlingResources(applicationContext)
     }
 
     @JvmStatic
@@ -88,7 +84,7 @@ object ReactNativeExtension {
     @JvmStatic
     fun getRNActivity(applicationContext: Context): Activity? {
         if (ReactNativeInfo.isReactNativeApp()) {
-            return getCurrentReactContextSafe(applicationContext as ReactApplication)?.currentActivity
+            return (applicationContext as ReactApplication).getCurrentReactContext()?.currentActivity
         }
         return null
     }
@@ -115,20 +111,27 @@ object ReactNativeExtension {
     }
 
     private fun reloadReactNativeInBackground(reactApplication: ReactApplication) {
-        val rnReloader = ReactNativeReLoader(InstrumentationRegistry.getInstrumentation(), reactApplication)
+        val rnReloader = ReactNativeReloaderFactory(InstrumentationRegistry.getInstrumentation(), reactApplication).create()
         rnReloader.reloadInBackground()
     }
 
-    private fun awaitNewReactNativeContext(reactApplication: ReactApplication, previousReactContext: ReactContext?): ReactContext {
-        val rnLoadingMonitor = ReactNativeLoadingMonitor(InstrumentationRegistry.getInstrumentation(), reactApplication, previousReactContext)
+    private fun awaitNewReactNativeContext(
+        reactApplication: ReactApplication,
+        previousReactContext: ReactContext?
+    ): ReactContext {
+        val rnLoadingMonitor = ReactNativeLoadingMonitor(
+            InstrumentationRegistry.getInstrumentation(),
+            reactApplication,
+            previousReactContext
+        )
         return rnLoadingMonitor.getNewContext()!!
     }
 
-    private fun enableOrDisableSynchronization(reactContext: ReactContext) {
+    private fun enableOrDisableSynchronization(reactApplication: ReactApplication) {
         if (shouldDisableSynchronization()) {
             clearAllSynchronization()
         } else {
-            setupIdlingResources(reactContext)
+            setupIdlingResources(reactApplication)
         }
     }
 
@@ -137,10 +140,10 @@ object ReactNativeExtension {
         return launchArgs.hasEnableSynchronization() && launchArgs.enableSynchronization.equals("0")
     }
 
-    private fun setupIdlingResources(reactContext: ReactContext) {
+    private fun setupIdlingResources(reactApplication: ReactApplication) {
         val launchArgs = LaunchArgs()
 
-        rnIdlingResources = ReactNativeIdlingResources(reactContext, launchArgs).apply {
+        rnIdlingResources = ReactNativeIdlingResources(reactApplication, launchArgs).apply {
             registerAll()
         }
     }
@@ -150,12 +153,4 @@ object ReactNativeExtension {
         rnIdlingResources = null
     }
 
-    private fun getInstanceManagerSafe(reactApplication: ReactApplication): ReactInstanceManager {
-        return reactApplication.reactNativeHost.reactInstanceManager
-                ?: throw RuntimeException("ReactInstanceManager is null!")
-    }
-
-    private fun getCurrentReactContextSafe(reactApplication: ReactApplication): ReactContext? {
-        return getInstanceManagerSafe(reactApplication).currentReactContext
-    }
 }

package/android/detox/src/full/java/com/wix/detox/reactnative/ReactNativeLoadingMonitor.kt

@@ -3,25 +3,22 @@ package com.wix.detox.reactnative
 import android.app.Instrumentation
 import android.util.Log
 import com.facebook.react.ReactApplication
-import com.facebook.react.ReactInstanceManager
+import com.facebook.react.ReactInstanceEventListener
 import com.facebook.react.bridge.ReactContext
+import com.facebook.react.runtime.ReactHostImpl
 import com.wix.detox.common.DetoxErrors
 import com.wix.detox.config.DetoxConfig
-import org.joor.Reflect
-import java.lang.reflect.Proxy
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 
 private const val LOG_TAG = "DetoxRNLoading"
 
-private const val REACT_INSTANCE_EVENT_LISTENER_CLASS = "com.facebook.react.ReactInstanceEventListener"
-private const val REACT_INSTANCE_EVENT_LISTENER_CLASS_COMPAT = "com.facebook.react.ReactInstanceManager\$ReactInstanceEventListener"
-
 open class ReactNativeLoadingMonitor(
-        private val instrumentation: Instrumentation,
-        private val rnApplication: ReactApplication,
-        private val previousReactContext: ReactContext?,
-        private val config: DetoxConfig = DetoxConfig.CONFIG) {
+    private val instrumentation: Instrumentation,
+    private val rnApplication: ReactApplication,
+    private val previousReactContext: ReactContext?,
+    private val config: DetoxConfig = DetoxConfig.CONFIG
+) {
     private val countDownLatch = CountDownLatch(1)
 
     fun getNewContext(): ReactContext? {
@@ -31,24 +28,21 @@ open class ReactNativeLoadingMonitor(
 
     private fun subscribeToNewRNContextUpdates() {
         instrumentation.runOnMainSync(
-                Runnable {
-                    val rnInstanceManager = rnApplication.reactNativeHost.reactInstanceManager
-                    val reactContext = rnInstanceManager.currentReactContext
-                    if (reactContext != null && reactContext !== previousReactContext) {
-                        Log.d(LOG_TAG, "Got new RN-context directly and immediately")
-                        countDownLatch.countDown()
-                        return@Runnable
-                    }
+            Runnable {
+                val reactContext = rnApplication.getCurrentReactContext()
+                if (isReactNativeLoaded(reactContext)) {
+                    Log.d(LOG_TAG, "Got new RN-context directly and immediately")
+                    countDownLatch.countDown()
+                    return@Runnable
+                }
 
-                    subscribeAsyncRNContextHandler(rnInstanceManager) {
-                        countDownLatch.countDown()
-                    }
-                })
+                subscribeAsyncRNContextHandler() {
+                    countDownLatch.countDown()
+                }
+            })
     }
 
     private fun awaitNewRNContext(): ReactContext? {
-        val rnInstanceManager = rnApplication.reactNativeHost.reactInstanceManager
-
         var i = 0
         while (true) {
             try {
@@ -58,19 +52,22 @@ open class ReactNativeLoadingMonitor(
                         // First load can take a lot of time. (packager)
                         // Loads afterwards should take less than a second.
                         throw DetoxErrors.DetoxRuntimeException(
-                                """Waited for the new RN-context for too long! (${config.rnContextLoadTimeoutSec} seconds)
+                            """Waited for the new RN-context for too long! (${config.rnContextLoadTimeoutSec} seconds)
                                   |If you think that's not long enough, consider applying a custom Detox runtime-config in DetoxTest.runTests()."""
-                                .trimMargin())
+                                .trimMargin()
+                        )
                     }
                 } else {
                     break
                 }
 
-                // Due to an ugly timing issue in RN
+                // Due to timing in RN
                 // it is possible that our listener won't be ever called
                 // That's why we have to check the reactContext regularly.
-                val reactContext = rnInstanceManager.currentReactContext
-                if (reactContext != null && reactContext !== previousReactContext) {
+                val reactContext = rnApplication.getCurrentReactContext()
+
+                // We also need to wait for rect native instance to be initialized
+                if (isReactNativeLoaded(reactContext)) {
                     Log.d(LOG_TAG, "Got new RN-context explicitly while polling (#iteration=$i)")
                     break
                 }
@@ -79,51 +76,34 @@ open class ReactNativeLoadingMonitor(
             }
         }
 
-        return rnInstanceManager.currentReactContext
+        return rnApplication.getCurrentReactContext()
     }
-}
 
-private interface DummyListenerIdentifier
-
-/**
- * This baby bridges over RN's breaking change introduced in version 0.68:
- * `ReactInstanceManager$ReactInstanceEventListener` was extracted onto a separate interface, having
- * `ReactInstanceManager.{add|remove}ReactInstanceEventLister()` changing their signature to use it, accordingly.
- *
- * This made us resort to a solution based on dynamic proxies, because - depending on RN's version (at runtime), we
- * need to dynamically decide what interface we "extend" (or actually shadow) via the proxy.
- *
- * @see RNDiff https://github.com/facebook/react-native/compare/v0.67.4..v0.68.0#diff-2f01f0cd7ff8c9ea58f12ef0eff5fa8250cad144dd5490598d80d8e9e743458aR1009
- * @see DynamicProxies https://docs.oracle.com/javase/8/docs/technotes/guides/reflection/proxy.html
- */
-private fun subscribeAsyncRNContextHandler(rnInstanceManager: ReactInstanceManager, onReactContextInitialized: () -> Any) {
-    val listenerClass = resolveListenerClass()
-    val proxyInterfaces = arrayOf(
-        listenerClass,
-        DummyListenerIdentifier::class.java // In order to be able to implement equals()
-    )
-    val listener = Proxy.newProxyInstance(listenerClass.classLoader, proxyInterfaces) { listener, method, args ->
-        Log.d(LOG_TAG, "Listener-proxy method called: ${method.name}")
-
-        val result = when (method.name) {
-            "onReactContextInitialized" -> {
-                Log.i(LOG_TAG, "Got new RN-context async'ly through listener")
-                Reflect.on(rnInstanceManager).call("removeReactInstanceEventListener", listener)
-                onReactContextInitialized()
-            }
-            "equals" -> {
-                val candidate = args[0]
-                candidate is DummyListenerIdentifier
-            }
-            else -> Any()
+    private fun isReactNativeLoaded(reactContext: ReactContext?) =
+        reactContext != null && reactContext !== previousReactContext && reactContext.hasActiveReactInstance()
+
+    private fun subscribeAsyncRNContextHandler(onReactContextInitialized: () -> Any) {
+        val isFabric = isFabricEnabled()
+        if (isFabric) {
+            // We do a casting for supporting RN 0.75 and above
+            val host = rnApplication.reactHost as ReactHostImpl?
+            host?.addReactInstanceEventListener(object : ReactInstanceEventListener {
+                override fun onReactContextInitialized(context: ReactContext) {
+                    Log.i(LOG_TAG, "Got new RN-context through listener")
+                    onReactContextInitialized()
+                    host.removeReactInstanceEventListener(this)
+                }
+            })
+        } else {
+            val rnInstanceManager = rnApplication.getInstanceManagerSafe()
+            rnInstanceManager.addReactInstanceEventListener(object : ReactInstanceEventListener {
+                override fun onReactContextInitialized(context: ReactContext) {
+                    Log.i(LOG_TAG, "Got new RN-context directly through listener")
+                    onReactContextInitialized()
+                    rnInstanceManager.removeReactInstanceEventListener(this)
+                }
+            })
         }
-
-        result
     }
-    Reflect.on(rnInstanceManager).call("addReactInstanceEventListener", listener)
 }
 
-private fun resolveListenerClass(): Class<*> {
-    val className = if (ReactNativeInfo.rnVersion().minor >= 68) REACT_INSTANCE_EVENT_LISTENER_CLASS else REACT_INSTANCE_EVENT_LISTENER_CLASS_COMPAT
-    return Class.forName(className)
-}

package/android/detox/src/full/java/com/wix/detox/reactnative/helpers/RNHelpers.kt

@@ -6,7 +6,7 @@ import com.facebook.react.bridge.ReactContext
 
 private const val LOG_TAG = "DetoxRNHelpers"
 
-object RNHelpers {
+class RNHelpers {
     fun getNativeModule(reactContext: ReactContext, className: String): NativeModule? =
         try {
             val moduleClass = Class.forName(className) as Class<NativeModule>

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/DetoxIdlingResource.kt

@@ -1,12 +1,14 @@
 package com.wix.detox.reactnative.idlingresources
 
+import androidx.annotation.VisibleForTesting
 import androidx.test.espresso.IdlingResource
 import com.wix.detox.espresso.idlingresources.DescriptiveIdlingResource
 import java.util.concurrent.atomic.AtomicBoolean
 
 abstract class DetoxIdlingResource : DescriptiveIdlingResource {
     private var callback: IdlingResource.ResourceCallback? = null
-    private var paused: AtomicBoolean = AtomicBoolean(false)
+    @VisibleForTesting
+    internal var paused: AtomicBoolean = AtomicBoolean(false)
 
     fun pause() {
         paused.set(true)
@@ -30,7 +32,7 @@ abstract class DetoxIdlingResource : DescriptiveIdlingResource {
     }
 
     open fun onUnregistered() {
-        // no-op
+        pause()
     }
 
     protected abstract fun checkIdle(): Boolean

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/ReactNativeIdlingResources.kt

@@ -5,8 +5,9 @@ import android.util.Log
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.base.IdlingResourceRegistry
-import com.facebook.react.bridge.ReactContext
+import com.facebook.react.ReactApplication
 import com.wix.detox.LaunchArgs
+import com.wix.detox.reactnative.getCurrentReactContext
 import com.wix.detox.reactnative.idlingresources.factory.DetoxIdlingResourceFactory
 import com.wix.detox.reactnative.idlingresources.factory.IdlingResourcesName
 import com.wix.detox.reactnative.idlingresources.factory.LooperName
@@ -19,9 +20,9 @@ import org.joor.Reflect
 private const val LOG_TAG = "DetoxRNIdleRes"
 
 class ReactNativeIdlingResources(
-    private val reactContext: ReactContext,
+    private val reactApplication: ReactApplication,
     private var launchArgs: LaunchArgs,
-    private val idlingResourcesFactory: DetoxIdlingResourceFactory = DetoxIdlingResourceFactory(reactContext)
+    private val idlingResourcesFactory: DetoxIdlingResourceFactory = DetoxIdlingResourceFactory(reactApplication)
 ) {
 
     private val idlingResources = mutableMapOf<IdlingResourcesName, DetoxIdlingResource>()
@@ -52,8 +53,8 @@ class ReactNativeIdlingResources(
 
     fun pauseRNTimersIdlingResource() = pauseIdlingResource(IdlingResourcesName.Timers)
     fun resumeRNTimersIdlingResource() = resumeIdlingResource(IdlingResourcesName.Timers)
-    fun pauseUIIdlingResource() = pauseIdlingResource(IdlingResourcesName.UIModule)
-    fun resumeUIIdlingResource() = resumeIdlingResource(IdlingResourcesName.UIModule)
+    fun pauseUIIdlingResource() = pauseIdlingResource(IdlingResourcesName.UI)
+    fun resumeUIIdlingResource() = resumeIdlingResource(IdlingResourcesName.UI)
 
     fun setBlacklistUrls(urlList: String) {
         setIdlingResourceBlacklist(urlList)
@@ -77,16 +78,19 @@ class ReactNativeIdlingResources(
     }
 
     private fun setupMQThreadsInterrogator(looperName: LooperName) {
-        val mqThreadsReflector = MQThreadsReflector(reactContext)
-        val looper = when (looperName) {
-            LooperName.JS -> mqThreadsReflector.getJSMQueue()?.getLooper()
-            LooperName.NativeModules -> mqThreadsReflector.getNativeModulesQueue()?.getLooper()
+        reactApplication.getCurrentReactContext()?.let {
+            val mqThreadsReflector = MQThreadsReflector(it)
+            val looper = when (looperName) {
+                LooperName.JS -> mqThreadsReflector.getJSMQueue()?.getLooper()
+                LooperName.NativeModules -> mqThreadsReflector.getNativeModulesQueue()?.getLooper()
+            }
+
+            looper?.let {
+                IdlingRegistry.getInstance().registerLooperAsIdlingResource(it)
+                loopers[looperName] = it
+            }
         }
 
-        looper?.let {
-            IdlingRegistry.getInstance().registerLooperAsIdlingResource(it)
-            loopers[looperName] = it
-        }
     }
 
     private suspend fun setupIdlingResources() {

package/android/detox/src/full/java/com/wix/detox/reactnative/idlingresources/animations/AnimatedModuleIdlingResource.kt

@@ -53,9 +53,12 @@ class AnimatedModuleIdlingResource(private val reactContext: ReactContext) : Det
         Choreographer.getInstance().postFrameCallback(this)
     }
 
+    override fun onUnregistered() {
+        super.onUnregistered()
+        Choreographer.getInstance().removeFrameCallback(this)
+    }
+
     override fun doFrame(frameTimeNanos: Long) {
         isIdleNow
     }
 }
-
-