Merge branch 'main' into feat/50907-GR-Phase3-Step5-nav-api-call

Expensify · Feb 14, 2025 · 03164a2 · 03164a2
2 parents 5b29968 + cd3fb6d
commit 03164a2
Show file tree

Hide file tree

Showing 57 changed files with 1,743 additions and 1,024 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -150,8 +150,14 @@ module.exports = {
             {
                 selector: ['variable', 'property'],
                 format: ['camelCase', 'UPPER_CASE', 'PascalCase'],
+                // This filter excludes variables and properties that start with "private_" to make them valid.
+                //
+                // Examples:
+                // - "private_a" → valid
+                // - "private_test" → valid
+                // - "private_" → not valid
                 filter: {
-                    regex: '^private_[a-z][a-zA-Z0-9]+$',
+                    regex: '^private_[a-z][a-zA-Z0-9]*$',
                     match: false,
                 },
             },

diff --git a/Mobile-Expensify b/Mobile-Expensify
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009009800
-        versionName "9.0.98-0"
+        versionCode 1009009803
+        versionName "9.0.98-3"
         // 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/docs/_data/_routes.yml b/docs/_data/_routes.yml
@@ -54,11 +54,6 @@ platforms:
         icon: /assets/images/hand-card.svg
         description: Explore the perks and benefits of the Expensify Card.
 
-      - href: travel
-        title: Travel
-        icon: /assets/images/plane.svg
-        description: Manage all your corporate travel needs with Expensify Travel.
-
       - href: copilots-and-delegates
         title: Copilots & Delegates
         icon: /assets/images/envelope-receipt.svg

diff --git a/docs/articles/expensify-classic/travel/Approve-travel-expenses.md b/docs/articles/expensify-classic/travel/Approve-travel-expenses.md
diff --git a/docs/articles/expensify-classic/travel/Book-with-Expensify-Travel.md b/docs/articles/expensify-classic/travel/Book-with-Expensify-Travel.md