revert: bad merge

Author: montelaidev

bitrise.yml

@@ -1493,6 +1493,20 @@ workflows:
       bitrise.io:
         stack: linux-docker-android-22.04
         machine_type_id: elite-xl
+  build_android_flask_devbuild:
+    envs:
+      - IS_DEV_BUILD: 'true'
+      - METAMASK_BUILD_TYPE: 'flask'
+      - METAMASK_ENVIRONMENT: 'debug'
+      - NAME: $FLASK_VERSION_NAME
+      - NUMBER: $FLASK_VERSION_NUMBER
+      - APP_NAME: 'flask'
+    after_run:
+      - _android_build_template
+    meta:
+      bitrise.io:
+        stack: linux-docker-android-22.04
+        machine_type_id: elite-xl
   build_android_qa:
       before_run:
         - code_setup
@@ -1834,7 +1848,11 @@ workflows:
                 echo 'This is the current build type: $METAMASK_BUILD_TYPE'
                 if [ "$IS_DEV_BUILD" = "true" ]; then #EXPO BUILD
                     if [ "$IS_SIM_BUILD" = "true" ]; then
+                      if [ "$METAMASK_BUILD_TYPE" = "flask" ]; then
+                        GIT_BRANCH=$BITRISE_GIT_BRANCH yarn start:ios:e2e:flask
+                      else
                         GIT_BRANCH=$BITRISE_GIT_BRANCH yarn start:ios:e2e
+                      fi
                     else
                         GIT_BRANCH=$BITRISE_GIT_BRANCH yarn build:ios:devbuild
                     fi
@@ -1970,6 +1988,29 @@ workflows:
       - INFO_PLIST_NAME: 'Info.plist'
     after_run:
       - _ios_build_template
+  build_ios_flask_devbuild:
+    envs:
+      - IS_DEV_BUILD: 'true'
+      - METAMASK_BUILD_TYPE: 'flask'
+      - METAMASK_ENVIRONMENT: 'debug'
+      - NAME: $FLASK_VERSION_NAME
+      - NUMBER: $FLASK_VERSION_NUMBER
+      - APP_NAME: "MetaMask-Flask"
+      - INFO_PLIST_NAME: "MetaMask-Flask-Info.plist"
+    after_run:
+      - _ios_build_template
+  build_ios_flask_simbuild:
+    envs:
+      - IS_SIM_BUILD: 'true'
+      - IS_DEV_BUILD: 'true'
+      - METAMASK_BUILD_TYPE: 'flask'
+      - METAMASK_ENVIRONMENT: 'debug'
+      - NAME: $FLASK_VERSION_NAME
+      - NUMBER: $FLASK_VERSION_NUMBER
+      - APP_NAME: "MetaMask-Flask"
+      - INFO_PLIST_NAME: "MetaMask-Flask-Info.plist"
+    after_run:
+      - _ios_build_template
   build_ios_qa:
     envs:
       - NO_FLIPPER: '1'
@@ -2174,75 +2215,6 @@ workflows:
           inputs:
             - deploy_path: browserstack_uploaded_flask_apps.json
           title: Bitrise Deploy Browserstack Uploaded Flask Apps
-  build_android_flask_release:
-    before_run:
-      - code_setup
-    after_run:
-      - notify_failure
-    steps:
-      - change-android-versioncode-and-versionname@1:
-          inputs:
-            - new_version_name: $FLASK_VERSION_NAME
-            - new_version_code: $FLASK_VERSION_NUMBER
-            - build_gradle_path: $PROJECT_LOCATION_ANDROID/app/build.gradle
-      - file-downloader@1:
-          inputs:
-            - source: $BITRISEIO_ANDROID_FLASK_KEYSTORE_URL_URL
-            - destination: android/keystores/flaskRelease.keystore
-      - restore-gradle-cache@2: {}
-      - install-missing-android-tools@3:
-          inputs:
-            - ndk_revision: $NDK_VERSION
-            - gradlew_path: $PROJECT_LOCATION/gradlew
-
-      - script@1:
-          inputs:
-            - content: |-
-                #!/usr/bin/env bash
-                node -v
-                METAMASK_BUILD_TYPE='flask' METAMASK_ENVIRONMENT='production' yarn build:android:pre-release:bundle:flask
-          title: Build Android Pre-Release Bundle
-          is_always_run: false
-      - save-gradle-cache@1: {}
-      - [email protected]:
-          is_always_run: false
-          is_skippable: true
-          inputs:
-            - pipeline_intermediate_files: $PROJECT_LOCATION/app/build/outputs/apk/flask/release/app-flask-release.apk:BITRISE_PLAY_STORE_APK_PATH
-            - deploy_path: $PROJECT_LOCATION/app/build/outputs/apk/flask/release/app-flask-release.apk
-          title: Bitrise Deploy APK
-      - [email protected]:
-          is_always_run: false
-          is_skippable: true
-          inputs:
-            - pipeline_intermediate_files: $PROJECT_LOCATION/app/build/outputs/apk/flask/release/sha512sums.txt:BITRISE_PLAY_STORE_SHA512SUMS_PATH
-            - deploy_path: $PROJECT_LOCATION/app/build/outputs/apk/flask/release/sha512sums.txt
-          title: Bitrise Deploy Checksum
-      - [email protected]:
-          is_always_run: false
-          is_skippable: true
-          inputs:
-            - pipeline_intermediate_files: $PROJECT_LOCATION/app/build/outputs/mapping/flaskRelease/mapping.txt:BITRISE_PLAY_STORE_MAPPING_PATH
-            - deploy_path: $PROJECT_LOCATION/app/build/outputs/mapping/flaskRelease/mapping.txt
-          title: Bitrise ProGuard Map Files
-      - [email protected]:
-          is_always_run: false
-          is_skippable: true
-          inputs:
-            - pipeline_intermediate_files: $PROJECT_LOCATION/app/build/outputs/bundle/flaskRelease/app-flask-release.aab:BITRISE_PLAY_STORE_ABB_PATH
-            - deploy_path: $PROJECT_LOCATION/app/build/outputs/bundle/flaskRelease/app-flask-release.aab
-          title: Bitrise Deploy AAB
-      - [email protected]:
-          is_always_run: false
-          is_skippable: true
-          inputs:
-            - pipeline_intermediate_files: /bitrise/src/sourcemaps/android/index.js.map:BITRISE_PLAY_STORE_SOURCEMAP_PATH
-            - deploy_path: sourcemaps/android/index.js.map
-          title: Bitrise Deploy Sourcemaps
-    meta:
-      bitrise.io:
-        stack: linux-docker-android-22.04
-        machine_type_id: elite-xl
 app:
   envs:
     - opts:
@@ -2335,7 +2307,7 @@ app:
 meta:
   bitrise.io:
     stack: osx-xcode-16.2.x
-    machine_type_id: g2.mac.large
+    machine_type_id: g2.mac.4large
 trigger_map:
   - push_branch: release/*
     pipeline: pr_regression_e2e_pipeline

package.json

@@ -26,6 +26,7 @@
     "start:ios:qa": "./scripts/build.sh ios qaDebug",
     "start:ios:e2e": "./scripts/build.sh ios debugE2E",
     "start:ios:e2e:qa": "./scripts/build.sh ios qadebugE2E",
+    "start:ios:e2e:flask": "./scripts/build.sh ios flaskDebugE2E",
     "start:ios:device": "./scripts/build.sh ios debug --device",
     "start:ios:flask": "export METAMASK_BUILD_TYPE='flask' && ./scripts/build.sh ios flaskDebug",
     "start:android": "./scripts/build.sh android debug",

scripts/build.sh

@@ -296,8 +296,6 @@ buildIosSimulatorQA(){
 buildIosSimulatorFlask(){
 	prebuild_ios
 	SIM="${IOS_SIMULATOR:-"iPhone 13 Pro"}"
-
-	#react-native run-ios --port=$WATCHER_PORT --simulator "$SIM" --scheme "MetaMask-Flask"
 	npx expo run:ios --no-install --configuration Debug --port $WATCHER_PORT --device "$SIM" --scheme "MetaMask-Flask"
 }
 
@@ -306,6 +304,11 @@ buildIosSimulatorE2E(){
 	cd ios && CC=clang CXX=clang CLANG=clang CLANGPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ xcodebuild -workspace MetaMask.xcworkspace -scheme MetaMask -configuration Debug -sdk iphonesimulator -derivedDataPath build
 }
 
+buildIosFlaskSimulatorE2E(){
+	prebuild_ios
+	cd ios && CC=clang CXX=clang CLANG=clang CLANGPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ xcodebuild -workspace MetaMask.xcworkspace -scheme MetaMask-Flask -configuration Debug -sdk iphonesimulator -derivedDataPath build
+}
+
 buildIosQASimulatorE2E(){
 	prebuild_ios
 	cd ios && xcodebuild -workspace MetaMask.xcworkspace -scheme MetaMask-QA -configuration Debug -sdk iphonesimulator -derivedDataPath build
@@ -318,20 +321,16 @@ runIosE2E(){
 buildIosDevice(){
 	remapEnvVariableLocal
 	prebuild_ios
-	#react-native run-ios --port=$WATCHER_PORT --device
 	npx expo run:ios --no-install --configuration Debug --port $WATCHER_PORT --device
 }
 
 buildIosDeviceQA(){
 	prebuild_ios
-	#react-native run-ios --port=$WATCHER_PORT --device --scheme "MetaMask-QA"
-
 	npx expo run:ios --no-install --port $WATCHER_PORT --configuration Debug --scheme "MetaMask-QA" --device
 }
 
 buildIosDeviceFlask(){
 	prebuild_ios
-	#react-native run-ios --device --scheme "MetaMask-Flask"
 	npx expo run:ios --no-install --configuration Debug --scheme "MetaMask-Flask" --device
 }
 
@@ -582,10 +581,12 @@ buildIos() {
 		buildIosFlaskRelease
 	elif [ "$MODE" == "releaseE2E" ] ; then
 		buildIosReleaseE2E
-  elif [ "$MODE" == "debugE2E" ] ; then
-		buildIosSimulatorE2E
-  elif [ "$MODE" == "qadebugE2E" ] ; then
-		buildIosQASimulatorE2E
+	elif [ "$MODE" == "debugE2E" ] ; then
+			buildIosSimulatorE2E
+	elif [ "$MODE" == "qadebugE2E" ] ; then
+			buildIosQASimulatorE2E
+	elif [ "$MODE" == "flaskDebugE2E" ] ; then
+			buildIosFlaskSimulatorE2E	
 	elif [ "$MODE" == "QA" ] ; then
 		buildIosQA
 	elif [ "$MODE" == "qaDebug" ] ; then