From 27a285151065760b31243c30b6e2439aae0dc71c Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 27 Jan 2025 11:41:03 -0700
Subject: [PATCH 01/23] Update code, add debug

---
 .github/workflows/verifyHybridApp.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index b3db2c37d4d7..3cfa31ee441c 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -1,7 +1,6 @@
 name: Verify HybridApp build
 
 on:
-  workflow_call:
   pull_request:
     types: [opened, synchronize]
     branches-ignore: [staging, production]
@@ -18,6 +17,8 @@ on:
       - 'android/AndroidManifest.xml'
       - 'ios/Podfile.lock'
       - 'ios/project.pbxproj'
+      # TODO: Remove, just here for debugging
+      - '*.yml'
 
 concurrency:
   group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-verify-main
@@ -34,12 +35,11 @@ jobs:
           submodules: true
           ref: ${{ github.event.pull_request.head.sha }}
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
-          # fetch-depth: 0 is required in order to fetch the correct submodule branch
-          fetch-depth: 0
 
       - name: Update submodule to match main
         run: |
           git submodule update --init --remote
+          cd Mobile-Expensify
           git fetch
           git checkout main
 
@@ -71,12 +71,11 @@ jobs:
           submodules: true
           ref: ${{ github.event.pull_request.head.sha }}
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
-          # fetch-depth: 0 is required in order to fetch the correct submodule branch
-          fetch-depth: 0
 
       - name: Update submodule to match main
         run: |
           git submodule update --init --remote
+          cd Mobile-Expensify
           git fetch
           git checkout main
 

From 463e3ebb2db96317081273fe3c1dc4fbdd418559 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 27 Jan 2025 11:42:21 -0700
Subject: [PATCH 02/23] Tweak debug

---
 .github/workflows/verifyHybridApp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index 3cfa31ee441c..80211d83a71c 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -18,7 +18,7 @@ on:
       - 'ios/Podfile.lock'
       - 'ios/project.pbxproj'
       # TODO: Remove, just here for debugging
-      - '*.yml'
+      - '**.yml'
 
 concurrency:
   group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-verify-main

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 03/23] 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",

From b4e188cc1feab0dd62b3e2f244d3e1dee1f9c925 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Tue, 28 Jan 2025 14:30:58 -0700
Subject: [PATCH 04/23] Add Android script too

---
 .github/workflows/verifyHybridApp.yml | 2 +-
 fastlane/Fastfile                     | 6 +++---
 package.json                          | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index 7827bd9f6553..2bfff47ccf80 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -55,7 +55,7 @@ jobs:
       - name: Build Android Debug
         working-directory: Mobile-Expensify/Android
         run: |
-          if ! ./gradlew assembleDebug
+          if ! npm run android-hybrid-build
           then
             echo "❌ Android 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 76e11d2a9664..462062383e3f 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -120,8 +120,7 @@ platform :android do
       gradle(
         project_dir: 'Mobile-Expensify/Android',
         task: 'assemble',
-        flavor: 'Production',
-        build_type: 'Release',
+        build_type: 'Debug',
       )
       setGradleOutputsInEnv()
     end
@@ -474,7 +473,8 @@ platform :ios do
           scheme: "Expensify",
           configuration: "Debug",
           sdk: "iphonesimulator",
-          skip_codesigning: true
+          skip_codesigning: true,
+          export_method: "development"
       )
       setIOSBuildOutputsInEnv()
     end
diff --git a/package.json b/package.json
index 08bbd87247d2..6fdf38ed69ec 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "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",
+    "android-hybrid-build": "bundle exec fastlane android build_local_hybrid",
     "test": "TZ=utc NODE_OPTIONS=--experimental-vm-modules jest",
     "perf-test": "NODE_OPTIONS=--experimental-vm-modules npx reassure",
     "typecheck": "NODE_OPTIONS=--max_old_space_size=8192 tsc",

From e7a0759478c5f7deb8b3fb57e97de5b1564520da Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 11:59:52 -0800
Subject: [PATCH 05/23] Add env for forked PRs

---
 .github/workflows/verifyHybridApp.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index 2bfff47ccf80..f535eba19986 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -20,6 +20,9 @@ on:
       # TODO: Remove, just here for debugging
       - '**.yml'
 
+env:
+  IS_PR_FROM_FORK: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork }}
+
 concurrency:
   group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-verify-main
   cancel-in-progress: true
@@ -28,6 +31,7 @@ jobs:
   verify_android:
     name: Verify Android HybridApp builds on main
     runs-on: ubuntu-latest-xl
+    if: env.IS_PR_FROM_FORK == 'true'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -64,6 +68,7 @@ jobs:
   verify_ios:
     name: Verify iOS HybridApp builds on main
     runs-on: macos-15-xlarge
+    if: env.IS_PR_FROM_FORK == 'true'
     steps:
       - name: Checkout
         uses: actions/checkout@v4

From 13bbac4ce094e9a9111778f52872f3e68fc6eb2c Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 12:07:21 -0800
Subject: [PATCH 06/23] Try no env to fix env

---
 .github/workflows/verifyHybridApp.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index f535eba19986..ca66ee2f84c0 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -31,7 +31,7 @@ jobs:
   verify_android:
     name: Verify Android HybridApp builds on main
     runs-on: ubuntu-latest-xl
-    if: env.IS_PR_FROM_FORK == 'true'
+    if: IS_PR_FROM_FORK == 'true'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -68,7 +68,7 @@ jobs:
   verify_ios:
     name: Verify iOS HybridApp builds on main
     runs-on: macos-15-xlarge
-    if: env.IS_PR_FROM_FORK == 'true'
+    if: IS_PR_FROM_FORK == 'true'
     steps:
       - name: Checkout
         uses: actions/checkout@v4

From d7bef9d402fd11c62f11c73201d29c198b3eda55 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 12:08:56 -0800
Subject: [PATCH 07/23] Remove env and use if directly

---
 .github/workflows/verifyHybridApp.yml | 7 ++-----
 Mobile-Expensify                      | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index ca66ee2f84c0..35b58baba104 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -20,9 +20,6 @@ on:
       # TODO: Remove, just here for debugging
       - '**.yml'
 
-env:
-  IS_PR_FROM_FORK: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork }}
-
 concurrency:
   group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-verify-main
   cancel-in-progress: true
@@ -31,7 +28,7 @@ jobs:
   verify_android:
     name: Verify Android HybridApp builds on main
     runs-on: ubuntu-latest-xl
-    if: IS_PR_FROM_FORK == 'true'
+    if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -68,7 +65,7 @@ jobs:
   verify_ios:
     name: Verify iOS HybridApp builds on main
     runs-on: macos-15-xlarge
-    if: IS_PR_FROM_FORK == 'true'
+    if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/Mobile-Expensify b/Mobile-Expensify
index cda178a7a269..10beb38304d3 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit cda178a7a269e241e0f5104bb9aaaba2b1052908
+Subproject commit 10beb38304d35ee86b948f64afcdf49d51ab3d4a

From fed9f59447cfd4cf3e7273aa28f65c31170f62ef Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 12:16:32 -0800
Subject: [PATCH 08/23] Fix logic

---
 .github/workflows/verifyHybridApp.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index 35b58baba104..d5d6935af38b 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -28,7 +28,8 @@ jobs:
   verify_android:
     name: Verify Android HybridApp builds on main
     runs-on: ubuntu-latest-xl
-    if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork }}
+    # Only run on pull requests that are not on a fork
+    if: ${{ github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -65,7 +66,8 @@ jobs:
   verify_ios:
     name: Verify iOS HybridApp builds on main
     runs-on: macos-15-xlarge
-    if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork }}
+    # Only run on pull requests that are not on a fork
+    if: ${{ github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4

From 88b52852161d0831ffd52f133b407fd4c79b2979 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 12:26:46 -0800
Subject: [PATCH 09/23] Add HybridApp fork comment

---
 .github/workflows/verifyHybridApp.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index d5d6935af38b..7395fc450679 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -25,6 +25,18 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  comment_on_fork:
+    name: Verify Android HybridApp builds on main
+    # Only run on pull requests that are not on a fork
+    if: ${{ github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Comment on forks
+        run: |
+          gh pr comment ${{ github.event.number }} --body \
+          ":warning: This PR is possibly changing native code, it may cause problems with HybridApp. Please run an AdHoc build to verify that HybridApp will not break. :warning:"
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
   verify_android:
     name: Verify Android HybridApp builds on main
     runs-on: ubuntu-latest-xl

From 2a0726f9c8adeeddd16500e833be78cf53127140 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 12:33:51 -0800
Subject: [PATCH 10/23] Update url

---
 .github/workflows/verifyHybridApp.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index 7395fc450679..cb5357d3ad0e 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -27,21 +27,21 @@ concurrency:
 jobs:
   comment_on_fork:
     name: Verify Android HybridApp builds on main
-    # Only run on pull requests that are not on a fork
-    if: ${{ github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork }}
+    # Only run on pull requests that *are* a fork
+#    if: ${{ github.event.pull_request.head.repo.fork }}
     runs-on: ubuntu-latest
     steps:
       - name: Comment on forks
         run: |
-          gh pr comment ${{ github.event.number }} --body \
+          gh pr comment ${{github.event.pull_request.html_url }} --body \
           ":warning: This PR is possibly changing native code, it may cause problems with HybridApp. Please run an AdHoc build to verify that HybridApp will not break. :warning:"
         env:
           GITHUB_TOKEN: ${{ github.token }}
   verify_android:
     name: Verify Android HybridApp builds on main
     runs-on: ubuntu-latest-xl
-    # Only run on pull requests that are not on a fork
-    if: ${{ github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork }}
+    # Only run on pull requests that are *not* on a fork
+    if: ${{ !github.event.pull_request.head.repo.fork }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -78,8 +78,8 @@ jobs:
   verify_ios:
     name: Verify iOS HybridApp builds on main
     runs-on: macos-15-xlarge
-    # Only run on pull requests that are not on a fork
-    if: ${{ github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork }}
+    # Only run on pull requests that are *not* on a fork
+    if: ${{ !github.event.pull_request.head.repo.fork }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4

From b136219d5f2ec1182feab808abd7f719d352ab9e Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 12:35:34 -0800
Subject: [PATCH 11/23] Remove debug

---
 .github/workflows/verifyHybridApp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index cb5357d3ad0e..ae1f002659dd 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -28,7 +28,7 @@ jobs:
   comment_on_fork:
     name: Verify Android HybridApp builds on main
     # Only run on pull requests that *are* a fork
-#    if: ${{ github.event.pull_request.head.repo.fork }}
+    if: ${{ github.event.pull_request.head.repo.fork }}
     runs-on: ubuntu-latest
     steps:
       - name: Comment on forks

From 08101e860353bb5bdabe5006c6d33bee1886692f Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 12:36:13 -0800
Subject: [PATCH 12/23] Remove more debug

---
 .github/workflows/verifyHybridApp.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index ae1f002659dd..ee9e9f5df881 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -17,8 +17,6 @@ on:
       - 'android/AndroidManifest.xml'
       - 'ios/Podfile.lock'
       - 'ios/project.pbxproj'
-      # TODO: Remove, just here for debugging
-      - '**.yml'
 
 concurrency:
   group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-verify-main

From ae953f647ff7657eee6641981b071b2a8a4e1396 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 12:38:06 -0800
Subject: [PATCH 13/23] Update job name

---
 .github/workflows/verifyHybridApp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index ee9e9f5df881..7f2e4ac43bb9 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -24,7 +24,7 @@ concurrency:
 
 jobs:
   comment_on_fork:
-    name: Verify Android HybridApp builds on main
+    name: Comment on all PRs that are forks
     # Only run on pull requests that *are* a fork
     if: ${{ github.event.pull_request.head.repo.fork }}
     runs-on: ubuntu-latest

From 835194a5b75b60c4c8b3fdee6b06d4c8317961e1 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 12:58:30 -0800
Subject: [PATCH 14/23] Fix android build

---
 .github/workflows/verifyHybridApp.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index 7f2e4ac43bb9..ee68362265dd 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -65,7 +65,6 @@ jobs:
           IS_HYBRID_BUILD: 'true'
 
       - name: Build Android Debug
-        working-directory: Mobile-Expensify/Android
         run: |
           if ! npm run android-hybrid-build
           then

From 93175a240de34cc57648ce6aaaaeeb90f9e4e31a Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 12:59:07 -0800
Subject: [PATCH 15/23] Add Debuggin

---
 .github/workflows/verifyHybridApp.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index ee68362265dd..90e1a0fe25ea 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -17,6 +17,8 @@ on:
       - 'android/AndroidManifest.xml'
       - 'ios/Podfile.lock'
       - 'ios/project.pbxproj'
+      # TODO: Remove this line, just for debugging
+      - '**.yml'
 
 concurrency:
   group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-verify-main

From 4c0763de0c079dec8d45c6d9b400755f44876d73 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 13:02:43 -0800
Subject: [PATCH 16/23] Set up ruby on Android runners

---
 .github/workflows/verifyHybridApp.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index 90e1a0fe25ea..c40d62f713e4 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -66,6 +66,14 @@ jobs:
         with:
           IS_HYBRID_BUILD: 'true'
 
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1.204.0
+        with:
+          bundler-cache: true
+
+      - name: Install New Expensify Gems
+        run: bundle install
+
       - name: Build Android Debug
         run: |
           if ! npm run android-hybrid-build

From 47aad8d77a3d5edd25dbd7eb54ba0d8c5be0ba8b Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 13:11:19 -0800
Subject: [PATCH 17/23] Tweak submodule update command

---
 .github/workflows/verifyHybridApp.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index c40d62f713e4..b3c9a9e1f041 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -52,9 +52,8 @@ jobs:
 
       - name: Update submodule to match main
         run: |
-          git submodule update --init --remote
+          git submodule update --init --remote --depth 1
           cd Mobile-Expensify
-          git fetch
           git checkout main
 
       - name: Configure MapBox SDK
@@ -97,9 +96,8 @@ jobs:
 
       - name: Update submodule to match main
         run: |
-          git submodule update --init --remote
+          git submodule update --init --remote --depth 1
           cd Mobile-Expensify
-          git fetch
           git checkout main
 
       - name: Configure MapBox SDK

From 0aee2cfd1d1cd2021028988d6b84ab30f8f5ca34 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 13:51:03 -0800
Subject: [PATCH 18/23] Use different export method

---
 fastlane/Fastfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 462062383e3f..8435fe765b83 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -474,7 +474,7 @@ platform :ios do
           configuration: "Debug",
           sdk: "iphonesimulator",
           skip_codesigning: true,
-          export_method: "development"
+          export_method: "debugging"
       )
       setIOSBuildOutputsInEnv()
     end

From 5c4901135908e6f5836e1b9db36a5b06ab969055 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 14:37:25 -0800
Subject: [PATCH 19/23] Try to skip archive as well

---
 fastlane/Fastfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 8435fe765b83..1698b9c5a3d6 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -474,7 +474,8 @@ platform :ios do
           configuration: "Debug",
           sdk: "iphonesimulator",
           skip_codesigning: true,
-          export_method: "debugging"
+          skip_archive: true,
+          export_method: "development"
       )
       setIOSBuildOutputsInEnv()
     end

From 70dac048d41a0f026b17e6216e3972a192e5eb4f Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 14:51:29 -0800
Subject: [PATCH 20/23] Sync ios standalone and HybridApp settings

---
 fastlane/Fastfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 1698b9c5a3d6..7858af37733e 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -460,7 +460,9 @@ platform :ios do
         scheme: "New Expensify",
         configuration: "Debug",
         sdk: "iphonesimulator",
-        skip_codesigning: true
+        skip_codesigning: true,
+        skip_archive: true,
+        export_method: "development"
     )
     setIOSBuildOutputsInEnv()
   end

From 4b771fb7b1704c2484746c2aa614bf427f92b558 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 15:10:44 -0800
Subject: [PATCH 21/23] Revert M/E

---
 Mobile-Expensify | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mobile-Expensify b/Mobile-Expensify
index 10beb38304d3..6a1bd2e5c803 160000
--- a/Mobile-Expensify
+++ b/Mobile-Expensify
@@ -1 +1 @@
-Subproject commit 10beb38304d35ee86b948f64afcdf49d51ab3d4a
+Subproject commit 6a1bd2e5c80336edaf5ea929ce30102cfa3ef65b

From 236fc8f4c62b4919d0a5d8d71fc943ad11c59a37 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 15:11:33 -0800
Subject: [PATCH 22/23] Remove debugging

---
 .github/workflows/verifyHybridApp.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index b3c9a9e1f041..c559aa0bead5 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -17,8 +17,6 @@ on:
       - 'android/AndroidManifest.xml'
       - 'ios/Podfile.lock'
       - 'ios/project.pbxproj'
-      # TODO: Remove this line, just for debugging
-      - '**.yml'
 
 concurrency:
   group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-verify-main

From 2336b9a3f112df2d070772fc8502f5f1e08579d6 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 3 Feb 2025 15:41:44 -0800
Subject: [PATCH 23/23] Remove bundle install

---
 .github/workflows/verifyHybridApp.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/verifyHybridApp.yml b/.github/workflows/verifyHybridApp.yml
index c559aa0bead5..c69487a1b4e4 100644
--- a/.github/workflows/verifyHybridApp.yml
+++ b/.github/workflows/verifyHybridApp.yml
@@ -68,9 +68,6 @@ jobs:
         with:
           bundler-cache: true
 
-      - name: Install New Expensify Gems
-        run: bundle install
-
       - name: Build Android Debug
         run: |
           if ! npm run android-hybrid-build
@@ -112,9 +109,6 @@ jobs:
         with:
           bundler-cache: true
 
-      - name: Install New Expensify Gems
-        run: bundle install
-
       - name: Cache Pod dependencies
         uses: actions/cache@v4
         id: pods-cache