Merge branch 'main' of github.com:callstack-internal/Expensify-App into eslint-9-no-unsafe-call

Author: LukasMod

.github/workflows/deploy.yml

@@ -298,6 +298,17 @@ jobs:
         with:
           IS_DESKTOP_BUILD: true
 
+        # v6.0.0
+      - name: Setup Python for node-gyp
+        id: setup-python
+        uses: actions/setup-python@18566f86b301499665bd3eb1a2247e0849c64fa5
+        with:
+          python-version: '3.12'
+          cache: 'pip'
+
+      - name: Ensure setuptools for node-gyp
+        run: python -m pip install --upgrade pip setuptools
+
       - name: Load Desktop credentials from 1Password
         id: load-credentials
         # v2
@@ -321,6 +332,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           GCP_GEOLOCATION_API_KEY: ${{ secrets.GCP_GEOLOCATION_API_KEY_PRODUCTION }}
           S3_BUCKET: ${{ github.ref == 'refs/heads/production' && vars.PRODUCTION_S3_BUCKET || vars.STAGING_S3_BUCKET }}
+          PYTHON: ${{ steps.setup-python.outputs.python-path }}
 
       - name: Upload desktop sourcemaps artifact
         # v4

.github/workflows/testBuild.yml

@@ -185,6 +185,17 @@ jobs:
         with:
           IS_DESKTOP_BUILD: true
 
+      # v6.0.0
+      - name: Setup python for node-gyp
+        id: setup-python
+        uses: actions/setup-python@18566f86b301499665bd3eb1a2247e0849c64fa5
+        with:
+          python-version: '3.12'
+          cache: 'pip'
+
+      - name: Ensure setuptools for node-gyp
+        run: python -m pip install --upgrade pip setuptools
+
       - name: Load Desktop credentials from 1Password
         id: load-credentials
         # v2
@@ -215,6 +226,7 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           GCP_GEOLOCATION_API_KEY: ${{ secrets.GCP_GEOLOCATION_API_KEY_STAGING }}
+          PYTHON: ${{ steps.setup-python.outputs.python-path }}
 
   web:
     name: Build and deploy Web
@@ -257,7 +269,7 @@ jobs:
     needs: [prep, getMobileExpensifyPR, getMobileExpensifyRef]
     runs-on: ubuntu-latest-xl
     outputs:
-      S3_APK_PATH: ${{ steps.exportAndroidS3Path.outputs.S3_APK_PATH }}
+      ROCK_APK_PATH: ${{ steps.rock-remote-build-android.outputs.artifact-url }}
     steps:
       - name: Checkout
         # v4
@@ -334,35 +346,25 @@ jobs:
           ANDROID_UPLOAD_KEYSTORE_ALIAS: op://${{ vars.OP_VAULT }}/Repository-Secrets/ANDROID_UPLOAD_KEYSTORE_ALIAS
           ANDROID_UPLOAD_KEY_PASSWORD: op://${{ vars.OP_VAULT }}/Repository-Secrets/ANDROID_UPLOAD_KEY_PASSWORD
 
-      - name: Build Android app
-        id: build
+      - name: Rock Remote Build - Android
+        id: rock-remote-build-android
+        uses: callstackincubator/android@1585a4a0b32801c26d2dae67a09f0df530df25c0 # v3
         env:
-          ANDROID_UPLOAD_KEYSTORE_PASSWORD: ${{ steps.load-credentials.outputs.ANDROID_UPLOAD_KEYSTORE_PASSWORD }}
-          ANDROID_UPLOAD_KEYSTORE_ALIAS: ${{ steps.load-credentials.outputs.ANDROID_UPLOAD_KEYSTORE_ALIAS }}
-          ANDROID_UPLOAD_KEY_PASSWORD: ${{ steps.load-credentials.outputs.ANDROID_UPLOAD_KEY_PASSWORD }}
-        run: bundle exec fastlane android build_adhoc_hybrid
-
-      - name: Configure AWS Credentials
-        # v4
-        uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722
+          IS_HYBRID_APP: true
+          GITHUB_TOKEN: ${{ github.token }}
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: us-east-1
-
-      - name: Upload Android AdHoc build to S3
-        run: bundle exec fastlane android upload_s3
-        env:
-          S3_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          S3_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          S3_BUCKET: ad-hoc-expensify-cash
-          S3_REGION: us-east-1
-
-      - name: Export S3 path
-        id: exportAndroidS3Path
-        run: |
-          # $s3APKPath is set from within the Fastfile, android upload_s3 lane
-          echo "S3_APK_PATH=$s3APKPath" >> "$GITHUB_OUTPUT"
+          variant: 'Adhoc'
+          sign: true
+          re-sign: true
+          keystore-file: './upload-key.keystore'
+          keystore-store-file: 'upload-key.keystore'
+          keystore-store-password: ${{ steps.load-credentials.outputs.ANDROID_UPLOAD_KEYSTORE_PASSWORD }}
+          keystore-key-alias: ${{ steps.load-credentials.outputs.ANDROID_UPLOAD_KEYSTORE_ALIAS }}
+          keystore-key-password: ${{ steps.load-credentials.outputs.ANDROID_UPLOAD_KEY_PASSWORD }}
+          # Specify the path (relative to the Android source directory) where the keystore should be placed.
+          keystore-path: '../tools/buildtools/upload-key.keystore'
+          comment-bot: false
+          rock-build-extra-params: '--extra-params -PreactNativeArchitectures=arm64-v8a,x86_64'
 
   iosHybrid:
     name: Build and deploy iOS for testing
@@ -372,7 +374,7 @@ jobs:
       DEVELOPER_DIR: /Applications/Xcode_26.0.app/Contents/Developer
     runs-on: macos-15-xlarge
     outputs:
-      IOS_PATH: ${{ steps.export-ios-path.outputs.IOS_PATH }}
+      ROCK_IOS_PATH: ${{ steps.rock-remote-build-ios.outputs.artifact-url }}
     steps:
       - name: Checkout
         # v4
@@ -438,6 +440,7 @@ jobs:
         # v1
         uses: 1password/install-cli-action@143a85f84a90555d121cde2ff5872e393a47ab9f
 
+
       - name: Load files from 1Password
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
@@ -447,34 +450,57 @@ jobs:
           op read "op://${{ vars.OP_VAULT }}/OldApp_AdHoc_Notification_Service/OldApp_AdHoc_Notification_Service.mobileprovision" --force --out-file ./OldApp_AdHoc_Notification_Service.mobileprovision
           op read "op://${{ vars.OP_VAULT }}/New Expensify Distribution Certificate/Certificates.p12" --force --out-file ./Certificates.p12
 
-      - name: Build AdHoc app
-        run: bundle exec fastlane ios build_adhoc_hybrid
-
-      - name: Configure AWS Credentials
-        # v4
-        uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: us-east-1
-
-      - name: Upload AdHoc build to S3
-        run: bundle exec fastlane ios upload_s3
-        env:
-          S3_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          S3_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          S3_BUCKET: ad-hoc-expensify-cash
-          S3_REGION: us-east-1
-
-      - name: Export iOS path
-        id: export-ios-path
+      - name: Create ExportOptions.plist
         run: |
-          content_ios="$(cat ./ios_paths.json)"
-          content_ios="${content_ios//'%'/'%25'}"
-          content_ios="${content_ios//$'\n'/'%0A'}"
-          content_ios="${content_ios//$'\r'/'%0D'}"
-          ios_path=$(echo "$content_ios" | jq -r '.html_path')
-          echo "IOS_PATH=$ios_path" >> "$GITHUB_OUTPUT"
+          cat > Mobile-Expensify/iOS/ExportOptions.plist << 'EOF'
+          <?xml version="1.0" encoding="UTF-8"?>
+          <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+          <plist version="1.0">
+          <dict>
+            <key>method</key>
+            <string>ad-hoc</string>
+            <key>provisioningProfiles</key>
+            <dict>
+              <key>com.expensify.expensifylite.adhoc</key>
+              <string>(OldApp) AdHoc</string>
+              <key>com.expensify.expensifylite.adhoc.SmartScanExtension</key>
+              <string>(OldApp) AdHoc: Share Extension</string>
+              <key>com.expensify.expensifylite.adhoc.NotificationServiceExtension</key>
+              <string>(OldApp) AdHoc: Notification Service</string>
+            </dict>
+          </dict>
+          </plist>
+          EOF
+      
+      - name: Rock Remote Build - iOS
+        id: rock-remote-build-ios
+        uses: callstackincubator/ios@79778c5739839044d2ca5af75ace7ba0467b5366 # v3
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          IS_HYBRID_APP: true
+        with:
+          destination: device
+          re-sign: true
+          ad-hoc: true
+          scheme: 'Expensify AdHoc'
+          configuration: 'AdHoc'
+          certificate-file: './Certificates.p12'
+          provisioning-profiles: |
+            [
+              {
+                "name": "(OldApp) AdHoc",
+                "file": "./OldApp_AdHoc.mobileprovision"
+              },
+              {
+                "name": "(OldApp) AdHoc: Share Extension",
+                "file": "./OldApp_AdHoc_Share_Extension.mobileprovision"
+              },
+              {
+                "name": "(OldApp) AdHoc: Notification Service",
+                "file": "./OldApp_AdHoc_Notification_Service.mobileprovision"
+              }
+            ]
+          comment-bot: false
 
   postGithubComment:
     runs-on: ubuntu-latest
@@ -504,9 +530,9 @@ jobs:
           DESKTOP: ${{ needs.desktop.result }}
           IOS: ${{ needs.iosHybrid.result }}
           WEB: ${{ needs.web.result }}
-          ANDROID_LINK: ${{ needs.androidHybrid.outputs.S3_APK_PATH }}
+          ANDROID_LINK: ${{ needs.androidHybrid.outputs.ROCK_APK_PATH }}
           DESKTOP_LINK: https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/${{ inputs.APP_PULL_REQUEST_NUMBER }}/NewExpensify.dmg
-          IOS_LINK: ${{ needs.iosHybrid.outputs.IOS_PATH }}
+          IOS_LINK: ${{ needs.iosHybrid.outputs.ROCK_IOS_PATH }}
           WEB_LINK: https://${{ inputs.APP_PULL_REQUEST_NUMBER }}.pr-testing.expensify.com
 
       - name: Publish links to apps for download on Expensify/Mobile-Expensify PR
@@ -518,5 +544,5 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
           ANDROID: ${{ needs.androidHybrid.result }}
           IOS: ${{ needs.iosHybrid.result }}
-          ANDROID_LINK: ${{ needs.androidHybrid.outputs.S3_APK_PATH }}
-          IOS_LINK: ${{ needs.iosHybrid.outputs.IOS_PATH }}
+          ANDROID_LINK: ${{ needs.androidHybrid.outputs.ROCK_APK_PATH }}
+          IOS_LINK: ${{ needs.iosHybrid.outputs.ROCK_IOS_PATH }}

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009023200
-        versionName "9.2.32-0"
+        versionCode 1009023300
+        versionName "9.2.33-0"
         // 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"

android/app/build.gradle

@@ -47,6 +47,7 @@ module.exports = {
     extraMetadata: {
         version,
     },
+    asarUnpack: ['**/node-mac-permissions/bin/**'],
     mac: {
         category: 'public.app-category.finance',
         icon: macIcon[process.env.ELECTRON_ENV],
@@ -60,8 +61,11 @@ module.exports = {
                 arch: ['universal'],
             },
         ],
+        x64ArchFiles: '**/node_modules/node-mac-permissions/bin/**',
         extendInfo: {
             CFBundleIconName: getMacBundleIconName(),
+            NSLocationWhenInUseUsageDescription: 'This app uses location to help you track distance expenses.',
+            NSLocationUsageDescription: 'This app uses location to help you track distance expenses.',
         },
     },
     dmg: {

config/electronBuilder.config.js

@@ -2,7 +2,7 @@ import path from 'path';
 import type {Configuration} from 'webpack';
 import webpack from 'webpack';
 // eslint-disable-next-line @dword-design/import-alias/prefer-alias, import/no-relative-packages -- alias imports don't work for webpack
-import {dependencies as desktopDependencies} from '../../desktop/package.json';
+import {dependencies as desktopDependencies, optionalDependencies as desktopOptionalDependencies} from '../../desktop/package.json';
 import type Environment from './types';
 import getCommonConfiguration from './webpack.common';
 
@@ -38,7 +38,7 @@ const getConfiguration = (environment: Environment): Configuration[] => {
         },
         resolve: rendererConfig.resolve,
         plugins: [definePlugin],
-        externals: [...Object.keys(desktopDependencies), 'fsevents'],
+        externals: [...Object.keys(desktopDependencies), ...Object.keys(desktopOptionalDependencies), 'fsevents'],
         node: {
             /**
              * Disables webpack processing of __dirname and __filename, so it works like in node

config/webpack/webpack.desktop.ts

@@ -12,6 +12,7 @@
         "Aeroplan",
         "águero",
         "Aircall",
+        "Airplus",
         "airshipconfig",
         "airside",
         "Amal",
@@ -294,6 +295,7 @@
         "inputmethod",
         "instancetype",
         "Intacct",
+        "INTECOMS",
         "intenthandler",
         "ionatan",
         "iOSQRCode",
@@ -326,6 +328,7 @@
         "killall",
         "kilometres",
         "kilometre",
+        "Kort",
         "Kowalski",
         "Krasoń",
         "labelledby",
@@ -396,6 +399,7 @@
         "Navan",
         "navattic",
         "navigations",
+        "NBSA",
         "nbta",
         "ndkversion",
         "Nederlands",

cspell.json

@@ -15,6 +15,7 @@ const ELECTRON_EVENTS = {
     DOWNLOAD_CANCELED: 'download-canceled',
     SILENT_UPDATE: 'silent-update',
     OPEN_LOCATION_SETTING: 'open-location-setting',
+    CHECK_LOCATION_PERMISSION: 'check-location-permission',
 } as const;
 
 export default ELECTRON_EVENTS;

desktop/ELECTRON_EVENTS.ts

@@ -19,6 +19,7 @@ const WHITELIST_CHANNELS_RENDERER_TO_MAIN = [
     ELECTRON_EVENTS.DOWNLOAD,
     ELECTRON_EVENTS.SILENT_UPDATE,
     ELECTRON_EVENTS.OPEN_LOCATION_SETTING,
+    ELECTRON_EVENTS.CHECK_LOCATION_PERMISSION,
 ] as const;
 
 const WHITELIST_CHANNELS_MAIN_TO_RENDERER = [

desktop/contextBridge.ts

@@ -6,5 +6,7 @@
     <true/>
     <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
     <true/>
+    <key>com.apple.security.location</key>
+    <true/>
   </dict>
 </plist>