Merge branch 'main' into Rory-BumpPrettier

# Conflicts:
#	src/libs/SearchUIUtils.ts
#	src/pages/home/report/PureReportActionItem.tsx

Author: roryabraham

.github/scripts/validateActionsAndWorkflows.sh

@@ -41,14 +41,6 @@ done
 
 for ((i=0; i < ${#WORKFLOWS[@]}; i++)); do
   WORKFLOW=${WORKFLOWS[$i]}
-
-    # Skip linting e2e workflow due to bug here: https://github.com/SchemaStore/schemastore/issues/2579
-    if [[ "$WORKFLOW" == './workflows/e2ePerformanceTests.yml'
-          || "$WORKFLOW" == './workflows/testBuild.yml'
-          || "$WORKFLOW" == './workflows/deploy.yml' ]]; then
-      continue
-    fi
-
   ajv -s ./tempSchemas/github-workflow.json -d "$WORKFLOW" --strict=false &
   ASYNC_PROCESSES[${#ACTIONS[@]} + i]=$!
 done

.github/workflows/buildAndroid.yml

@@ -23,10 +23,13 @@ on:
 
     outputs:
       AAB_FILE_NAME:
+        description: Name of the AAB file produced by this workflow.
         value: ${{ jobs.build.outputs.AAB_FILE_NAME }}
       APK_FILE_NAME:
+        description: Name of the APK file produced by this workflow.
         value: ${{ jobs.build.outputs.APK_FILE_NAME }}
       APK_ARTIFACT_NAME:
+        description: Name of the APK artifact.
         value: ${{ jobs.build.outputs.APK_ARTIFACT_NAME }}
 
   workflow_dispatch:

.github/workflows/testBuildHybrid.yml

@@ -44,8 +44,10 @@ on:
 
     outputs:
       ANDROID_LINK:
+        description: The link to the Android build.
         value: ${{ jobs.androidHybrid.outputs.S3_APK_PATH }}
       IOS_LINK:
+        description: The link to the iOS build.
         value: ${{ jobs.iosHybrid.outputs.IOS_PATH }}
 
 env:

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009015402
-        versionName "9.1.54-2"
+        versionCode 1009015406
+        versionName "9.1.54-6"
         // 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

@@ -127,7 +127,8 @@ Enter any of the following formulas into the Formula field for each column. Be s
 | Expenses Count | Is the number of total expenses on the report of this specific expense.|
 | {report:expensescount} | Would output 10 assuming that there were 10 expenses on the given report for this expense.|
 | Workspace Name | Is the name of the workspace applied to the report.|
-| {report:policyname} | Would output Sales assuming that the given report was under a workspace named Sales.|
+| {report:workspaceName} | Would output Sales assuming that the given report was under a workspace named Sales.|
+| {report:policyName} | Same as the workspace name. Policy is an older term for workspace.|
 | Status | Is the current state of the report when it was exported.|
 | {report:status} | Would output Approved assuming that the report has been approved and not yet reimbursed.|
 | Custom Fields | |

docs/articles/expensify-classic/spending-insights/Export-Expenses-And-Reports.md

@@ -0,0 +1,148 @@
+---
+title: Configure-QuickBooks-Desktop.md
+description: Learn how to connect and configure your QuickBooks Desktop integration with Expensify to manage imports, exports, and advanced accounting settings.
+keywords: [QuickBooks Desktop, Expensify integration, accounting settings, import settings, export settings, QBD, configure QuickBooks Desktop]
+---
+
+Connecting QuickBooks Desktop to Expensify helps streamline expense reporting, reimbursements, and accounting workflows. This guide walks you through connecting and configuring your import, export, and advanced settings for QuickBooks Desktop.
+
+---
+
+# Step 1: Initial Connection
+
+**Web/Desktop:**
+1. Go to **Settings > Workspaces > [Workspace Name] > Accounting**.
+2. Find QuickBooks Desktop in the list of integrations and click **Set up**.
+3. You'll receive a Codat link URL that must be opened on the computer where QuickBooks Desktop is installed.
+4. Open the provided link on your QuickBooks Desktop computer and follow the connection flow.
+5. Once connected, you'll see a syncing screen while information imports from QuickBooks Desktop to Expensify.
+
+**Mobile:**
+Since QuickBooks Desktop is a desktop application, the connection process must be completed on the device that hosts QuickBooks Desktop. If you attempt to connect from a mobile device, you'll see a blocking screen directing you to complete the setup on your desktop.
+
+---
+
+# Step 2: Configure Import Settings
+
+These steps define how your QuickBooks Desktop data is pulled into Expensify.
+
+1. Go to **Settings > Workspaces > [Workspace Name] > Accounting**.
+2. Click the **Import** tab under the QuickBooks Desktop connection.
+3. Choose which coding configurations to import from QuickBooks Desktop. For each configuration, you can manage its import status:
+   - **Chart of accounts**: Always imported and used as categories in Expensify.
+   - **Classes**: Can be imported as tags or report fields for class-level tracking.
+   - **Customers/projects**: Can be imported as tags or report fields for expense-level tracking.
+   - **Items**: Can be imported and used as tags for itemized coding.
+
+**Default Settings:**
+- Classes are enabled as tags by default
+- Customers/projects and Items are disabled by default
+
+4. **For Classes and Customers/Projects**: Choose whether to import them as:
+   - **Tags**: Applied at the expense level
+   - **Report fields**: Applied at the report level
+
+5. **Control your imports**:
+   - The interface will show the current import status for each item (e.g., "Imported as categories" or "Not imported").
+   - Use the options provided to change these settings.
+
+---
+
+# Step 3: Configure Export Settings
+
+These settings control how Expensify exports reports and transactions to QuickBooks Desktop.
+
+1. Under the **Accounting** tab, go to the **Export** section.
+2. Configure the following settings:
+
+**Basic Export Settings:**
+   - **Preferred Exporter**: Choose a Workspace Admin to automate report exports (defaults to workspace owner).
+     - **Note**: If exporting company card transactions, the preferred exporter must also be a Domain Admin.
+   - **Export Date**: Choose **date of last expense** (default), **export date**, or **submitted date**.
+
+**Out-of-Pocket Expenses:**
+   - **Export out-of-pocket expenses as**: Choose from:
+     - **Vendor bill** (default)
+     - **Check** (includes option to mark as "print later" in QuickBooks Desktop)
+     - **Journal entry** (not supported if taxes are enabled)
+   - Select the appropriate bank account for each export type.
+
+**Company Card Expenses:**
+   - **Export company card expenses as**: Choose from:
+     - **Credit card** (default)
+     - **Debit card** 
+     - **Vendor bill**
+   - Configure accounts based on your selection:
+     - **Credit card account**: First credit card account in imported list (default)
+     - **Debit card account**: First bank account in imported list (default)
+     - **Accounts payable account**: First Accounts Payable account (for vendor bills)
+     - **Default vendor**: First vendor in imported list (for vendor bills)
+
+**Expensify Card Transactions:**
+   - **Export Expensify Card transactions as**: Typically set to **Credit card**.
+   - Expensify Card transactions automatically export to an "Expensify Card Liability Account" created with the integration.
+
+---
+
+# Step 4: Configure Advanced Settings
+
+These options manage syncing behavior, automation preferences, and additional account settings.
+
+1. Still in the **Accounting** section, select the **Advanced** tab.
+2. Review and configure each setting (all default to enabled):
+   - **Auto-sync**: Enable this for Expensify to automatically sync with QuickBooks Desktop every day.
+   - **Invite employees**: Automatically invite employees to the workspace.
+   - **Auto-create entities**: Expensify will automatically create vendors in QuickBooks Desktop if they don't exist already.
+   - **Sync reimbursed reports**: Automatically sync reimbursed reports.
+
+3. **Account Selections:**
+   - **Bill payment account**: Select the account for bill payments (defaults to first option)
+   - **Invoice collections account**: Select the account for invoice collections (defaults to first option)
+
+---
+
+# Step 5: Export Process
+
+Due to QuickBooks Desktop being an offline platform, exports are asynchronous:
+
+1. When you export a report, you'll first see an "export in progress" message.
+2. Codat stores the exported information until QuickBooks Desktop is next opened.
+3. Once successfully exported to QuickBooks Desktop, you'll receive a completion confirmation.
+4. Unlike cloud-based integrations, you won't get direct links to expenses in QuickBooks Desktop due to its offline nature.
+
+---
+
+# FAQ
+
+## Can I set up the QuickBooks Desktop integration from my mobile device?
+
+No, the initial connection and most configuration must be done from a desktop/web browser. Since QuickBooks Desktop runs on a desktop computer, the integration setup requires access to that same computer. Mobile users will see a blocking screen directing them to complete setup on desktop.
+
+## What happens if I try to export a report that's already been exported?
+
+Expensify will display an alert to help you avoid duplicates in QuickBooks Desktop.
+
+## Can I use Locations with QuickBooks Desktop?
+
+No, **Locations** are a QuickBooks Online-only feature. For similar tracking in QuickBooks Desktop, use **Classes** or **Customers/Projects**.
+
+## Why can't I export as a journal entry?
+
+If **taxes** are enabled, exporting as a journal entry is not supported. You'll need to switch to exporting as a **check** or **vendor bill**.
+
+## How do I reconnect if my QuickBooks Desktop integration stops working?
+
+If you encounter sync errors, you'll see a **Reinstall connector** option that will take you through the Codat connection flow again. This needs to be done on the computer where QuickBooks Desktop is installed, not on mobile.
+
+## Why don't my exports appear in QuickBooks Desktop immediately?
+
+QuickBooks Desktop is an offline application, so exports are asynchronous. Codat stores your exported data until you next open QuickBooks Desktop and the Web Connector can complete the sync.
+
+## Do I need to upgrade to a certain plan to use the QuickBooks Desktop integration?
+
+Yes. The QuickBooks Desktop integration is available on the **Control** plan.
+
+## What's the difference between tags and report fields for Classes and Customers/Projects?
+
+- **Tags**: Applied at the individual expense level, allowing different expenses on the same report to have different values
+- **Report fields**: Applied at the report level, meaning all expenses on a report share the same value

docs/articles/new-expensify/connections/quickbooks-desktop/Configure-QuickBooks-Desktop.md

@@ -0,0 +1,127 @@
+---
+title: travel-approval-types.md
+description: Learn about the different approval types in Expensify Travel powered by Spotnana, and how they impact booking workflows and policy compliance.
+keywords: Expensify Travel, approval types, soft approval, hard approval, passive approval, Spotnana, travel policies
+---
+
+<div id="new-expensify" markdown="1">
+
+Expensify Travel uses a tiered approval system to help organizations balance booking efficiency with policy oversight. Here's how each approval type works, and when to use them.
+
+# Expensify Travel approval types
+
+Expensify Travel (powered by Spotnana) supports **three types of booking approvals**: **Soft**, **Hard**, and **Passive**. These are set by your workspace's travel policy and determine the level of oversight required before a travel booking is finalized.
+
+---
+
+## How approval types are determined
+
+Each booking (air, hotel, car, etc.) is evaluated **independently** based on the travel policy configured in your workspace.
+
+Admins can define:
+- Which bookings require approval
+- What type of approval is used for different scenarios
+- Who needs to approve based on traveler role or booking type
+
+---
+
+## Booking process overview
+
+No matter the approval type, every booking follows this core process:
+
+1. The system tickets the booking immediately to lock in the fare.
+2. The travel policy engine checks the booking against your workspace's rules.
+3. If required, the system triggers the appropriate approval workflow.
+
+---
+
+## Soft approval (Opportunity to Deny)
+
+A booking can proceed **unless it's explicitly denied** by the approver within the void window.
+
+### Process:
+- The approver gets notified.
+- If they **do nothing**, the booking is confirmed.
+- If they **deny** within the void window, the ticket is voided.
+
+### Key characteristics:
+- No action is required to approve.
+- Approver sees language like: *"To approve this request, no action is required."*
+- The approval window is tied to the supplier's void window.
+- Low-friction process ideal for common bookings.
+
+### Best used for:
+- Everyday bookings where delays would risk fare increases.
+- Teams with strong, well-followed travel policies.
+- Use cases where notification is enough for visibility.
+
+---
+
+## Hard approval
+
+The approver **must take action** for the booking to go through.
+
+### Process:
+- Approver must explicitly approve within the void window.
+- If denied, the ticket is voided.
+- If no action is taken by the deadline, the ticket is automatically voided.
+
+### Key characteristics:
+- Action required to proceed.
+- Auto-void occurs if approval isn't given in time.
+- Approval window is the shorter of:
+  - 48 hours, or
+  - The supplier's full-refund void window
+- If travel begins within 48 hours, that becomes the approval deadline.
+
+### Downgrade scenarios:
+Hard approvals automatically downgrade to **Soft** when:
+- The supplier has a 0-hour void window.
+- The ticket is non-refundable.
+- The booking is made via manual form.
+
+### Best used for:
+- High-cost or international bookings.
+- Strict policy environments.
+- Scenarios where cost control is more important than fare locking.
+
+---
+
+## Passive approval (FYI only)
+
+Used purely for visibility—no action can be taken.
+
+### Process:
+- Approver is notified, but cannot approve or deny.
+- Booking continues automatically.
+
+### Key characteristics:
+- No action options.
+- Provides awareness, not oversight.
+
+### Downgrade scenarios:
+Both **Soft** and **Hard** approvals downgrade to **Passive** when:
+- The booking is made via manual form.
+
+### Best used for:
+- Informing managers about team travel.
+- Audit trail requirements.
+- Reducing booking friction while maintaining transparency.
+
+---
+
+# FAQ
+
+## Can a trip include multiple approval types?
+Yes. Air, hotel, and car bookings are evaluated independently and may each follow different approval rules.
+
+## What is a "void window"?
+The time frame in which a ticket can be canceled for a full refund—set by the travel supplier.
+
+## What happens if an approver misses the hard approval window?
+The booking is **auto-voided** to prevent unapproved charges.
+
+## Can admins customize who receives approval notifications?
+Yes. Workspace travel policies can define approvers based on roles, cost, destination, or booking type.
+
+</div> 

docs/articles/new-expensify/travel/Travel-Approval-Types.md

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.1.54.2</string>
+	<string>9.1.54.6</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.54</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.54.2</string>
+	<string>9.1.54.6</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>