Merge branch 'main' into follow-up/76690-3 # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream

into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.

Author: daledah

.github/workflows/buildAndroid.yml

@@ -178,6 +178,8 @@ jobs:
           sign: true
           re-sign: true
           ad-hoc: ${{ inputs.variant == 'Adhoc' }}
+          # We don't need Rock to setup java, because we already ran the setup-java action above
+          setup-java: false
           keystore-file: './upload-key.keystore'
           keystore-store-file: 'upload-key.keystore'
           keystore-store-password: ${{ steps.load-credentials.outputs.ANDROID_UPLOAD_KEYSTORE_PASSWORD }}

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009035400
-        versionName "9.3.54-0"
+        versionCode 1009035500
+        versionName "9.3.55-0"
         // 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

@@ -25,9 +25,11 @@ Follow these steps to build an expense report manually.
 1. Open an expense report that includes at least one expense.
 2. Select **Submit**.
 
-After submitting, the report status updates and a **“submitted”** entry appears in the activity at the bottom of the report. For details on what each report status means, see [Understanding Report Statuses](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Understanding-Report-Statuses-and-Actions).
+After submitting, the report status updates and a **”submitted”** entry appears in the activity at the bottom of the report. For details on what each report status means, see [Understanding Report Statuses](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Understanding-Report-Statuses-and-Actions).
 
-**Note:** If your workspace uses automatic submission, you’ll see **“Waiting for your expenses to automatically submit”** at the top of the report instead of a Submit button.
+**Note:** If your workspace uses automatic submission, you’ll see **”Waiting for your expenses to automatically submit”** at the top of the report instead of a Submit button.
+
+**Note:** If you selected “Track and budget expenses” during onboarding and your workspace does not use an approval workflow, you’ll see **Mark as done** instead of **Submit**, and the activity entry will say **”marked as done”** instead of **”submitted”**.
 
 ---
 
@@ -177,7 +179,7 @@ Unsubmitted reports will remain in your Open reports section. You can go back an
 
 ## Why don’t I see the “Submit” button?
 
-The Submit button only appears once your report includes at least one valid expense. If the report has already been submitted, the button will no longer be visible.
+The Submit button only appears once your report includes at least one valid expense. If the report has already been submitted, the button will no longer be visible. If you selected “Track and budget expenses” during onboarding and your workspace has no approval workflow, the button will say **Mark as done** instead of **Submit**.
 
 ## Can I remove an expense after submitting?
 

assets/images/simple-illustrations/simple-illustration__foodtruck-tacos.svg

@@ -32,6 +32,8 @@ Report actions guide the submitter, approver, and payer regarding the report's s
 | **Export** | When the report is approved and not yet exported | Admin, Exporter | Sends report data to an integrated accounting system |
 | **Review** | When a report has violations (duplicate expenses, a missing receipt, etc.) | All roles | Prompts to resolve issues before submitting, approving, or paying |
 
+**Note:** If you selected "Track and budget expenses" during onboarding and your workspace does not use an approval workflow, **Submit** and **Approve** will both display as **Mark as done**.
+
 ---
 
 ## Secondary (“More” menu) Actions

assets/images/simple-illustrations/simple-illustration__target.svg

@@ -54,6 +54,8 @@ Depending on the report status and your role, the primary action button may say:
 - **Export**: Send the approved report to your accounting system.
 - **View**: No further action is required; you have view-only access.
 
+**Note:** If you selected "Track and budget expenses" during onboarding and your workspace does not use an approval workflow, **Submit** and **Approve** will both display as **Mark as done**.
+
 ---
 
 # Special Actions

docs/articles/new-expensify/reports-and-expenses/Create-and-Submit-Reports.md

@@ -58,7 +58,7 @@ type:expense merchant:Starbucks category:Meals amount>20 has:receipt
 - `tag:` – tag or multiple tags
 - `amount:` / `purchase-amount:` – supports `=`, `>`, `<`, `>=`, `<=`
 - `status:` – unreported, draft, outstanding, approved, paid, done
-- `date:` – expense date, supports relative dates like `date:this-month`, `date:last-month`, `date:year-to-date`, `date:this-week`
+- `date:` – expense date, supports relative dates like `date:this-month`, `date:last-month`, `date:year-to-date`, `date:this-week`. Also supports comparisons (`date>=2024-01-01 date<=2024-01-31`) for date ranges
 - `has:` – attachment, receipt, category, tag
 - `expense-type:` – cash, card, distance, per-diem
 - `reimbursable:` and `billable:` – yes or no
@@ -69,7 +69,7 @@ type:expense merchant:Starbucks category:Meals amount>20 has:receipt
 
 - `report-id:` – unique report reference
 - `status:` – draft, outstanding, approved, paid, done
-- `submitted:` / `approved:` / `paid:` / `exported:` – supports absolute or relative dates
+- `submitted:` / `approved:` / `paid:` / `exported:` – supports absolute or relative dates, and comparisons for date ranges (e.g., `submitted>=2024-01-01 submitted<=2024-01-31`)
 - `title:` – report title
 - `total:` – total amount with relative comparisons
 - `withdrawn:` – ACH withdrawal date