Merge branch 'main' into fix/37519-group-chat-not-show-in-search-afte…

…r-split

.eslintrc.js

@@ -260,13 +260,7 @@ module.exports = {
                 'no-restricted-imports': [
                     'error',
                     {
-                        paths: [
-                            ...restrictedImportPaths,
-                            {
-                                name: 'underscore',
-                                message: 'Please use the corresponding method from lodash instead',
-                            },
-                        ],
+                        paths: restrictedImportPaths,
                         patterns: restrictedImportPatterns,
                     },
                 ],

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

@@ -14,6 +14,7 @@ const run = () => {
 
     // Initialize string to store Graphite metrics
     let graphiteString = '';
+    let timestamp: number;
 
     // Iterate over each entry
     regressionEntries.forEach((entry) => {
@@ -26,7 +27,9 @@ const run = () => {
             const current = JSON.parse(entry);
 
             // Extract timestamp, Graphite accepts timestamp in seconds
-            const timestamp = current.metadata?.creationDate ? Math.floor(new Date(current.metadata.creationDate).getTime() / 1000) : '';
+            if (current.metadata?.creationDate) {
+                timestamp = Math.floor(new Date(current.metadata.creationDate).getTime() / 1000);
+            }
 
             if (current.name && current.meanDuration && current.meanCount && timestamp) {
                 const formattedName = current.name.split(' ').join('-');

.github/actions/javascript/getGraphiteString/index.js

@@ -2735,6 +2735,7 @@ const run = () => {
     const regressionEntries = regressionFile.split('\n');
     // Initialize string to store Graphite metrics
     let graphiteString = '';
+    let timestamp;
     // Iterate over each entry
     regressionEntries.forEach((entry) => {
         // Skip empty lines
@@ -2744,7 +2745,9 @@ const run = () => {
         try {
             const current = JSON.parse(entry);
             // Extract timestamp, Graphite accepts timestamp in seconds
-            const timestamp = current.metadata?.creationDate ? Math.floor(new Date(current.metadata.creationDate).getTime() / 1000) : '';
+            if (current.metadata?.creationDate) {
+                timestamp = Math.floor(new Date(current.metadata.creationDate).getTime() / 1000);
+            }
             if (current.name && current.meanDuration && current.meanCount && timestamp) {
                 const formattedName = current.name.split(' ').join('-');
                 const renderDurationString = `${GRAPHITE_PATH}.${formattedName}.renderDuration ${current.meanDuration} ${timestamp}`;

.github/scripts/detectRedirectCycle.ts

@@ -0,0 +1,64 @@
+import {parse} from 'csv-parse';
+import fs from 'fs';
+
+const parser = parse();
+
+const adjacencyList: Record<string, string[]> = {};
+const visited: Map<string, boolean> = new Map<string, boolean>();
+const backEdges: Map<string, boolean> = new Map<string, boolean>();
+
+function addEdge(source: string, target: string) {
+    if (!adjacencyList[source]) {
+        adjacencyList[source] = [];
+    }
+    adjacencyList[source].push(target);
+}
+
+function isCyclic(currentNode: string): boolean {
+    visited.set(currentNode, true);
+    backEdges.set(currentNode, true);
+
+    // Do a depth first search for all the neighbours. If a node is found in backedge, a cycle is detected.
+    const neighbours = adjacencyList[currentNode];
+    if (neighbours) {
+        for (const node of neighbours) {
+            if (!visited.has(node)) {
+                if (isCyclic(node)) {
+                    return true;
+                }
+            } else if (backEdges.has(node)) {
+                return true;
+            }
+        }
+    }
+
+    backEdges.delete(currentNode);
+
+    return false;
+}
+
+function detectCycle(): boolean {
+    for (const [node] of Object.entries(adjacencyList)) {
+        if (!visited.has(node)) {
+            if (isCyclic(node)) {
+                const cycle = Array.from(backEdges.keys());
+                console.log(`Infinite redirect found in the cycle: ${cycle.join(' -> ')} -> ${node}`);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+fs.createReadStream(`${process.cwd()}/docs/redirects.csv`)
+    .pipe(parser)
+    .on('data', (row) => {
+        // Create a directed graph of sourceURL -> targetURL
+        addEdge(row[0], row[1]);
+    })
+    .on('end', () => {
+        if (detectCycle()) {
+            process.exit(1);
+        }
+        process.exit(0);
+    });

.github/scripts/verifyRedirect.sh

@@ -5,11 +5,22 @@
 
 declare -r REDIRECTS_FILE="docs/redirects.csv"
 
+declare -r RED='\033[0;31m'
+declare -r GREEN='\033[0;32m'
+declare -r NC='\033[0m'
+
 duplicates=$(awk -F, 'a[$1]++{print $1}' $REDIRECTS_FILE)
+if [[ -n "$duplicates" ]]; then
+    echo "${RED}duplicate redirects are not allowed: $duplicates ${NC}"
+    exit 1
+fi
 
-if [[ -z "$duplicates" ]]; then
-    exit 0
+npm run detectRedirectCycle
+DETECT_CYCLE_EXIT_CODE=$?
+if [[ DETECT_CYCLE_EXIT_CODE -eq 1 ]]; then
+    echo -e "${RED}The redirects.csv has a cycle. Please remove the redirect cycle because it will cause an infinite redirect loop ${NC}"
+    exit 1
 fi
 
-echo "duplicate redirects are not allowed: $duplicates"
-exit 1
+echo -e "${GREEN}The redirects.csv is valid!${NC}"
+exit 0

.github/workflows/deployExpensifyHelp.yml

@@ -26,6 +26,8 @@ concurrency:
 
 jobs:
   build:
+    env:
+      IS_PR_FROM_FORK: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -36,8 +38,8 @@ jobs:
 
       - name: Create docs routes file
         run: ./.github/scripts/createDocsRoutes.sh
-      
-      - name: Check duplicates in redirect.csv
+
+      - name: Check for duplicates and cycles in redirects.csv
         run: ./.github/scripts/verifyRedirect.sh
 
       - name: Build with Jekyll
@@ -49,24 +51,26 @@ jobs:
       - name: Deploy to Cloudflare Pages
         uses: cloudflare/pages-action@f0a1cd58cd66095dee69bfa18fa5efd1dde93bca
         id: deploy
-        if: github.event_name != 'pull_request' || (github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork)
+        if: env.IS_PR_FROM_FORK != 'true'
         with:
           apiToken: ${{ secrets.CLOUDFLARE_PAGES_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           projectName: helpdot
           directory: ./docs/_site
 
       - name: Setup Cloudflare CLI
+        if: env.IS_PR_FROM_FORK != 'true'
         run: pip3 install cloudflare==2.19.0
 
       - name: Purge Cloudflare cache
+        if: env.IS_PR_FROM_FORK != 'true'
         run: /home/runner/.local/bin/cli4 --verbose --delete hosts=["help.expensify.com"] /zones/:9ee042e6cfc7fd45e74aa7d2f78d617b/purge_cache
         env:
           CF_API_KEY: ${{ secrets.CLOUDFLARE_TOKEN }}
 
       - name: Leave a comment on the PR
         uses: actions-cool/maintain-one-comment@de04bd2a3750d86b324829a3ff34d47e48e16f4b
-        if: ${{ github.event_name == 'pull_request' }}
+        if: ${{ github.event_name == 'pull_request' && env.IS_PR_FROM_FORK != 'true' }}
         with:
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
           body: ${{ format('A preview of your ExpensifyHelp changes have been deployed to {0} ⚡️', steps.deploy.outputs.alias) }}

.github/workflows/e2ePerformanceTests.yml

@@ -107,7 +107,7 @@ jobs:
         if: ${{ !fromJSON(steps.getPullRequestDetails.outputs.IS_MERGED) }}
         id: getMergeCommitShaIfUnmergedPR
         run: |
-          git merge --allow-unrelated-histories --no-commit ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }}
+          git merge --allow-unrelated-histories -X ours --no-commit ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }}
           git checkout ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }}
         env:
           GITHUB_TOKEN: ${{ github.token }}

.github/workflows/typecheck.yml

@@ -30,7 +30,7 @@ jobs:
           #    - git diff is used to see the files that were added on this branch
           #    - gh pr view is used to list files touched by this PR. Git diff may give false positives if the branch isn't up-to-date with main
           #  - wc counts the words in the result of the intersection
-          count_new_js=$(comm -1 -2 <(git diff --name-only --diff-filter=A origin/main HEAD -- 'src/*.js' '__mocks__/*.js' '.storybook/*.js' 'assets/*.js' 'config/*.js' 'desktop/*.js' 'jest/*.js' 'scripts/*.js' 'tests/*.js' 'web/*.js' 'workflow_tests/*.js' '.github/libs/*.js' '.github/scripts/*.js') <(gh pr view ${{ github.event.pull_request.number }} --json files | jq -r '.files | map(.path) | .[]') | wc -l)
+          count_new_js=$(comm -1 -2 <(git diff --name-only --diff-filter=A origin/main HEAD -- 'src/*.js' '__mocks__/*.js' '.storybook/*.js' 'assets/*.js' 'config/*.js' 'desktop/*.js' 'jest/*.js' 'scripts/*.js' 'tests/*.js' 'workflow_tests/*.js' '.github/libs/*.js' '.github/scripts/*.js') <(gh pr view ${{ github.event.pull_request.number }} --json files | jq -r '.files | map(.path) | .[]') | wc -l)
           if [ "$count_new_js" -gt "0" ]; then
             echo "ERROR: Found new JavaScript files in the project; use TypeScript instead."
             exit 1

.well-known/apple-app-site-association

@@ -52,6 +52,10 @@
                         "/": "/split/*",
                         "comment": "Split Expense"
                     },
+                    {
+                        "/": "/submit/*",
+                        "comment": "Submit Expense"
+                    },
                     {
                         "/": "/request/*",
                         "comment": "Submit Expense"
@@ -76,6 +80,10 @@
                         "/": "/search/*",
                         "comment": "Search"
                     },
+                    {
+                        "/": "/pay/*",
+                        "comment": "Pay someone"
+                    },
                     {
                         "/": "/send/*",
                         "comment": "Pay someone"

README.md

@@ -60,6 +60,7 @@ If you're using another operating system, you will need to ensure `mkcert` is in
 For an M1 Mac, read this [SO](https://stackoverflow.com/questions/64901180/how-to-run-cocoapods-on-apple-silicon-m1) for installing cocoapods.
 
 * If you haven't already, install Xcode tools and make sure to install the optional "iOS Platform" package as well. This installation may take awhile.
+    * After installation, check in System Settings that there's no update for Xcode. Otherwise, you may encounter issues later that don't explain that you solve them by updating Xcode.
 * Install project gems, including cocoapods, using bundler to ensure everyone uses the same versions. In the project root, run: `bundle install`
     * If you get the error `Could not find 'bundler'`, install the bundler gem first: `gem install bundler` and try again.
     * If you are using MacOS and get the error `Gem::FilePermissionError` when trying to install the bundler gem, you're likely using system Ruby, which requires administrator permission to modify. To get around this, install another version of Ruby with a version manager like [rbenv](https://github.com/rbenv/rbenv#installation).
@@ -82,6 +83,16 @@ If you want to run the app on an actual physical iOS device, please follow the i
 ## Running the MacOS desktop app 🖥
 * To run the **Development app**, run: `npm run desktop`, this will start a new Electron process running on your MacOS desktop in the `dist/Mac` folder.
 
+## Receiving Notifications
+To receive notifications on development build of the app while hitting the Staging or Production API, you need to use the production airship config.
+### Android
+1. Copy the [production config](https://github.com/Expensify/App/blob/d7c1256f952c0020344d809ee7299b49a4c70db2/android/app/src/main/assets/airshipconfig.properties#L1-L7) to the [development config](https://github.com/Expensify/App/blob/d7c1256f952c0020344d809ee7299b49a4c70db2/android/app/src/development/assets/airshipconfig.properties#L1-L8).
+2. Rebuild the app.
+
+### iOS
+1. Replace the [development key and secret](https://github.com/Expensify/App/blob/d7c1256f952c0020344d809ee7299b49a4c70db2/ios/AirshipConfig.plist#L7-L10) with the [production values](https://github.com/Expensify/App/blob/d7c1256f952c0020344d809ee7299b49a4c70db2/ios/AirshipConfig.plist#L11-L14).
+2. Rebuild the app.
+
 ## Troubleshooting
 1. If you are having issues with **_Getting Started_**, please reference [React Native's Documentation](https://reactnative.dev/docs/environment-setup)
 2. If you are running into CORS errors like (in the browser dev console)

android/app/build.gradle

@@ -2,12 +2,20 @@ 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'
+}
+
 react {
     /* Folders */
     //   The root of your project, i.e. where "package.json" lives. Default is '..'
@@ -98,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001046300
-        versionName "1.4.63-0"
+        versionCode 1001046500
+        versionName "1.4.65-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"
@@ -162,7 +170,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/app/src/main/AndroidManifest.xml

@@ -62,6 +62,7 @@
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/bank-account"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/iou"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/request"/>
+                <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/submit"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/enable-payments"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/statements"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/concierge"/>
@@ -70,6 +71,7 @@
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/new"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/search"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/send"/>
+                <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/pay"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/money2020"/>
 
                 <!-- Staging URLs -->
@@ -81,6 +83,7 @@
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/bank-account"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/iou"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/request"/>
+                <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/submit"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/enable-payments"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/statements"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/concierge"/>
@@ -89,6 +92,7 @@
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/new"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/search"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/send"/>
+                <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/pay"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/money2020"/>
             </intent-filter>
         </activity>

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.45.1")
+
         // 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

@@ -14,6 +14,23 @@ const defaultPlugins = [
     // source code transformation as we do not use class property assignment.
     'transform-class-properties',
 
+    /* Fullstory */
+    [
+        '@fullstory/react-native',
+        {
+            version: '1.4.0',
+            org: 'o-1WN56P-na1',
+            enabledVariants: 'all',
+        },
+    ],
+    [
+        '@fullstory/babel-plugin-annotate-react',
+        {
+            native: true,
+            setFSTagName: true,
+        },
+    ],
+
     // Keep it last
     'react-native-reanimated/plugin',
 ];

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'},