Merge branch 'main' into @wolewicki/enable-bridgeless

Expensify · Sep 20, 2024 · f35a62d · f35a62d
2 parents e7c526e + 4c9a3fb
commit f35a62d
Show file tree

Hide file tree

Showing 1,018 changed files with 40,682 additions and 24,826 deletions.
diff --git a/.env.example b/.env.example
@@ -28,3 +28,7 @@ EXPENSIFY_ACCOUNT_ID_RECEIPTS=-1
 EXPENSIFY_ACCOUNT_ID_REWARDS=-1
 EXPENSIFY_ACCOUNT_ID_STUDENT_AMBASSADOR=-1
 EXPENSIFY_ACCOUNT_ID_SVFG=-1
+
+FB_API_KEY=YOUR_API_KEY
+FB_APP_ID=YOUR_APP_ID
+FB_PROJECT_ID=YOUR_PROJECT_ID
diff --git a/.env.production b/.env.production
@@ -7,3 +7,7 @@ PUSHER_APP_KEY=268df511a204fbb60884
 USE_WEB_PROXY=false
 ENVIRONMENT=production
 SEND_CRASH_REPORTS=true
+
+FB_API_KEY=AIzaSyDxzigVLZl4G8MP7jACQ0qpmADMzmrrON0
+FB_APP_ID=1:921154746561:web:1583e882584cf151027c40
+FB_PROJECT_ID=expensify-chat
diff --git a/.eslintignore b/.eslintignore
@@ -3,6 +3,7 @@
 .github/actions/**/index.js
 *.config.js
 **/.eslintrc.js
+**/.eslintrc.changed.js
 **/node_modules/**
 **/dist/**
 android/**/build/**

diff --git a/.eslintrc.changed.js b/.eslintrc.changed.js
@@ -0,0 +1,10 @@
+module.exports = {
+    plugins: ['@typescript-eslint', 'deprecation'],
+    parser: '@typescript-eslint/parser',
+    parserOptions: {
+        project: './tsconfig.json',
+    },
+    rules: {
+        'deprecation/deprecation': 'error',
+    },
+};
diff --git a/.github/actions/composite/buildAndroidE2EAPK/action.yml b/.github/actions/composite/buildAndroidE2EAPK/action.yml
@@ -51,14 +51,13 @@ runs:
     - uses: Expensify/App/.github/actions/composite/setupNode@main
 
     - name: Setup Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: "oracle"
         java-version: "17"
 
-    - uses: ruby/setup-ruby@v1.187.0
+    - uses: ruby/setup-ruby@v1.190.0
       with:
-        ruby-version: "2.7"
         bundler-cache: true
 
     - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef

diff --git a/.github/actions/composite/setupNode/action.yml b/.github/actions/composite/setupNode/action.yml
@@ -9,12 +9,16 @@ outputs:
 runs:
   using: composite
   steps:
+    - name: Remove E/App version from package-lock.json
+      shell: bash
+      run: jq 'del(.version, .packages[""].version)' package-lock.json > normalized-package-lock.json
+
     - uses: actions/setup-node@v4
       with:
         node-version-file: '.nvmrc'
         cache: npm
         cache-dependency-path: |
-          package-lock.json
+          normalized-package-lock.json
           desktop/package-lock.json
 
     - id: cache-node-modules