From dcf287d9ac8bafbb142bd4abfc0f57f7a9670696 Mon Sep 17 00:00:00 2001
From: Tyler Hackett <thackett86181@gmail.com>
Date: Mon, 26 Aug 2024 12:12:26 -0700
Subject: [PATCH] Qa remove reuse app state (#1501)

---
 bitrise.yml                                   |  2 +-
 .../e2e/configs/reuseStateConfig.json         |  2 +-
 .../core-mobile/e2e/pages/swapTab.page.ts     | 19 +++++++++++--------
 .../detox/androidInternalE2eReuseAppState.sh  |  4 ++--
 .../bitrise/triggerIosInternalBuild.sh        |  5 +++--
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/bitrise.yml b/bitrise.yml
index 3637966db1..906d856ade 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -580,7 +580,7 @@ workflows:
     steps:
     - avd-manager@1.2:
         inputs:
-        - api_level: "30"
+        - api_level: "34"
         - emulator_id: emulator-5554
         - emulator_channel: "0"
         - create_command_flags: --sdcard 512M
diff --git a/packages/core-mobile/e2e/configs/reuseStateConfig.json b/packages/core-mobile/e2e/configs/reuseStateConfig.json
index 93d29628d0..ce290a92a4 100644
--- a/packages/core-mobile/e2e/configs/reuseStateConfig.json
+++ b/packages/core-mobile/e2e/configs/reuseStateConfig.json
@@ -2,7 +2,7 @@
   "maxWorkers": 1,
   "testEnvironment": "detox/runners/jest/testEnvironment",
   "testRunner": "jest-circus/runner",
-  "testTimeout": 180000,
+  "testTimeout": 9999999,
   "rootDir": "..",
   "testMatch": [
     "<rootDir>/tests/**/*.e2e.ts",
diff --git a/packages/core-mobile/e2e/pages/swapTab.page.ts b/packages/core-mobile/e2e/pages/swapTab.page.ts
index 11d5219056..a39c4630e3 100644
--- a/packages/core-mobile/e2e/pages/swapTab.page.ts
+++ b/packages/core-mobile/e2e/pages/swapTab.page.ts
@@ -1,6 +1,7 @@
 import Actions from '../helpers/actions'
 import Assert from '../helpers/assertions'
 import { Platform } from '../helpers/constants'
+import delay from '../helpers/waits'
 import swapTab from '../locators/swapTab.loc'
 import bottomTabsPage from './bottomTabs.page'
 import plusMenuPage from './plusMenu.page'
@@ -37,6 +38,10 @@ class SwapTabPage {
     return by.id(swapTab.reviewOrderBtn)
   }
 
+  get disabledReviewOrderBtn() {
+    return by.id(swapTab.disabledReviewOrderBtn)
+  }
+
   get approveBtn() {
     return by.id(swapTab.approveBtn)
   }
@@ -61,16 +66,13 @@ class SwapTabPage {
     await Actions.tapElementAtIndex(this.selectTokenDropdown, 0)
   }
 
-  async reviewOrderButton() {
-    await Actions.tapElementAtIndex(this.reviewOrderBtn, 0)
-  }
-
-  async waitForReviewOrderBtnEnabled() {
-    await Actions.waitForElement(this.reviewOrderBtn, 5000)
+  async reviewOrderButton(index = 0) {
+    await Actions.tapElementAtIndex(this.reviewOrderBtn, index)
   }
 
   async tapApproveButton() {
-    await Actions.waitForElement(this.approveBtn, 5000)
+    await Actions.waitForElement(this.approveBtn, 10000)
+    delay(2000)
     await Actions.tapElementAtIndex(this.approveBtn, 0)
   }
 
@@ -109,8 +111,9 @@ class SwapTabPage {
     await this.inputTokenAmount(amount)
     await this.tapSelectTokenDropdown()
     await sendPage.selectToken(to)
-    await this.waitForReviewOrderBtnEnabled()
+    await delay(5000)
     await this.reviewOrderButton()
+    await Actions.waitForElement(this.approveBtn, 10000, 1)
     await this.tapApproveButton()
   }
 }
diff --git a/packages/core-mobile/scripts/bitrise/detox/androidInternalE2eReuseAppState.sh b/packages/core-mobile/scripts/bitrise/detox/androidInternalE2eReuseAppState.sh
index 8c4baa2717..f3d56fe6ba 100644
--- a/packages/core-mobile/scripts/bitrise/detox/androidInternalE2eReuseAppState.sh
+++ b/packages/core-mobile/scripts/bitrise/detox/androidInternalE2eReuseAppState.sh
@@ -14,10 +14,10 @@ echo "IS_REGRESSION_RUN should be true: $IS_REGRESSION_RUN"
 
 if (($IS_REGRESSION_RUN=='true')); then
   ./node_modules/.bin/detox test --listTests --configuration android.internal.release.regression.ci
-  QT_QPA_PLATFORM=xcb; ./node_modules/.bin/detox test --configuration android.internal.release.regression.ci --headless --reuse; test_result=$?
+  QT_QPA_PLATFORM=xcb; ./node_modules/.bin/detox test --configuration android.internal.release.regression.ci --headless; test_result=$?
 else
   ./node_modules/.bin/detox test --listTests --configuration android.internal.release.smoke.reuse_state.ci 
-  QT_QPA_PLATFORM=xcb; ./node_modules/.bin/detox test --configuration android.internal.release.smoke.reuse_state.ci --headless --reuse; test_result=$?
+  QT_QPA_PLATFORM=xcb; ./node_modules/.bin/detox test --configuration android.internal.release.smoke.reuse_state.ci --headless; test_result=$?
 fi
 
 npx ts-node ./e2e/attachLogsSendResultsToTestrail.ts
diff --git a/packages/core-mobile/scripts/bitrise/triggerIosInternalBuild.sh b/packages/core-mobile/scripts/bitrise/triggerIosInternalBuild.sh
index 26a868345b..e1fd89ef18 100644
--- a/packages/core-mobile/scripts/bitrise/triggerIosInternalBuild.sh
+++ b/packages/core-mobile/scripts/bitrise/triggerIosInternalBuild.sh
@@ -6,8 +6,9 @@ PIPELINE=$(
   -H 'Content-Type: application/json' \
   -d '{
   "build_params": {
-    "branch": "main",
-    "pipeline_id": "build-ios-apps-internal-triggered-e2e"
+    "branch": $BITRISE_GIT_BRANCH,
+    "pipeline_id": "build-ios-apps-internal-triggered-e2e",
+    "commit_message": $GIT_CLONE_COMMIT_MESSAGE_SUBJECT,
   },
   "hook_info": {
     "type": "bitrise"