Merge branch 'main' into @zfurtak/migrate-SearchFiltersIsPage

Author: zfurtak

.env.example

@@ -14,6 +14,7 @@ USE_REDUX_DEVTOOLS=false
 CAPTURE_METRICS=false
 ONYX_METRICS=false
 USE_THIRD_PARTY_SCRIPTS=false
+IS_EXPENSIFY_EMPLOYEE=false
 
 EXPENSIFY_ACCOUNT_ID_ACCOUNTING=-1
 EXPENSIFY_ACCOUNT_ID_ACCOUNTS_PAYABLE=-1

Mobile-Expensify

@@ -30,7 +30,7 @@ const transactionR14932: Transaction = {
     reimbursable: true,
     hasEReceipt: true,
     cardID: 0,
-    modifiedAmount: '',
+    modifiedAmount: 0,
     originalAmount: 0,
     comment: {},
     bank: '',
@@ -59,7 +59,7 @@ const transactionR98765: Transaction = {
     hasEReceipt: true,
     managedCard: false,
     billable: false,
-    modifiedAmount: '',
+    modifiedAmount: 0,
     cardID: 0,
     originalAmount: 0,
     comment: {},

__mocks__/reportData/transactions.ts

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009027301
-        versionName "9.2.73-1"
+        versionCode 1009027305
+        versionName "9.2.73-5"
         // 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

@@ -50,6 +50,7 @@
         "asar",
         "ASPAC",
         "assetlinks",
+        "accountid",
         "attributes.accountid",
         "attributes.reportid",
         "authorised",

cspell.json

@@ -18,7 +18,8 @@ The **navigation tabs** (on the left on web, and at the bottom on mobile) are pr
   - **Reports**
   - **Workspaces**
   - **Account**
-- The **Global Create** button for quick access to actions like creating reports, expenses, invoices, and chats
+- The green **Camera/Receipt** button to easily create expenses 
+- The grey **Global Create** button for additional actions like creating reports, tracking distance, sending invoices, and more.
 
 ---
 

docs/articles/new-expensify/getting-started/Navigating-New-Expensify.md

@@ -34,36 +34,46 @@ Each workspace has its own rules and settings, even for personal expense trackin
 
 You can add expenses using SmartScan or by creating them manually.
 
-## SmartScan a Receipt
+## How to SmartScan a Receipt
 
 SmartScan reads receipt details like merchant, date, total, and currency automatically.
 
-**SmartScan on web:**
-1. Click the green **Create (+)** button.
-2. Select **Create expense**.
-3. Upload an image of your receipt.
-
-**SmartScan on mobile:**
-1. Tap the green **Create (+)** button.
-2. Select **Create expense**.
-3. Upload or take a photo of your receipt:
-   - **Upload**: Tap the gallery icon and select an image.
-   - **Take a photo**: Ensure receipt details are visible and snap a photo.
-
-**Note:** You can also email receipts to `receipts@expensify.com` from your linked email. SmartScan will extract the details and add the expense to your account. [Add a contact method](https://help.expensify.com/articles/new-expensify/settings/Change-or-add-email-address)
-
-## Manually Enter an Expense
-
-1. Click or tap the green **Create (+)** button.
-2. Select **Create expense**.
-3. Choose a method:
-   - **Manual** – Enter details manually.
-   - **Scan** – Upload a saved image.
-   - **Create multiple** – Add expenses in bulk.
-   - **Distance** – Enter mileage data.
-   - **Per diem** – Add a daily allowance.
-4. Select your **workspace**.
-5. Click **Create expense**.
+**On mobile:**
+1. Tap the green camera button and take a photo of the receipt or upload from gallery.
+2. Enter the workspace or recipient’s email/phone number.
+3. Add details like description, category, tags, and tax.
+4. Tap **Create expense**.
+
+**On desktop:**
+1. Click the green receipt button and drag and drop the receipt or click **Choose files** to upload.
+2. Enter the workspace or recipient’s email/phone number.
+3. Add details like description, category, tags, and tax.
+4. Click **Create expense**.
+
+💡 **Note:** 
+Other ways to SmartScan receipts include:
+- Forward your digital receipts to `receipts@expensify.com`.
+- Text a photo of your receipts to 47777 (US numbers only). Just make sure you [add your phone number to Expensify](https://new.expensify.com/settings/profile/contact-methods).
+
+## How to Manually Enter an Expense
+
+**On mobile:**
+1. Tap the green camera button.
+2. Select **Manual**.
+3. Enter the amount and currency, then tap **Next**.
+4. Choose a workspace or an individual.
+5. Add optional fields like category, tags, or description.
+6. Tap **Create expense**.
+
+**On desktop:**
+1. Click the green add receipt button.
+2. Select **Manual**.
+3. Enter the amount and currency, then click **Next**.
+4. Choose a workspace or an individual.
+5. Add optional fields like category, tags, or description.
+6. Click **Create expense**.
+
+Learn more about [creating expenses](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Create-an-Expense)
 
 View expenses in your Expense chat or the **Reports** page. [Export to CSV](https://help.expensify.com/articles/new-expensify/expenses-and-payments/Search-and-Download-Expenses) for tax or accountant use.
 

docs/articles/new-expensify/getting-started/Track-Personal-Expenses.md

@@ -25,15 +25,22 @@ You can create an expense by scanning a receipt, entering details manually, or t
 
 ## Option 1: SmartScan a Receipt
 
-1. From the navigation tabs, click the green **+** button and select **Create expense**.
-2. Choose **Scan**.
-3. Drag and drop the receipt or click **Choose File** to upload.
-4. Enter the workspace or recipient’s email/phone number.
-5. Add details like description, category, tags, and tax.
-6. Click **Create expense**.
-
-💡 **Note:** You can also forward receipts to `receipts@expensify.com` using a verified email address.
-💡 **Note:** Upload your receipt via SMS by texting the photo of your receipt to 47777. To start sending your receipts add your phone number to your account from **Account > Profile > Phone Number**.
+**On mobile:**
+1. Tap the green camera button and take a photo of the receipt or upload from gallery.
+2. Enter the workspace or recipient’s email/phone number.
+3. Add details like description, category, tags, and tax.
+4. Tap **Create expense**.
+
+**On desktop:**
+1. Click the green receipt button and drag and drop the receipt or click **Choose files** to upload.
+2. Enter the workspace or recipient’s email/phone number.
+3. Add details like description, category, tags, and tax.
+4. Click **Create expense**.
+
+💡 **Note:** 
+Other ways to SmartScan receipts include:
+- Forward your digital receipts to `receipts@expensify.com`.
+- Text a photo of your receipts to 47777 (US numbers only). Just make sure you [add your phone number to Expensify](https://new.expensify.com/settings/profile/contact-methods).
 
 ## Smart Receipt Detection
 
@@ -48,7 +55,16 @@ This feature helps prevent policy violations and ensures accurate expense tracki
 
 ## Option 2: Manually Add an Expense
 
-1. From the navigation tabs, click the green **+** button and select **Create expense**.
+**On mobile:**
+1. Tap the green camera button.
+2. Select **Manual**.
+3. Enter the amount and currency, then tap **Next**.
+4. Choose a workspace or an individual.
+5. Add optional fields like category, tags, or description.
+6. Tap **Create expense**.
+
+**On desktop:**
+1. Click the green add receipt button.
 2. Select **Manual**.
 3. Enter the amount and currency, then click **Next**.
 4. Choose a workspace or an individual.
@@ -59,8 +75,8 @@ This feature helps prevent policy violations and ensures accurate expense tracki
 
 ## Option 3: Create a Distance Expense
 
-1. From the navigation tabs, click the green **+** button and select **Create expense**.
-2. Select **Distance**.
+1. From the navigation tabs, click the grey **+** button.
+2. Select **Track distance**.
 3. Enter start and stop locations.
 4. (Optional) Add additional stops.
 5. Click **Next**.
@@ -71,19 +87,20 @@ This feature helps prevent policy violations and ensures accurate expense tracki
 
 ## Option 4: Scan Multiple Receipts (Mobile)
 
-1. On the mobile app, tap the green **+** button and select **Create expense**.
+1. On mobile, tap the green camera button.
 2. Tap the multi-receipt icon in the bottom-right corner.
 3. Tap the green capture button to take a photo of each receipt.
-5. Once you’ve scanned all your receipts, tap the green arrow to confirm.
-6. Enter expense details for each receipt or just tap Create expenses for automatic scanning.
+4. Once you’ve scanned all your receipts, tap the green arrow to confirm.
+5. Enter expense details for each receipt or tap **Create expenses** for automatic scanning.
 
 ---
 
 ## Option 5: Bulk Upload Receipts (Desktop)
 
-1. Drag up to 30 PDF or image files (under 10MB each) into Expensify.
-2. Select **Scan Receipts** or **Add Attachments**.
+1. On desktop, go to the Reports page.
+2. Drag up to 30 PDF or image files (under 10MB each) into Expensify.
 3. Follow the prompts to assign workspaces, recipients, and coding.
+4. Once the expenses are ready, click **Create expenses**. 
 
 # Next Steps for Individual Expenses
 
@@ -100,8 +117,8 @@ To split an expense, you’ll need to start a chat with each person you’re req
 
 ## Start a Chat Before Splitting
 
-1. Click the green Create button in the left sidebar.
-2. Select Start Chat.
+1. From the navigation tabs, click the grey **+** button.
+2. Select **Start chat**.
 3. Search for the person by name, email, or phone number.
 4. Send them a message to begin the conversation.
 5. Once a chat is started, follow the steps below to split the expense.

docs/articles/new-expensify/reports-and-expenses/Create-an-Expense.md

@@ -18,42 +18,62 @@ Use this guide to create expenses that stay in your account for later reference.
 
 **Follow these steps to create an expense that stays in your records but isn't submitted:**
 
-1. Click the **big green + button**.
-2. Select **Create Expense**.
-3. Choose how to create the expense:
-   - **Scan a receipt**
-   - **Enter mileage**
-   - **Enter manually**
-4. Fill in the required details based on your selection.
-5. Click **Next**.
-6. Choose yourself under Personal.
-7. Update or edit fields based on your Workspace configuration.
-8. Click **Create expense**.
+## Option 1: SmartScan a Receipt
+
+**On mobile:**
+1. Tap the green camera button and take a photo of the receipt or upload from gallery.
+2. Enter the workspace or recipient’s email/phone number.
+3. Add details like description, category, tags, and tax.
+4. Tap **Create expense**.
+
+**On desktop:**
+1. Click the green receipt button and drag and drop the receipt or click **Choose files** to upload.
+2. Enter the workspace or recipient’s email/phone number.
+3. Add details like description, category, tags, and tax.
+4. Click **Create expense**.
+
+💡 **Note:** 
+Other ways to SmartScan receipts include:
+- Forward your digital receipts to `receipts@expensify.com`.
+- Text a photo of your receipts to 47777 (US numbers only). Just make sure you [add your phone number to Expensify](https://new.expensify.com/settings/profile/contact-methods).
+
+## Option 2: Manually Add an Expense
+
+**On mobile:**
+1. Tap the green camera button.
+2. Select **Manual**.
+3. Enter the amount and currency, then tap **Next**.
+4. Choose a workspace or an individual.
+5. Add optional fields like category, tags, or description.
+6. Tap **Create expense**.
+
+**On desktop:**
+1. Click the green add receipt button.
+2. Select **Manual**.
+3. Enter the amount and currency, then click **Next**.
+4. Choose a workspace or an individual.
+5. Add optional fields like category, tags, or description.
+6. Click **Create expense**.
 
 ---
 
 # Locate and Manage Tracked Expenses
 
-After tracking an expense, it appears in an **Expense Chat** in the left-hand navigation menu.
+After creating an expense, go to **Reports > Expenses** to locate the expense.  Use the filters to search if the expense isn't immediately visible.
 
-Within the Expense Chat, you can:
+Click into the expense to:
 - **Submit it to someone** – Send it for approval or processing.
 - **Categorize it** – Assign it to a category for better organization.
 - **Share it with my accountant** – Grant access to financial contacts.
 - **Nothing for now** – Leave it as-is for later.
 
-You can also find tracked expenses this way:
-
-1. From the navigation tabs, go to **Reports > Expenses**.
-2. Use filters to narrow your search by date, amount, or category.
-
 ---
 
 # FAQ
 
 ## Can I edit an expense after tracking it?
 
-Yes! Open the expense from your expense chat or **Reports > Expenses**, then click into it to edit any field.
+Yes! Open the expense from **Reports > Expenses** or your expense chat, then click into it to edit any field.
 
 ## Why can’t I find my expense?
 

docs/articles/new-expensify/reports-and-expenses/Track-Expenses.md

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