Merge branch 'main' into ts/eslint-typescript-config

Expensify · May 13, 2024 · 5ebca88 · 5ebca88
2 parents ccfd44b + 2e6e8ca
commit 5ebca88
Show file tree

Hide file tree

Showing 237 changed files with 6,620 additions and 3,104 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-20.10.0
+20.13.0
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 1001047002
-        versionName "1.4.70-2"
+        versionCode 1001047201
+        versionName "1.4.72-1"
         // 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"

diff --git a/assets/images/credit-card-hourglass.svg b/assets/images/credit-card-hourglass.svg
diff --git a/assets/images/receipt-scan.svg b/assets/images/receipt-scan.svg
diff --git a/contributingGuides/PROPTYPES_CONVERSION_TABLE.md b/contributingGuides/PROPTYPES_CONVERSION_TABLE.md