Merge branch 'main' of https://github.com/mkzie2/App into mkzie2-issue/55685

Author: mkzie2

.github/PULL_REQUEST_TEMPLATE.md

@@ -23,9 +23,9 @@ PROPOSAL:
 
 
 <!--- 
-If you want to trigger adhoc build of hybrid app from specific Mobile-Expensify PR please specify it like follows:
+If you want to trigger adhoc build of hybrid app from specific Mobile-Expensify PR please link it like this:
 
-MOBILE-EXPENSIFY: PR number
+MOBILE-EXPENSIFY: https://github.com/Expensify/Mobile-Expensify/pull/<PR-number>
 
 --->
 

.github/workflows/deploy.yml

@@ -252,10 +252,6 @@ jobs:
           name: android-hybrid-apk-artifact
           path: Expensify.apk
 
-      - name: Upload Android build to Firebase distribution
-        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: bundle exec fastlane android upload_firebase_distribution
-
       - name: Upload Android build artifact
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         uses: actions/upload-artifact@v4
@@ -577,10 +573,6 @@ jobs:
         env:
           BROWSERSTACK: ${{ secrets.BROWSERSTACK }}
 
-      - name: Upload iOS build to Firebase distribution
-        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: bundle exec fastlane ios upload_firebase_distribution
-
       - name: Upload iOS build artifact
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         uses: actions/upload-artifact@v4

.github/workflows/testBuildHybrid.yml

@@ -81,7 +81,7 @@ jobs:
             });
             
             const body = pullRequest.data.body;
-            const regex = /MOBILE-EXPENSIFY:(?<prNumber>\d+)/;
+            const regex = /MOBILE-EXPENSIFY:\s*https:\/\/github.com\/Expensify\/Mobile-Expensify\/pull\/(?<prNumber>\d+)/;
             const found = body.match(regex)?.groups?.prNumber || "";
 
             return found.trim();

.github/workflows/verifyHybridApp.yml

@@ -1,7 +1,6 @@
 name: Verify HybridApp build
 
 on:
-  workflow_call:
   pull_request:
     types: [opened, synchronize]
     branches-ignore: [staging, production]
@@ -24,23 +23,35 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  comment_on_fork:
+    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
+    steps:
+      - name: Comment on forks
+        run: |
+          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.pull_request.head.repo.fork }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           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
-          git fetch
+          git submodule update --init --remote --depth 1
+          cd Mobile-Expensify
           git checkout main
 
       - name: Configure MapBox SDK
@@ -52,10 +63,14 @@ jobs:
         with:
           IS_HYBRID_BUILD: 'true'
 
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1.204.0
+        with:
+          bundler-cache: true
+
       - 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
@@ -64,20 +79,20 @@ 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.pull_request.head.repo.fork }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           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
-          git fetch
+          git submodule update --init --remote --depth 1
+          cd Mobile-Expensify
           git checkout main
 
       - name: Configure MapBox SDK
@@ -94,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
@@ -125,16 +137,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

Mobile-Expensify

@@ -15,6 +15,7 @@
 * [Running The Tests](#running-the-tests)
 * [Debugging](#debugging)
 * [App Structure and Conventions](#app-structure-and-conventions)
+* [HybridApp](#HybridApp)
 * [Philosophy](#Philosophy)
 * [Security](#Security)
 * [Internationalization](#Internationalization)

README.md

@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009009303
-        versionName "9.0.93-3"
+        versionCode 1009009401
+        versionName "9.0.94-1"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"