Merge branch 'main' into fix/29115-open-description-when-login-with-d…

…eeplink

.eslintrc.js

@@ -100,7 +100,6 @@ module.exports = {
         __DEV__: 'readonly',
     },
     rules: {
-        '@typescript-eslint/no-unsafe-argument': 'off',
         '@typescript-eslint/no-unsafe-call': 'off',
         '@typescript-eslint/no-unsafe-member-access': 'off',
         '@typescript-eslint/no-unsafe-assignment': 'off',
@@ -156,6 +155,7 @@ module.exports = {
                 fixMixedExportsWithInlineTypeSpecifier: false,
             },
         ],
+        '@typescript-eslint/no-use-before-define': ['error', {functions: false}],
 
         // ESLint core rules
         'es/no-nullish-coalescing-operators': 'off',

.github/actions/javascript/bumpVersion/bumpVersion.ts

@@ -1,6 +1,7 @@
 import * as core from '@actions/core';
 import {exec as originalExec} from 'child_process';
 import fs from 'fs';
+import type {PackageJson} from 'type-fest';
 import {promisify} from 'util';
 import {generateAndroidVersionCode, updateAndroidVersion, updateiOSVersion} from '@github/libs/nativeVersionUpdater';
 import * as versionUpdater from '@github/libs/versionUpdater';
@@ -19,7 +20,7 @@ function updateNativeVersions(version: string) {
         .then(() => {
             console.log('Successfully updated Android!');
         })
-        .catch((err) => {
+        .catch((err: string | Error) => {
             console.error('Error updating Android');
             core.setFailed(err);
         });
@@ -47,8 +48,12 @@ if (!semanticVersionLevel || !Object.keys(versionUpdater.SEMANTIC_VERSION_LEVELS
     console.log(`Invalid input for 'SEMVER_LEVEL': ${semanticVersionLevel}`, `Defaulting to: ${semanticVersionLevel}`);
 }
 
-const {version: previousVersion} = JSON.parse(fs.readFileSync('./package.json').toString());
-const newVersion = versionUpdater.incrementVersion(previousVersion, semanticVersionLevel);
+const {version: previousVersion}: PackageJson = JSON.parse(fs.readFileSync('./package.json').toString());
+if (!previousVersion) {
+    core.setFailed('Error: Could not read package.json');
+}
+
+const newVersion = versionUpdater.incrementVersion(previousVersion ?? '', semanticVersionLevel);
 console.log(`Previous version: ${previousVersion}`, `New version: ${newVersion}`);
 
 updateNativeVersions(newVersion);

.github/actions/javascript/bumpVersion/index.js

@@ -3478,7 +3478,10 @@ if (!semanticVersionLevel || !Object.keys(versionUpdater.SEMANTIC_VERSION_LEVELS
     console.log(`Invalid input for 'SEMVER_LEVEL': ${semanticVersionLevel}`, `Defaulting to: ${semanticVersionLevel}`);
 }
 const { version: previousVersion } = JSON.parse(fs_1.default.readFileSync('./package.json').toString());
-const newVersion = versionUpdater.incrementVersion(previousVersion, semanticVersionLevel);
+if (!previousVersion) {
+    core.setFailed('Error: Could not read package.json');
+}
+const newVersion = versionUpdater.incrementVersion(previousVersion ?? '', semanticVersionLevel);
 console.log(`Previous version: ${previousVersion}`, `New version: ${newVersion}`);
 updateNativeVersions(newVersion);
 console.log(`Setting npm version to ${newVersion}`);

.github/actions/javascript/checkDeployBlockers/checkDeployBlockers.ts

@@ -60,7 +60,7 @@ const run = function (): Promise<void> {
                 core.setOutput('HAS_DEPLOY_BLOCKERS', false);
             }
         })
-        .catch((error) => {
+        .catch((error: string | Error) => {
             console.error('A problem occurred while trying to communicate with the GitHub API', error);
             core.setFailed(error);
         });

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

@@ -28,7 +28,7 @@ const run = () => {
 
             // Extract timestamp, Graphite accepts timestamp in seconds
             if (current.metadata?.creationDate) {
-                timestamp = Math.floor(new Date(current.metadata.creationDate).getTime() / 1000);
+                timestamp = Math.floor(new Date(current.metadata.creationDate as string).getTime() / 1000);
             }
 
             if (current.name && current.meanDuration && current.meanCount && timestamp) {

.github/actions/javascript/getPreviousVersion/getPreviousVersion.ts

@@ -1,12 +1,17 @@
 import * as core from '@actions/core';
 import {readFileSync} from 'fs';
+import type {PackageJson} from 'type-fest';
 import * as versionUpdater from '@github/libs/versionUpdater';
 
 const semverLevel = core.getInput('SEMVER_LEVEL', {required: true});
 if (!semverLevel || !Object.values<string>(versionUpdater.SEMANTIC_VERSION_LEVELS).includes(semverLevel)) {
     core.setFailed(`'Error: Invalid input for 'SEMVER_LEVEL': ${semverLevel}`);
 }
 
-const {version: currentVersion} = JSON.parse(readFileSync('./package.json', 'utf8'));
-const previousVersion = versionUpdater.getPreviousVersion(currentVersion, semverLevel);
+const {version: currentVersion}: PackageJson = JSON.parse(readFileSync('./package.json', 'utf8'));
+if (!currentVersion) {
+    core.setFailed('Error: Could not read package.json');
+}
+
+const previousVersion = versionUpdater.getPreviousVersion(currentVersion ?? '', semverLevel);
 core.setOutput('PREVIOUS_VERSION', previousVersion);

.github/actions/javascript/getPreviousVersion/index.js

@@ -2728,7 +2728,10 @@ if (!semverLevel || !Object.values(versionUpdater.SEMANTIC_VERSION_LEVELS).inclu
     core.setFailed(`'Error: Invalid input for 'SEMVER_LEVEL': ${semverLevel}`);
 }
 const { version: currentVersion } = JSON.parse((0, fs_1.readFileSync)('./package.json', 'utf8'));
-const previousVersion = versionUpdater.getPreviousVersion(currentVersion, semverLevel);
+if (!currentVersion) {
+    core.setFailed('Error: Could not read package.json');
+}
+const previousVersion = versionUpdater.getPreviousVersion(currentVersion ?? '', semverLevel);
 core.setOutput('PREVIOUS_VERSION', previousVersion);
 
 

.github/actions/javascript/reviewerChecklist/reviewerChecklist.ts

@@ -90,7 +90,7 @@ function checkIssueForCompletedChecklist(numberOfChecklistItems: number) {
 
 getNumberOfItemsFromReviewerChecklist()
     .then(checkIssueForCompletedChecklist)
-    .catch((err) => {
+    .catch((err: string | Error) => {
         console.error(err);
         core.setFailed(err);
     });

.github/scripts/detectRedirectCycle.ts

@@ -52,7 +52,7 @@ function detectCycle(): boolean {
 
 fs.createReadStream(`${process.cwd()}/docs/redirects.csv`)
     .pipe(parser)
-    .on('data', (row) => {
+    .on('data', (row: [string, string]) => {
         // Create a directed graph of sourceURL -> targetURL
         addEdge(row[0], row[1]);
     })

.github/workflows/e2ePerformanceTests.yml

@@ -15,6 +15,10 @@ on:
         type: string
         required: true
 
+concurrency:
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-e2e
+  cancel-in-progress: true
+
 jobs:
   buildBaseline:
     runs-on: ubuntu-latest-xl

.github/workflows/lint.yml

@@ -8,7 +8,7 @@ on:
     paths: ['**.js', '**.ts', '**.tsx', '**.json', '**.mjs', '**.cjs', 'config/.editorconfig', '.watchmanconfig', '.imgbotconfig']
 
 concurrency:
-  group: "${{ github.ref }}-lint"
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-lint
   cancel-in-progress: true
 
 jobs:

.github/workflows/test.yml

@@ -8,7 +8,7 @@ on:
     paths: ['**.js', '**.ts', '**.tsx', '**.sh', 'package.json', 'package-lock.json']
 
 concurrency:
-  group: "${{ github.ref }}-jest"
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-jest
   cancel-in-progress: true
 
 jobs:

.github/workflows/typecheck.yml

@@ -7,6 +7,10 @@ on:
     branches-ignore: [staging, production]
     paths: ['**.js', '**.ts', '**.tsx', 'package.json', 'package-lock.json', 'tsconfig.json']
 
+concurrency:
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-typecheck
+  cancel-in-progress: true
+
 jobs:
   typecheck:
     if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}

android/app/build.gradle

@@ -2,12 +2,21 @@ apply plugin: "com.android.application"
 apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
 apply plugin: "com.google.firebase.firebase-perf"
+apply plugin: "fullstory"
 apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
 
 /**
  * This is the configuration block to customize your React Native Android app.
  * By default you don't need to apply any configuration, just uncomment the lines you need.
  */
+
+/* Fullstory settings */
+fullstory {
+    org 'o-1WN56P-na1'
+    enabledVariants 'all'
+    logcatLevel 'debug'
+}
+
 react {
     /* Folders */
     //   The root of your project, i.e. where "package.json" lives. Default is '..'
@@ -98,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001047404
-        versionName "1.4.74-4"
+        versionCode 1001047606
+        versionName "1.4.76-6"
         // 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"
@@ -162,7 +171,7 @@ android {
             signingConfig null
             // buildTypes take precedence over productFlavors when it comes to the signing configuration,
             // thus we need to manually set the signing config, so that the e2e uses the debug config again.
-            // In other words, the signingConfig setting above will be ignored when we build the flavor in release mode. 
+            // In other words, the signingConfig setting above will be ignored when we build the flavor in release mode.
             productFlavors.all { flavor ->
                 // All release builds should be signed with the release config ...
                 flavor.signingConfig signingConfigs.release

android/build.gradle

@@ -20,13 +20,17 @@ buildscript {
     repositories {
         google()
         mavenCentral()
+        maven {url "https://maven.fullstory.com"}
     }
     dependencies {
         classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("com.google.gms:google-services:4.3.4")
         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")
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
@@ -70,7 +74,7 @@ allprojects {
                 // 'mapbox' is the fixed username for Mapbox's Maven repository.
                 username = 'mapbox'
 
-                // The value for password is read from the 'MAPBOX_DOWNLOADS_TOKEN' gradle property. 
+                // The value for password is read from the 'MAPBOX_DOWNLOADS_TOKEN' gradle property.
                 // Run "npm run setup-mapbox-sdk" to set this property in «USER_HOME»/.gradle/gradle.properties
 
                 // Example gradle.properties entry:

babel.config.js

@@ -35,6 +35,17 @@ const metro = {
         ['@babel/plugin-proposal-private-property-in-object', {loose: true}],
         // The reanimated babel plugin needs to be last, as stated here: https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/installation
         'react-native-reanimated/plugin',
+
+        /* Fullstory */
+        '@fullstory/react-native',
+        [
+            '@fullstory/babel-plugin-annotate-react',
+            {
+                native: true,
+                setFSTagName: true,
+            },
+        ],
+
         // Import alias for native devices
         [
             'module-resolver',

config/webpack/webpack.common.ts

@@ -98,7 +98,7 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
                 {from: 'web/apple-touch-icon.png'},
                 {from: 'assets/images/expensify-app-icon.svg'},
                 {from: 'web/manifest.json'},
-                {from: 'web/gtm.js'},
+                {from: 'web/thirdPartyScripts.js'},
                 {from: 'assets/css', to: 'css'},
                 {from: 'assets/fonts/web', to: 'fonts'},
                 {from: 'assets/sounds', to: 'sounds'},

contributingGuides/CONTRIBUTING.md

@@ -95,18 +95,19 @@ Additionally, if you want to discuss an idea with the open source community with
 
 #### Propose a solution for the job
 4. You can propose solutions on any issue at any time, but if you propose solutions to jobs before the `Help Wanted` label is applied, you do so at your own risk. Proposals will not be reviewed until the label is added and there is always a chance that we might not add the label or hire an external contributor for the job.
-5. After you reproduce the issue, complete the [proposal template here](./PROPOSAL_TEMPLATE.md) and post it as a comment in the corresponding GitHub issue (linked in the Upwork job).
+5. Contributors should **not** submit proposals on issues when they have assigned issues or PRs that are awaiting an action from them. If so, they will be in violation of Rule #1 (Get Shit Done) in our [Code of Conduct](https://github.com/Expensify/App/blob/main/CODE_OF_CONDUCT.md) and will receive a warning. Multiple warnings can lead to removal from the program. 
+6. After you reproduce the issue, complete the [proposal template here](./PROPOSAL_TEMPLATE.md) and post it as a comment in the corresponding GitHub issue (linked in the Upwork job).
     - Note: Before submitting a proposal on an issue, be sure to read any other existing proposals. ALL NEW PROPOSALS MUST BE DIFFERENT FROM EXISTING PROPOSALS. The *difference* should be important, meaningful or considerable.
-6. Refrain from leaving additional comments until someone from the Contributor-Plus team and / or someone from Expensify provides feedback on your proposal (do not create a pull request yet).
+7. Refrain from leaving additional comments until someone from the Contributor-Plus team and / or someone from Expensify provides feedback on your proposal (do not create a pull request yet).
     - Do not leave more than one proposal.
     - Do not make extensive changes to your current proposal until after it has been reviewed.
     - If you want to make an entirely new proposal or update an existing proposal, please go back and edit your original proposal, then post a new comment to the issue in this format to alert everyone that it has been updated:
     ```
     ## Proposal
     [Updated](link to proposal)
     ```
-7. If your proposal is accepted by the Expensify engineer assigned to the issue, Expensify will hire you on Upwork and assign the GitHub issue to you.
-8. Once hired, post a comment in the Github issue stating when you expect to have your PR ready for review.
+8. If your proposal is accepted by the Expensify engineer assigned to the issue, Expensify will hire you on Upwork and assign the GitHub issue to you.
+9. Once hired, post a comment in the Github issue stating when you expect to have your PR ready for review.
 
 #### Begin coding your solution in a pull request
 9. When you are ready to start, fork the repository and create a new branch.

contributingGuides/STYLE.md

@@ -242,7 +242,7 @@ const foo: object = [1, 2, 3]; // TypeScript does not error
 
 If you know that the type of data is an object but don't know what properties or values it has beforehand, use `Record<string, unknown>`.
 
-> Even though `string` is specified as a key, `Record<string, unknown>` type can still accepts objects whose keys are numbers. This is because numbers are converted to strings when used as an object index. Note that you cannot use [symbols](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Symbol) for `Record<string, unknown>`.
+> Even though `string` is specified as a key, `Record<string, unknown>` type can still accept objects whose keys are numbers. This is because numbers are converted to strings when used as an object index. Note that you cannot use [symbols](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Symbol) for `Record<string, unknown>`.
 
 ```ts
 function logObject(object: Record<string, unknown>) {

desktop/ELECTRON_EVENTS.ts

@@ -9,6 +9,10 @@ const ELECTRON_EVENTS = {
     KEYBOARD_SHORTCUTS_PAGE: 'keyboard-shortcuts-page',
     START_UPDATE: 'start-update',
     UPDATE_DOWNLOADED: 'update-downloaded',
+    DOWNLOAD: 'download',
+    DOWNLOAD_COMPLETED: 'download-completed',
+    DOWNLOAD_FAILED: 'download-started',
+    DOWNLOAD_CANCELED: 'download-canceled',
     SILENT_UPDATE: 'silent-update',
 } as const;
 

desktop/contextBridge.ts

@@ -16,10 +16,19 @@ const WHITELIST_CHANNELS_RENDERER_TO_MAIN = [
     ELECTRON_EVENTS.REQUEST_VISIBILITY,
     ELECTRON_EVENTS.START_UPDATE,
     ELECTRON_EVENTS.LOCALE_UPDATED,
+    ELECTRON_EVENTS.DOWNLOAD,
     ELECTRON_EVENTS.SILENT_UPDATE,
 ] as const;
 
-const WHITELIST_CHANNELS_MAIN_TO_RENDERER = [ELECTRON_EVENTS.KEYBOARD_SHORTCUTS_PAGE, ELECTRON_EVENTS.UPDATE_DOWNLOADED, ELECTRON_EVENTS.FOCUS, ELECTRON_EVENTS.BLUR] as const;
+const WHITELIST_CHANNELS_MAIN_TO_RENDERER = [
+    ELECTRON_EVENTS.KEYBOARD_SHORTCUTS_PAGE,
+    ELECTRON_EVENTS.UPDATE_DOWNLOADED,
+    ELECTRON_EVENTS.FOCUS,
+    ELECTRON_EVENTS.BLUR,
+    ELECTRON_EVENTS.DOWNLOAD_COMPLETED,
+    ELECTRON_EVENTS.DOWNLOAD_FAILED,
+    ELECTRON_EVENTS.DOWNLOAD_CANCELED,
+] as const;
 
 const getErrorMessage = (channel: string): string => `Electron context bridge cannot be used with channel '${channel}'`;
 
@@ -67,7 +76,7 @@ contextBridge.exposeInMainWorld('electron', {
         }
 
         // Deliberately strip event as it includes `sender`
-        ipcRenderer.on(channel, (event, ...args) => func(...args));
+        ipcRenderer.on(channel, (event, ...args: unknown[]) => func(...args));
     },
 
     /** Remove listeners for a single channel from the main process and sent to the renderer process. */