Fixes after PR

Author: gosha212

e2e/Utils.js

@@ -64,18 +64,15 @@ const utils = {
 
   },
   expectImagesToBeNotEqual: (imagePath, expectedImagePath) => {
-    let isDifferent = false;
     try {
       bitmapDiff(imagePath, expectedImagePath);
     } catch (error) {
-      isDifferent = true;
+      return
     }
 
-    if (!isDifferent) {
-      throw new Error(
-        `Expected bitmaps at '${imagePath}' and '${expectedImagePath}' to be different`,
-      );
-    }
+    throw new Error(
+      `Expected bitmaps at '${imagePath}' and '${expectedImagePath}' to be different`,
+    );
   },
 };
 

lib/android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -53,7 +53,7 @@ public void onCreate() {
      * @return a singleton {@link ReactGateway}
      */
 	protected ReactGateway createReactGateway() {
-	    return new ReactGateway(getReactHost(), getReactNativeHost().getUseDeveloperSupport());
+	    return new ReactGateway(getReactHost(), getReactNativeHost());
     }
 
 	public ReactGateway getReactGateway() {

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationReactInitializer.java

@@ -37,22 +37,15 @@ void onActivityResumed(NavigationActivity activity) {
 
     void onActivityPaused(NavigationActivity activity) {
         isActivityReadyForUi = false;
-        // TODO: Check it needed
-        //if (reactHost.hasStartedCreatingInitialContext()) {
         reactHost.onHostPause(activity);
-        //}
     }
 
     void onActivityDestroyed(NavigationActivity activity) {
         reactHost.removeReactInstanceEventListener(this);
-        //if (reactHost.gehasStartedCreatingInitialContext()) {
         reactHost.onHostDestroy(activity);
-        //}
     }
 
     private void prepareReactApp() {
-        // TODO: Check if needed
-        //if (shouldCreateContext()) {
         reactHost.start();
         if (waitingForAppLaunchEvent) {
             if (reactHost.getCurrentReactContext() != null) {

lib/android/app/src/reactNative71/java/com/reactnativenavigation/react/ReactGateway.java

@@ -12,28 +12,28 @@
 
 public class ReactGateway {
 
-	private final ReactHost host;
-	private final NavigationReactInitializer initializer;
-	private final JsDevReloadHandler jsDevReloadHandler;
+    private final ReactHost host;
+    private final NavigationReactInitializer initializer;
+    private final JsDevReloadHandler jsDevReloadHandler;
 
-    public ReactGateway(ReactHost host, boolean isDebug) {
+    public ReactGateway(ReactHost host, ReactNativeHost reactNativeHost) {
         this.host = host;
-        initializer = new NavigationReactInitializer(host, isDebug);
+        initializer = new NavigationReactInitializer(host, reactNativeHost.getUseDeveloperSupport());
         jsDevReloadHandler = new JsDevReloadHandler(host.getDevSupportManager());
         if (host instanceof BundleDownloadListenerProvider) {
             ((BundleDownloadListenerProvider) host).setBundleLoaderListener(jsDevReloadHandler);
         }
     }
 
-	public void onActivityCreated(NavigationActivity activity) {
-		initializer.onActivityCreated();
+    public void onActivityCreated(NavigationActivity activity) {
+        initializer.onActivityCreated();
         jsDevReloadHandler.setReloadListener(activity);
-	}
+    }
 
-	public void onActivityResumed(NavigationActivity activity) {
-		initializer.onActivityResumed(activity);
-		jsDevReloadHandler.onActivityResumed(activity);
-	}
+    public void onActivityResumed(NavigationActivity activity) {
+        initializer.onActivityResumed(activity);
+        jsDevReloadHandler.onActivityResumed(activity);
+    }
 
     public boolean onNewIntent(Intent intent) {
         if (host.getCurrentReactContext() != null) {
@@ -47,22 +47,22 @@ public void onConfigurationChanged(NavigationActivity activity, @NonNull Configu
         host.onConfigurationChanged(activity);
     }
 
-	public void onActivityPaused(NavigationActivity activity) {
-		initializer.onActivityPaused(activity);
-		jsDevReloadHandler.onActivityPaused(activity);
-	}
+    public void onActivityPaused(NavigationActivity activity) {
+        initializer.onActivityPaused(activity);
+        jsDevReloadHandler.onActivityPaused(activity);
+    }
 
-	public void onActivityDestroyed(NavigationActivity activity) {
+    public void onActivityDestroyed(NavigationActivity activity) {
         jsDevReloadHandler.removeReloadListener(activity);
-		initializer.onActivityDestroyed(activity);
-	}
+        initializer.onActivityDestroyed(activity);
+    }
 
-	public boolean onKeyUp(Activity activity, int keyCode) {
-		return jsDevReloadHandler.onKeyUp(activity, keyCode);
-	}
+    public boolean onKeyUp(Activity activity, int keyCode) {
+        return jsDevReloadHandler.onKeyUp(activity, keyCode);
+    }
 
     public void onBackPressed() {
-	    host.onBackPressed();
+        host.onBackPressed();
     }
 
     public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {

package-lock.json

@@ -98,7 +98,7 @@
     "@typescript-eslint/parser": "8.21.0",
     "babel-jest": "^27.0.0",
     "clang-format": "^1.4.0",
-    "detox": "20.33.0-prerelease.0",
+    "detox": "20.34.4",
     "detox-testing-library-rnn-adapter": "^2.0.3",
     "eslint": "^8.19.0",
     "eslint-config-prettier": "6.11.0",

package.json

@@ -11,13 +11,9 @@ if (isWindows) runWin32();
 else run();
 
 function run() {
-  //exec.killPort(8081);
-  //exec.execSync(`watchman watch-del-all || true`);
-  //exec.execSync(`adb reverse tcp:8081 tcp:8081 || true`);
   exec.execSync(`react-native start --sourceExts ${sourceExts}`);
 }
 
 function runWin32() {
-  //exec.execSync(`adb reverse tcp:8081 tcp:8081`);
   exec.execSync(`react-native start --sourceExts ${sourceExts}`);
 }