Merge branch 'refs/heads/main' into war-in/use-listener

Author: war-in

.github/scripts/validateActionsAndWorkflows.sh

@@ -7,7 +7,7 @@ title 'Validating the Github Actions and workflows using the json schemas provid
 function downloadSchema {
   [[ $1 = 'github-action.json' ]] && SCHEMA_NAME='GitHub Action' || SCHEMA_NAME='GitHub Workflow'
   info "Downloading $SCHEMA_NAME schema..."
-  if curl "https://json.schemastore.org/$1" --output "./tempSchemas/$1" --silent; then
+  if curl "https://raw.githubusercontent.com/SchemaStore/schemastore/refs/heads/master/src/schemas/json/$1" --output "./tempSchemas/$1" --silent; then
     success "Successfully downloaded $SCHEMA_NAME schema!"
   else
     error "Failed downloading $SCHEMA_NAME schema"

.github/workflows/lint-changed.yml

@@ -17,19 +17,47 @@ jobs:
     if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     steps:
+      - name: Count commits between merge base and HEAD
+        id: count
+        run: |
+          # Compare the base commit and HEAD to get the count of commits after base
+          # up to and including HEAD. Add 2 to this total when fetching history. 
+          #
+          # When opening a PR, GitHub will create a merge commit that squashes
+          # your changes for use in the workflow. So your history locally
+          # may look like
+          #          o---o---o---B - development
+          #         /
+          # ---o---1---C---o---o---A - main
+          # Note that the `1` is the merge-base of development and main. The
+          # number of commits after `1` upto and including `A` is 4.
+          # In the workflow, GitHub squashs development, so it becomes:
+          # ---o---1---C---o---o---A - main
+          #                         \--M - PR branch
+          # Where `M`` is the new squashed commit. To fetch enough history to
+          # include the merge base, we need to fetch `M`, `A` through `C` and
+          # `1` for total of 4+2=6 commits. The +2 commits accounts for the
+          # base `1` and merge commit `M`.
+          RAW_COUNT="$(gh api "repos/$REPO/compare/${BASE}...main" | jq -r '.total_commits')"
+          ADJUSTED_COUNT=$((RAW_COUNT + 2))
+          echo "count=$ADJUSTED_COUNT" >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ github.token }}
+          BASE: ${{ github.event.pull_request.base.sha }}
+          REPO: ${{ github.repository }}
+          
       - name: Checkout
         # v4
         uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+        with:
+          fetch-depth: ${{ fromJSON(steps.count.outputs.count) }}
 
       - name: Setup Node
         uses: ./.github/actions/composite/setupNode
         with:
           IS_DESKTOP_BUILD: true
-      
+ 
       - name: Run ESLint to check for deprecation warnings
         run: |
-          # This will just fetch the latest commit from main
-          git fetch origin main --no-tags --depth=1
-
           # shellcheck disable=SC2046
           npm run lint-changed

.github/workflows/publishReactNativeAndroidArtifacts.yml

@@ -1,6 +1,16 @@
 name: Publish React Native Android Artifacts
 
 on:
+  workflow_dispatch:
+    inputs:
+      build_standalone:
+        description: 'Build Standalone artifacts'
+        required: false
+        type: boolean
+      build_hybridapp:
+        description: 'Build HybridApp artifacts'
+        required: false
+        type: boolean
   push:
     branches:
       - main
@@ -23,20 +33,23 @@ jobs:
         uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
         with:
           submodules: true
-          ref: ${{ github.event.before }}
+          ref: ${{ github.event.before || 'main' }}
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
       - name: Get previous patches hash
+        if: ${{ github.event_name != 'workflow_dispatch' }}
         id: getOldPatchesHash
         run: |
             echo "HYBRID_APP_HASH=$(./scripts/compute-patches-hash.sh patches Mobile-Expensify/patches)" >> "$GITHUB_OUTPUT"
             echo "STANDALONE_APP_HASH=$(./scripts/compute-patches-hash.sh patches)" >> "$GITHUB_OUTPUT"
 
       - name: Get previous react-native version
+        if: ${{ github.event_name != 'workflow_dispatch' }}
         id: getOldVersion
         run: echo "VERSION=$(jq -r '.dependencies["react-native"]' package.json)" >> "$GITHUB_OUTPUT"
 
       - name: Checkout new ref
+        if: ${{ github.event_name != 'workflow_dispatch' }}
         run: |
           git fetch origin ${{ github.event.after }} --depth=1
           git checkout ${{ github.event.after }}
@@ -49,10 +62,12 @@ jobs:
             echo "STANDALONE_APP_HASH=$(./scripts/compute-patches-hash.sh patches)" >> "$GITHUB_OUTPUT"
 
       - name: Get new react-native version
+        if: ${{ github.event_name != 'workflow_dispatch' }}
         id: getNewVersion
         run: echo "VERSION=$(jq -r '.dependencies["react-native"]' package.json)" >> "$GITHUB_OUTPUT"
 
       - name: Check if version changed
+        if: ${{ github.event_name != 'workflow_dispatch' }}
         id: didVersionChange
         run: |
           readonly DID_VERSION_CHANGE=${{ steps.getOldVersion.outputs.VERSION != steps.getNewVersion.outputs.VERSION && 'true' || 'false' }}
@@ -62,6 +77,7 @@ jobs:
           fi
 
       - name: Check if patches changed
+        if: ${{ github.event_name != 'workflow_dispatch' }}
         id: didPatchesChange
         run: |
           readonly DID_HYBRID_APP_PATCHES_CHANGE=${{ steps.getOldPatchesHash.outputs.HYBRID_APP_HASH != steps.getNewPatchesHash.outputs.HYBRID_APP_HASH && 'true' || 'false' }}
@@ -80,6 +96,23 @@ jobs:
       - name: Get artifact build targets
         id: getArtifactBuildTargets
         run: |
+          if [[ '${{ github.event_name }}' == 'workflow_dispatch' ]]; then
+            BUILD_TARGETS=()
+
+            if [[ '${{ inputs.build_standalone }}' == 'true' ]]; then
+              BUILD_TARGETS+=(false)
+            fi
+
+            if [[ '${{ inputs.build_hybridapp }}' == 'true' ]]; then
+              BUILD_TARGETS+=(true)
+            fi
+
+            if [[ ${#BUILD_TARGETS[@]} -ne 0 ]]; then
+              echo "BUILD_TARGETS=$(printf '%s\n' "${BUILD_TARGETS[@]}" | jq -R . | jq -c -s .)" >> "$GITHUB_OUTPUT"
+            fi
+            exit 0
+          fi
+
           # When there is a version change or standalone app patches change, we need to build for both hybrid and standalone
           if [[ '${{ steps.didVersionChange.outputs.DID_VERSION_CHANGE }}' == 'true' || '${{ steps.didPatchesChange.outputs.DID_STANDALONE_APP_PATCHES_CHANGE }}' == 'true' ]]; then
             echo "BUILD_TARGETS=[\"true\", \"false\"]" >> "$GITHUB_OUTPUT"

.github/workflows/remote-build-android.yml

@@ -35,11 +35,11 @@ jobs:
           IS_HYBRID_BUILD: ${{ matrix.is_hybrid_build && 'true' || 'false' }}
 
       - name: RNEF Remote Build - Android
-        uses: callstackincubator/android@333f590005be752c28f07e36fa7151be3b2e18da
+        uses: callstackincubator/android@2f67a7003e5ed1bb4e483619ab582fabff25677d
         env:
           IS_HYBRID_APP: ${{ matrix.is_hybrid_build }}
         with:
           variant: ${{ matrix.variant }}
           github-token: ${{ github.token }}
-          rnef-build-extra-params: '-PreactNativeArchitectures=arm64-v8a,x86_64'
+          rnef-build-extra-params: '--extra-params -PreactNativeArchitectures=arm64-v8a,x86_64'
           comment-bot: false

.github/workflows/remote-build-ios.yml

@@ -37,7 +37,7 @@ jobs:
           IS_HYBRID_BUILD: ${{ matrix.is_hybrid_build && 'true' || 'false' }}
 
       - name: RNEF Remote Build - iOS
-        uses: callstackincubator/ios@f8aeffabe13be32e9aa69b86726de67bff5a694e
+        uses: callstackincubator/ios@78ed46313dac4ed09cb5cc73b9b1b9193d59d863
         env:
           IS_HYBRID_APP: ${{ matrix.is_hybrid_build }}
         with:

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009015900
-        versionName "9.1.59-0"
+        versionCode 1009016001
+        versionName "9.1.60-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"

android/app/build.gradle

@@ -114,9 +114,9 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
                 {from: 'web/favicon-unread.png'},
                 {from: 'web/og-preview-image.png'},
                 {from: 'web/apple-touch-icon.png'},
+                {from: 'web/robots.txt'},
                 {from: 'assets/images/expensify-app-icon.svg'},
                 {from: 'web/manifest.json'},
-                {from: 'web/thirdPartyScripts.js'},
                 {from: 'assets/css', to: 'css'},
                 {from: 'assets/fonts/web', to: 'fonts'},
                 {from: 'assets/sounds', to: 'sounds'},

config/webpack/webpack.common.ts

@@ -266,6 +266,7 @@
         "islarge",
         "ismedium",
         "isnonreimbursable",
+        "issmall",
         "ITSM",
         "Jakub",
         "janky",

cspell.json

@@ -0,0 +1,11 @@
+---
+title: Expensify Travel Tutorial Video
+description: Check out an overview of Expensify Travel
+keywords: [Expensify Classic, travel, travel video]
+---
+
+Watch the video below to check out a tutorial on how **Expensify Travel** works!
+
+{% include video.html
+  src="https://customer-dtm7nf3ai7b93j1q.cloudflarestream.com/b81eabafe1391ab06901ddc19dcda161"
+%}