Merge branch 'main' into add-generic-invite-description-for-workspace

.eslintrc.js

@@ -51,6 +51,10 @@ const restrictedImportPaths = [
         name: '@styles/theme/illustrations',
         message: 'Do not import theme illustrations directly. Please use the `useThemeIllustrations` hook instead.',
     },
+    {
+        name: 'date-fns/locale',
+        message: "Do not import 'date-fns/locale' directly. Please use the submodule import instead, like 'date-fns/locale/en-GB'.",
+    },
 ];
 
 const restrictedImportPatterns = [

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001045302
-        versionName "1.4.53-2"
+        versionCode 1001045401
+        versionName "1.4.54-1"
     }
 
     flavorDimensions "default"

docs/articles/expensify-classic/expenses/expenses/Add-an-expense.md

@@ -0,0 +1,102 @@
+---
+title: Add an expense
+description: Create a new expense in Expensify
+---
+<div id="expensify-classic" markdown="1">
+
+You can add an expense automatically with SmartScan or enter the expense details manually.
+
+# SmartScan a receipt
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+
+You can upload pictures of your receipts to Expensify and SmartScan will automatically capture the receipt details including the merchant, date, total, and currency.
+
+1. Click the **Expenses** tab. 
+2. Click the + icon in the top right and select **Scan receipt**. 
+3. Upload a saved image of a receipt. 
+
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+
+You can use the Expensify mobile app to take a picture of your receipts and SmartScan will automatically capture the receipt details including the merchant, date, total, and currency.
+
+1. Open the mobile app and tap the camera icon in the bottom right corner.
+2. Upload or take a photo of your receipt. 
+   - **To upload a photo** of a receipt you have saved on your phone, tap the photo icon in the left corner. 
+   - **To take a photo**, tap the camera icon in the right corner to select the mode, make sure all of the transaction details are clearly visible,and then take the photo. 
+      - Normal Mode: Upload one receipt. 
+      - Rapid Fire Mode: Upload multiple receipts at once. 
+
+You can open any receipt and click **Fill out details myself** to add or edit the merchant, date, current, total, description, category, or add attendees for group expenses. You can also add the expense to a report, determine if it is a reimbursable expense, or split the expense if multiple expense categories are included on one receipt. 
+
+{% include info.html %}
+**For iPhones**: You can also hard press the Expensify app icon on your phone to open a shortcut that automatically opens the camera to SmartScan a receipt. 
+{% include end-info.html %}
+
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+# Email a receipt
+
+You can also email receipts to SmartScan by sending them to [email protected] from an email address tied to your Expensify account (either a primary or secondary email). SmartScan will automatically pull all of the details from the receipt, fill them in for you, and add the receipt to the Expenses tab on your account. 
+
+{% include info.html %}
+**For copilots**: To ensure a receipt is routed to the Expensify account you are copiloting instead of your own account, email the receipt to [email protected] with the email address of the account you are copiloting as the subject line of the email. 
+{% include end-info.html %}
+
+# Add an expense manually
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+
+1. Click the **Expenses** tab. 
+2. Click the + icon in the top right. 
+3. Select the type of expense. 
+   - **Manually create**: Manually enter receipt details.
+   - **Scan receipt**: Upload a saved image of a receipt.
+   - **Create multiple**: Manually enter multiple expenses at once.
+   - **Time**: Create an expense based on hours.
+   - **Distance**: Create an expense based on distance.
+      - Manually Create: Manually enter the distance details for the expense.
+      - Create from Map: Enter the start and end destination and Expensify will help you create a receipt for the trip.
+4. Click **Save**. 
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+
+1. Tap the ☰ menu icon in the top left.
+2. Tap **Expenses**.
+3. Tap the + icon in the top right. 
+4. Tap the correct expense type and enter the expense details.
+   - **Manually create**: Manually enter receipt details.
+   - **Time**: Enter work time and rate.
+   - **Manually create (Distance)**: Manually enter trip details by total distance.
+   - **Odometer**: Manually enter trip details by start and end odometer readings.
+   - **Start GPS**: Track distance while using the Expensify app to automatically calculate the distance in real time during the trip. 
+5. Tap **Save**.  
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+{% include info.html %}
+If you are an employee under a company workspace, you may not see all of the different expense type options depending on your company’s workspace settings.
+{% include end-info.html %}
+
+# FAQs
+
+**What’s the difference between a reimbursable and non-reimbursable expense?**
+
+- Reimbursable expenses are things that you pay for with your own money that the company has agreed to pay you back for (like business travel paid for with personal funds). 
+- Non-reimbursable expenses are things you pay for with company money that need to be documented for accounting purposes (like a lunch paid for with a company card).
+
+{% include info.html %}
+If you are an employee under a company workspace, your expenses may automatically be configured as reimbursable or non-reimbursable depending on the details that are entered. If an expense is incorrectly labeled, you must reach out to an admin to have it corrected.
+{% include end-info.html %}
+
+</div>

ios/NewExpensify/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.53</string>
+	<string>1.4.54</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.53.2</string>
+	<string>1.4.54.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.53</string>
+	<string>1.4.54</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.53.2</string>
+	<string>1.4.54.1</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.53</string>
+	<string>1.4.54</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.53.2</string>
+	<string>1.4.54.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>