Merge branch 'main' into fix-changed-workspace-copy-to-add-variation-without-policyName

Author: FitseTLT

.github/scripts/createDocsRoutes.ts

@@ -41,6 +41,7 @@ const routes = yaml.load(fs.readFileSync(`${docsDir}/_data/_routes.yml`, 'utf8')
 const platformNames = {
     expensifyClassic: 'expensify-classic',
     newExpensify: 'new-expensify',
+    travel: 'travel',
 } as const;
 
 /**
@@ -140,9 +141,11 @@ function createHubsWithArticles(hubs: string[], platformName: ValueOf<typeof pla
 function run() {
     const expensifyClassicArticleHubs = fs.readdirSync(`${docsDir}/articles/${platformNames.expensifyClassic}`);
     const newExpensifyArticleHubs = fs.readdirSync(`${docsDir}/articles/${platformNames.newExpensify}`);
+    const travelArticleHubs = fs.readdirSync(`${docsDir}/articles/${platformNames.travel}`);
 
     const expensifyClassicRoute = routes.platforms.find((platform) => platform.href === platformNames.expensifyClassic);
     const newExpensifyRoute = routes.platforms.find((platform) => platform.href === platformNames.newExpensify);
+    const travelRoute = routes.platforms.find((platform) => platform.href === platformNames.travel);
 
     if (expensifyClassicArticleHubs.length !== expensifyClassicRoute?.hubs.length) {
         console.error(warnMessage(platformNames.expensifyClassic));
@@ -154,8 +157,14 @@ function run() {
         process.exit(1);
     }
 
+    if (travelArticleHubs.length !== travelRoute?.hubs.length) {
+        console.error(warnMessage(platformNames.travel));
+        process.exit(1);
+    }
+
     createHubsWithArticles(expensifyClassicArticleHubs, platformNames.expensifyClassic, expensifyClassicRoute.hubs);
     createHubsWithArticles(newExpensifyArticleHubs, platformNames.newExpensify, newExpensifyRoute.hubs);
+    createHubsWithArticles(travelArticleHubs, platformNames.travel, travelRoute.hubs);
 
     // Convert the object to YAML and write it to the file
     let yamlString = yaml.dump(routes);

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009018202
-        versionName "9.1.82-2"
+        versionCode 1009018203
+        versionName "9.1.82-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"

android/app/build.gradle

@@ -84,19 +84,14 @@ platforms:
         icon: /assets/images/subscription-annual.svg
         description: Review Expensify's subscription options, plan types, and payment methods.
 
-      - href: travel
-        title: Travel
-        icon: /assets/images/plane.svg
-        description: Manage all your corporate travel needs with Expensify Travel.
-     
 
   - href: new-expensify
     title: New Expensify
     hub-title: New Expensify - Help & Resources
     hub-description: Questions? Find the answers by clicking a Category or using the search bar.
     url: new.expensify.com
     description: "Your account settings look like this:"
-    image: /assets/images/settings-new-dot.svg
+    image: /assets/images/help-new.png
 
     hubs:
       - href: getting-started
@@ -133,11 +128,6 @@ platforms:
         title: Expensify Card
         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: connections
         title: Connections
@@ -154,3 +144,41 @@ platforms:
         icon: /assets/images/subscription-annual.svg
         description: Review Expensify's subscription options, plan types, and payment methods.
 
+  - href: travel
+    title: Expensify Travel
+    hub-title: Expensify Travel
+    hub-description: Questions? Find the answers by clicking a Category or using the search bar.
+    url: travel.expensify.com
+    description: "Get the help you need to book and manage travel."
+    image: /assets/images/help-travel.png
+  
+    hubs:
+      - href: getting-started
+        title: Getting Started
+        icon: /assets/images/accounting.svg
+        description: "Learn how to get started with Expensify Travel."
+
+      - href: booking-travel
+        title: Booking with Expensify Travel
+        icon: /assets/images/simple-illustration__luggage.svg
+        description: "Everything you need to know about booking flights, hotels, and more with Expensify Travel."
+
+      - href: managing-trips
+        title: Managing trips
+        icon: /assets/images/plane.svg
+        description: "Learn how to easily manage, modify, or cancel your trips."
+
+      - href: company-setup
+        title: Setting up your company in Expensify Travel
+        icon: /assets/images/gears.svg
+        description: "Set up your company to manage departments, users, booking restrictions, and more."
+
+      - href: travel-policy
+        title: Creating a travel policy
+        icon: /assets/images/simple-illustration__rules.svg
+        description: "Create a clear, effective travel policy for employee bookings."
+
+      - href: travel-analytics
+        title: Travel Analytics
+        icon: /assets/images/simple-illustration__chart.svg
+        description: "Track spend, spot savings, and drive smarter bookings with travel analytics."

assets/images/companyCards/card-plaid.svg

@@ -1,7 +1,9 @@
-{% assign activePlatform = page.url | replace: '/', ' ' | truncatewords: 1 | remove:'...' %}
+{% assign urlParts = page.url | split: '/' %}
+{% assign activePlatform = urlParts[1] %}
+{% assign activeHub = urlParts[3] %}
+
 {% assign platform = site.data.routes.platforms | where: "href", activePlatform | first %}
 
-{% assign activeHub = page.url | remove: activePlatform | remove: "/hubs/" | remove: "/" | remove: ".html" %}
 {% assign hub = platform.hubs | where: "href", activeHub | first %}
 
 <h1 class="title">{{ hub.title }}</h1>