From f120282465d60feb7cfad45d3a32d1472639261f Mon Sep 17 00:00:00 2001
From: Joseph Baylon <joseph.baylon@mattermost.com>
Date: Wed, 14 Dec 2022 12:54:49 -0800
Subject: [PATCH] Detox/E2E: Fix android detox build and upgrade simulator to
 iPhone 14 (#6864)

* Detox/E2E: Fix android detox build

* Upgrade to sim iPhone 14
---
 .../java/com/mattermost/rnbeta/DetoxTest.java          | 10 ++++++----
 detox/.detoxrc.json                                    |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/android/app/src/androidTest/java/com/mattermost/rnbeta/DetoxTest.java b/android/app/src/androidTest/java/com/mattermost/rnbeta/DetoxTest.java
index 220be5e4a7..dfc645da84 100644
--- a/android/app/src/androidTest/java/com/mattermost/rnbeta/DetoxTest.java
+++ b/android/app/src/androidTest/java/com/mattermost/rnbeta/DetoxTest.java
@@ -1,6 +1,7 @@
 package com.mattermost.rnbeta;
 
 import com.wix.detox.Detox;
+import com.wix.detox.config.DetoxConfig;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -19,10 +20,11 @@ public class DetoxTest {
 
     @Test
     public void runDetoxTests() {
-        Detox.DetoxIdlePolicyConfig idlePolicyConfig = new Detox.DetoxIdlePolicyConfig();
-        idlePolicyConfig.masterTimeoutSec = 60;
-        idlePolicyConfig.idleResourceTimeoutSec = 30;
+        DetoxConfig detoxConfig = new DetoxConfig();
+        detoxConfig.idlePolicyConfig.masterTimeoutSec = 90;
+        detoxConfig.idlePolicyConfig.idleResourceTimeoutSec = 60;
+        detoxConfig.rnContextLoadTimeoutSec = (BuildConfig.DEBUG ? 180 : 60);
 
-        Detox.runTests(mActivityRule, idlePolicyConfig);
+        Detox.runTests(mActivityRule, detoxConfig);
     }
 }
diff --git a/detox/.detoxrc.json b/detox/.detoxrc.json
index 2f006892d7..fb7bc86c14 100644
--- a/detox/.detoxrc.json
+++ b/detox/.detoxrc.json
@@ -30,7 +30,7 @@
     "ios.simulator": {
       "type": "ios.simulator",
       "device": {
-        "type": "iPhone 13"
+        "type": "iPhone 14"
       }
     },
     "android.emulator": {