From 53623ba04a790f9643014b8680a1a41449c42454 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Tue, 28 Jan 2025 12:41:42 -0700
Subject: [PATCH] Use new npm command and fastfile

---
 .github/workflows/verifyHybridApp.yml | 11 +----------
 fastlane/Fastfile                     | 10 ++++++++--
 package.json                          |  1 +
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index 80211d83a71c..7827bd9f6553 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -124,16 +124,7 @@ jobs:
           export RCT_NO_LAUNCH_PACKAGER=1
           
           # Build iOS using xcodebuild
-          if ! xcodebuild \
-            -workspace Mobile-Expensify/iOS/Expensify.xcworkspace \
-            -scheme Expensify \
-            -configuration Debug \
-            -sdk iphonesimulator \
-            -arch x86_64 \
-            CODE_SIGN_IDENTITY="" \
-            CODE_SIGNING_REQUIRED=NO \
-            CODE_SIGNING_ALLOWED=NO \
-            build | xcpretty 
+          if ! npm run ios-hybrid-build
           then
             echo "❌ iOS HybridApp failed to build: Please reach out to Contributor+ and/or Expensify engineers for help in #expensify-open-source to resolve."
             exit 1
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 806ffe574031..a36f0e30b6b5 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -458,7 +458,10 @@ platform :ios do
     ENV["ENVFILE"]=".env.production"
     build_app(
         workspace: "./ios/NewExpensify.xcworkspace",
-        scheme: "New Expensify"
+        scheme: "New Expensify",
+        configuration: "Debug",
+        sdk: "iphonesimulator",
+        skip_codesigning: true
     )
     setIOSBuildOutputsInEnv()
   end
@@ -468,7 +471,10 @@ platform :ios do
       ENV["ENVFILE"]="./Mobile-Expensify/.env.production.hybridapp.ios"
       build_app(
           workspace: "./Mobile-Expensify/iOS/Expensify.xcworkspace",
-          scheme: "Expensify"
+          scheme: "Expensify",
+          configuration: "Debug",
+          sdk: "iphonesimulator",
+          skip_codesigning: true
       )
       setIOSBuildOutputsInEnv()
     end
diff --git a/package.json b/package.json
index 43c38ed9b904..d87a3319f608 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
     "detectRedirectCycle": "ts-node .github/scripts/detectRedirectCycle.ts",
     "desktop-build-adhoc": "./scripts/build-desktop.sh adhoc",
     "ios-build": "bundle exec fastlane ios build_unsigned",
+    "ios-hybrid-build": "bundle exec fastlane ios build_unsigned_hybrid",
     "android-build": "bundle exec fastlane android build_local",
     "test": "TZ=utc NODE_OPTIONS=--experimental-vm-modules jest",
     "perf-test": "NODE_OPTIONS=--experimental-vm-modules npx reassure",