Merge branch 'main' into perf/filter-money-request-participants

.eslintrc.js

@@ -55,6 +55,11 @@ const restrictedImportPaths = [
         name: 'date-fns/locale',
         message: "Do not import 'date-fns/locale' directly. Please use the submodule import instead, like 'date-fns/locale/en-GB'.",
     },
+    {
+        name: 'expensify-common',
+        importNames: ['Device'],
+        message: "Do not import Device directly, it's known to make VSCode's IntelliSense crash. Please import the desired module from `expensify-common/dist/Device` instead.",
+    },
 ];
 
 const restrictedImportPatterns = [
@@ -100,7 +105,6 @@ module.exports = {
         __DEV__: 'readonly',
     },
     rules: {
-        '@typescript-eslint/no-unsafe-call': 'off',
         '@typescript-eslint/no-unsafe-member-access': 'off',
         '@typescript-eslint/no-unsafe-assignment': 'off',
 
@@ -167,6 +171,7 @@ module.exports = {
 
         // Rulesdir specific rules
         'rulesdir/no-default-props': 'error',
+        'rulesdir/prefer-type-fest': 'error',
         'rulesdir/no-multiple-onyx-in-file': 'off',
         'rulesdir/prefer-underscore-method': 'off',
         'rulesdir/prefer-import-module-contents': 'off',

.github/actions/javascript/getGraphiteString/getGraphiteString.ts

@@ -1,6 +1,15 @@
 import * as core from '@actions/core';
 import fs from 'fs';
 
+type RegressionEntry = {
+    metadata?: {
+        creationDate: string;
+    };
+    name: string;
+    meanDuration: number;
+    meanCount: number;
+};
+
 const run = () => {
     // Prefix path to the graphite metric
     const GRAPHITE_PATH = 'reassure';
@@ -24,11 +33,11 @@ const run = () => {
         }
 
         try {
-            const current = JSON.parse(entry);
+            const current: RegressionEntry = JSON.parse(entry);
 
             // Extract timestamp, Graphite accepts timestamp in seconds
             if (current.metadata?.creationDate) {
-                timestamp = Math.floor(new Date(current.metadata.creationDate as string).getTime() / 1000);
+                timestamp = Math.floor(new Date(current.metadata.creationDate).getTime() / 1000);
             }
 
             if (current.name && current.meanDuration && current.meanCount && timestamp) {

.github/libs/GitUtils.ts

@@ -66,11 +66,11 @@ function getCommitHistoryAsJSON(fromTag: string, toTag: string): Promise<CommitT
         console.log(`Running command: git ${args.join(' ')}`);
         const spawnedProcess = spawn('git', args);
         spawnedProcess.on('message', console.log);
-        spawnedProcess.stdout.on('data', (chunk) => {
+        spawnedProcess.stdout.on('data', (chunk: Buffer) => {
             console.log(chunk.toString());
             stdout += chunk.toString();
         });
-        spawnedProcess.stderr.on('data', (chunk) => {
+        spawnedProcess.stderr.on('data', (chunk: Buffer) => {
             console.error(chunk.toString());
             stderr += chunk.toString();
         });

.github/scripts/enforceRedirect.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# HelpDot - Whenever an article is moved/renamed/deleted we should verify that
+# we have added a redirect link for it in redirects.csv. This ensures that we don't have broken links.
+
+declare -r RED='\033[0;31m'
+declare -r GREEN='\033[0;32m'
+declare -r NC='\033[0m'
+
+declare -r ARTICLES_DIRECTORY="docs/articles"
+declare -r REDIRECTS_FILE="docs/redirects.csv"
+
+hasRenamedOrDeletedArticle=false
+hasModifiedRedirect=false
+
+if git log origin/main..HEAD --name-status --pretty=format: $ARTICLES_DIRECTORY | grep -q -E "^(R|D)"
+then
+    echo "Articles have been renamed/moved/deleted"
+    hasRenamedOrDeletedArticle=true
+fi
+
+if git log origin/main..HEAD --name-status --pretty=format: $REDIRECTS_FILE | grep -q -E "^(M)"
+then
+    echo "Redirects.csv has been modified"
+    hasModifiedRedirect=true
+fi
+
+if [[ $hasRenamedOrDeletedArticle == true  && $hasModifiedRedirect == false ]]
+then
+    echo -e "${RED}Articles have been renamed or deleted. Please add a redirect link for the old article links in redirects.csv${NC}"
+    exit 1
+fi
+
+echo -e "${GREEN}Articles aren't moved or deleted, or a redirect has been added. Please verify that a redirect has been added for all the files moved or deleted${NC}"
+exit 0

.github/workflows/deploy.yml

@@ -14,7 +14,7 @@ jobs:
         with:
           ref: staging
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
-          
+
       - name: Setup git for OSBotify
         uses: ./.github/actions/composite/setupGitForOSBotifyApp
         id: setupGitForOSBotify
@@ -65,9 +65,6 @@ jobs:
           PR_LIST: ${{ steps.getReleasePRList.outputs.PR_LIST }}
 
       - name: 🚀 Create release to trigger production deploy 🚀
-        uses: softprops/action-gh-release@affa18ef97bc9db20076945705aba8c516139abd
-        with:
-          tag_name: ${{ env.PRODUCTION_VERSION }}
-          body: ${{ steps.getReleaseBody.outputs.RELEASE_BODY }}
+        run: gh release create ${{ env.PRODUCTION_VERSION }} --generate-notes
         env:
           GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}

.github/workflows/deployExpensifyHelp.yml

@@ -29,9 +29,12 @@ jobs:
     env:
       IS_PR_FROM_FORK: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork }}
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup NodeJS
         uses: ./.github/actions/composite/setupNode
@@ -42,6 +45,9 @@ jobs:
       - name: Check for duplicates and cycles in redirects.csv
         run: ./.github/scripts/verifyRedirect.sh
 
+      - name: Enforce that a redirect link has been created
+        run: ./.github/scripts/enforceRedirect.sh
+
       - name: Build with Jekyll
         uses: actions/jekyll-build-pages@0143c158f4fa0c5dcd99499a5d00859d79f70b0e
         with:

.github/workflows/platformDeploy.yml

@@ -97,7 +97,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: android-sourcemap
-          path: android/app/build/generated/sourcemaps/react/release/*.map
+          path: android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map
 
       - name: Upload Android version to GitHub artifacts
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
@@ -134,7 +134,7 @@ jobs:
     name: Build and deploy Desktop
     needs: validateActor
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
-    runs-on: macos-13-large
+    runs-on: macos-14-large
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/testBuild.yml

@@ -228,7 +228,7 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     env:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
-    runs-on: macos-13-large
+    runs-on: macos-14-large
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/testGithubActionsWorkflows.yml

@@ -25,6 +25,13 @@ jobs:
       - name: Setup Homebrew
         uses: Homebrew/actions/setup-homebrew@master
 
+      - name: Login to GitHub Container Regstry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: OSBotify
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Install Act
         run: brew install act
 

.storybook/webpack.config.ts

@@ -3,6 +3,7 @@
 /* eslint-disable no-param-reassign */
 
 /* eslint-disable @typescript-eslint/naming-convention */
+import type Environment from 'config/webpack/types';
 import dotenv from 'dotenv';
 import path from 'path';
 import {DefinePlugin} from 'webpack';
@@ -18,6 +19,8 @@ type CustomWebpackConfig = {
     };
 };
 
+type CustomWebpackFunction = ({file, platform}: Environment) => CustomWebpackConfig;
+
 let envFile: string;
 switch (process.env.ENV) {
     case 'production':
@@ -31,9 +34,9 @@ switch (process.env.ENV) {
 }
 
 const env = dotenv.config({path: path.resolve(__dirname, `../${envFile}`)});
-const custom: CustomWebpackConfig = require('../config/webpack/webpack.common').default({
-    envFile,
-});
+const customFunction: CustomWebpackFunction = require('../config/webpack/webpack.common').default;
+
+const custom: CustomWebpackConfig = customFunction({file: envFile});
 
 const webpackConfig = ({config}: {config: Configuration}) => {
     if (!config.resolve) {

android/app/build.gradle

@@ -107,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001048108
-        versionName "1.4.81-8"
+        versionCode 1001048500
+        versionName "1.4.85-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/build.gradle

@@ -29,7 +29,7 @@ buildscript {
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.7.1")
         classpath("com.google.firebase:perf-plugin:1.4.1")
         // Fullstory integration
-        classpath ("com.fullstory:gradle-plugin-local:1.47.0")
+        classpath ("com.fullstory:gradle-plugin-local:1.49.0")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files