Merge branch 'main' into Rory-TransitionSurvey

# Conflicts: # package-lock.json # package.json # src/ONYXKEYS.ts # src/libs/API/parameters/index.ts # src/libs/API/types.ts # src/libs/Navigation/linkingConfig/config.ts
Expensify · Feb 24, 2024 · 411b281 · 411b281
2 parents a5fb310 + e9fb49d
commit 411b281
Show file tree

Hide file tree

Showing 372 changed files with 6,207 additions and 4,861 deletions.
diff --git a/.github/actions/composite/setupNode/action.yml b/.github/actions/composite/setupNode/action.yml
@@ -1,6 +1,11 @@
 name: Set up Node
 description: Set up Node
 
+outputs:
+  cache-hit:
+    description: Was there a cache hit on the main node_modules?
+    value: ${{ steps.cache-node-modules.outputs.cache-hit }}
+
 runs:
   using: composite
   steps:

diff --git a/.github/workflows/failureNotifier.yml b/.github/workflows/failureNotifier.yml
@@ -88,7 +88,7 @@ jobs:
                     repo: context.repo.repo,
                     title: issueTitle,
                     body: issueBody,
-                    labels: [failureLabel, 'Daily'],
+                    labels: [failureLabel, 'Hourly'],
                     assignees: [prMerger]
                   });
                 }

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
@@ -184,6 +184,7 @@ jobs:
         run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
 
       - name: Setup Node
+        id: setup-node
         uses: ./.github/actions/composite/setupNode
 
       - name: Setup Ruby
@@ -206,7 +207,7 @@ jobs:
 
       - name: Install cocoapods
         uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
-        if: steps.pods-cache.outputs.cache-hit != 'true' || steps.compare-podfile-and-manifest.outputs.IS_PODFILE_SAME_AS_MANIFEST != 'true'
+        if: steps.pods-cache.outputs.cache-hit != 'true' || steps.compare-podfile-and-manifest.outputs.IS_PODFILE_SAME_AS_MANIFEST != 'true' || steps.setup-node.outputs.cache-hit != 'true'
         with:
           timeout_minutes: 10
           max_attempts: 5

diff --git a/__mocks__/@react-native-community/netinfo.ts b/__mocks__/@react-native-community/netinfo.ts
@@ -2,12 +2,12 @@ import {NetInfoCellularGeneration, NetInfoStateType} from '@react-native-communi
 import type {addEventListener, configure, fetch, NetInfoState, refresh, useNetInfo} from '@react-native-community/netinfo';
 
 const defaultState: NetInfoState = {
-    type: NetInfoStateType.cellular,
+    type: NetInfoStateType?.cellular,
     isConnected: true,
     isInternetReachable: true,
     details: {
         isConnectionExpensive: true,
-        cellularGeneration: NetInfoCellularGeneration['3g'],
+        cellularGeneration: NetInfoCellularGeneration?.['3g'],
         carrier: 'T-Mobile',
     },
 };

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001044303
-        versionName "1.4.43-3"
+        versionCode 1001044318
+        versionName "1.4.43-18"
     }
 
     flavorDimensions "default"

diff --git a/assets/images/folder.svg b/assets/images/folder.svg
diff --git a/assets/images/product-illustrations/emptystate__expenses.svg b/assets/images/product-illustrations/emptystate__expenses.svg
diff --git a/assets/images/simple-illustrations/simple-illustration__approval.svg b/assets/images/simple-illustrations/simple-illustration__approval.svg