Merge branch 'main' into feature/allow-negative

Author: pasyukevich

.github/workflows/remote-build-android.yml

@@ -4,6 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches-ignore: [staging, production]
+    paths-ignore: ['docs/**', 'contributingGuides/**', 'help/**', '.github/**', 'scripts/**', 'tests/**']
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/remote-build-ios.yml

@@ -4,6 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches-ignore: [staging, production]
+    paths-ignore: ['docs/**', 'contributingGuides/**', 'help/**', '.github/**', 'scripts/**', 'tests/**']
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009016803
-        versionName "9.1.68-3"
+        versionCode 1009016903
+        versionName "9.1.69-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

@@ -680,7 +680,8 @@
         "zoneinfo",
         "zxcv",
         "zxldvw",
-        "مثال"
+        "مثال",
+        "pnrs"
     ],
     "ignorePaths": [
         "src/languages/de.ts",

cspell.json

@@ -1,46 +1,39 @@
 ---
 title: Expensify Plan Types and Pricing
-description: An overview of Expensify's plan types and pricing
-description: An overview of plan types and pricing
+description: A breakdown of Expensify's Collect and Control plans, with pricing, features, and subscription discounts.
+keywords: [New Expensify, plan types, pricing, Collect plan, Control plan, subscription discounts, member pricing, Expensify Card, free for individuals]
 ---
 
-Expensify offers flexible pricing plans designed to suit different business sizes and needs, whether you’re self-employed, part of a large organization, or somewhere in between.
+<div id="new-expensify" markdown="1">
 
-# Choosing the Right Plan
-
-Expensify provides two main pricing plans:
-
-| Feature               | **Collect Plan**                                       | **Control Plan**                                  |
-|----------------------|--------------------------------------------------|--------------------------------------------------|
-| **Ideal for**         | Small teams or businesses with 1-10 employees  | Larger companies with 10-1000 employees        |
-| **Pricing*** | $5 USD per user/month   | $9 USD per user/month     |
-| **SmartScans**        | ✔ Unlimited                                      | ✔ Unlimited                                      |
-| **Expensify Card**    | ✔ Smart Limits & 1-2% cash back                 | ✔ Smart Limits & 1-2% cash back                 |
-| **Expense Approvals** | ✔ Yes                                            | ✔ Multiple approvers                            |
-| **ACH Reimbursement** | ✔ Unlimited                                      | ✔ Unlimited                                      |
-| **Bank Feed Support** | ❌ Not available                                 | ✔ Third-party card feeds & reconciliation      |
-| **Accounting Sync**   | ✔ QuickBooks Online & Xero                      | ✔ NetSuite, Sage Intacct, QuickBooks Desktop  |
-| **HR & Payroll Sync** | ❌ Not available                                 | ✔ Gusto, Zenefits, Certinia, Workday          |
-| **Security & Control**| ❌ Not available                                 | ✔ SAML/SSO & admin-enforced controls           |
-
-***Note**: This price is available if you have an **Annual Subscription** and your team adopts the **Expensify Card**. Expensify Card usage on both plans generates 1% cash back with every swipe on US purchases—no minimums necessary—and 2% back if you spend $250k+/month across cards.
+Expensify offers flexible pricing to match your team’s size and needs, whether you're self-employed or managing a growing business.
 
 ---
 
-# FAQ
+# Choosing the Right Plan
 
-## How much does Expensify cost?
-The cost depends on your plan and subscription type. Expensify offers a 50% discount for annual subscriptions and up to another 50% discount for using Expensify Cards. Try out our [savings calculator](https://use.expensify.com/savings-calculator) to estimate your cost.
+Expensify offers two main subscription plans:
 
-## Does Expensify bill in non-USD currencies?
-Yes! Customers can pay in AUD, GBP, or NZD in addition to USD.
+| Feature                | **Collect Plan**                             | **Control Plan**                                 |
+|------------------------|----------------------------------------------|--------------------------------------------------|
+| **Best for**           | Small teams with up to 10 members            | Mid-size to large teams with 10–1,000 members    |
+| **Base cost**¹         | $5 per member/month                          | $9–36 per member/month                           |
+| **SmartScans**         | ✔ Unlimited                                   | ✔ Unlimited                                      |
+| **Expensify Card**     | ✔ Smart Limits and 1–2% cash back            | ✔ Smart Limits and 1–2% cash back                |
+| **Expense approvals**  | ✔ Single approver                            | ✔ Multiple approvers                             |
+| **ACH reimbursements** | ✔ Unlimited                                   | ✔ Unlimited                                      |
+| **Bank feed support**  | ❌ Not available                              | ✔ Card feeds and reconciliation                  |
+| **Accounting sync**    | ✔ QuickBooks Online, Xero                    | ✔ NetSuite, Sage Intacct, QuickBooks Desktop     |
+| **HR & payroll sync**  | ❌ Not available                              | ✔ Gusto, Zenefits, Certinia, Workday             |
+| **Security & control** | ❌ Not available                              | ✔ SAML/SSO and admin-enforced controls           |
 
-- **Collect Plan:** A$14, £8, or NZ$16 per user/month (Annual subscription + Expensify Cards)
-- **Control Plan:** A$30, £14, or NZ$32 per user/month (Annual subscription + Expensify Cards)
+**Control Plan Pricing**:
+- $9/member with an **Annual Subscription** *and* Expensify Card usage
+- $18/member with an **Annual Subscription** only
+- $36/member with a **no-commitment** (monthly) subscription
 
-## Is Expensify free for individuals?
-Yes! Individuals can use Expensify for free to track expenses. The steps in this [help article](https://help.expensify.com/articles/expensify-classic/getting-started/Create-a-workspace-for-yourself) will walk you through creating a personal workspace to track your expenses.
+The Collect Plan is always $5/member, regardless of subscription type or card use.
 
-## How do I get more info about pricing?
-For customized information or help choosing the right plan, reach out to Expensify Concierge or email **concierge@expensify.com**.
+**Note:** Expensify Cards generate 1% cash back on all U.S. purchases, or 2% if you spend $250K+/month across cards.
 
+</div>

docs/articles/new-expensify/billing-and-subscriptions/Plan-types-and-pricing.md

@@ -0,0 +1,76 @@
+---
+title: Expense and Report Actions
+description: Learn how actions such as Approve, Pay, Export, and Hold behave in Expensify based on member roles and report status.
+keywords: [New Expensify, report actions, approver actions, submitter actions]
+---
+
+<div id="new-expensify" markdown="1">
+
+Expense and report actions vary depending on the member role (submitter, approver, payer, admin) and the report's status (draft, outstanding, approved, done, paid). This guide outlines what to expect when reviewing, approving, paying, exporting, or managing expenses and reports based on varying workspace settings and report status.
+
+---
+
+# Expense and Report Actions
+
+Report actions guide the submitter, approver, and payer regarding the report's status and what actions need to be taken next. 
+
+## Understanding Primary vs. Secondary Actions
+
+| **Action Type** | **What It Means** | **Examples** |
+|------------------|------------------|-------------|
+| **Primary actions** | Actions that require your attention and drive the report forward. These are always visible at the top of a report or in the reports list. | Submit, Approve, Pay, Export |
+| **Secondary actions (More menu)** | Optional tools and adjustments that help manage or troubleshoot an expense or report. Appear in the More menu depending on the state, role, or integration settings. | Hold, Delete, Change workspace, Mark as exported |
+
+---
+
+## Primary Actions
+
+| **Action** | **When It Appears** | **Who Can See It** | **What It Does** |
+|------------|---------------------|---------------------|------------------|
+| **Submit** | For draft/unsubmitted reports | Submitter | Sends the report into the approval workflow |
+| **Approve** | When the report is submitted and pending approval | Approver | Confirms the report is accurate and ready to move to payment or to the next approver |
+| **Pay** | After the report is approved | Payer | Initiates payment via Expensify or logs a manual payment |
+| **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 |
+
+---
+
+## Secondary (“More” menu) Actions
+
+| **Action** | **When It Appears** | **Who Can See It** | **What It Does** |
+|------------|---------------------|---------------------|------------------|
+| **Hold** | On draft, submitted, or approved reports | Submitter, Approver, Admin | Marks individual expenses that aren’t yet ready for approval or payment |
+| **Change workspace** | Before report is exported | Submitter, Approver, Admin | Moves the report to a different workspace |
+| **Delete** | Only on draft/unsubmitted reports | Submitter | Permanently removes the report |
+| **Unapprove** | After approval, before payment | Approver | Reverts the approval if the report hasn’t been re-approved or paid |
+| **Mark as exported** | On approved/paid reports when integrated to an accounting system| Admin, Exporter | Marks the report as manually exported for tracking purposes |
+| **Export to [accounting system]** | When an accounting system is connected | Admin, Exporter | Sends the report to an external system such as Xero or QuickBooks Online |
+| **Download** | Any report state | All roles | Downloads a copy of the report as a PDF |
+| **Submit** | For draft reports | Submitter, Admin (on behalf of submitter) | Kicks off report approval workflow |
+| **Approve** | For outstanding reports | Admin | Skips current approver  |
+| **View details** | Any report | All roles | Opens details view with options to share, pin, view members |
+| **Cancel payment** | After payment is initiated, but before the payment has been processed, or always for a manual payment | Payer | Cancels pending payment |
+
+---
+
+# FAQ
+
+## Who can change a report's workspace?
+
+- **Submitters**: Until the report is approved  
+- **Approvers**: Until they approve the report  
+- **Admins**: Until the report is exported
+
+## What happens if an export fails?
+
+If a report doesn’t export automatically or manually, you’ll see an error message with instructions on what to do next. You can try exporting it again using the same button.
+
+The process works just like manual exports for automatic export issues, so you can fix the problem and retry the export on your own.
+
+## Why can’t I cancel a payment?
+
+The **Cancel payment** option is only available for in-app payments and only before Expensify starts processing the withdrawal. This is usually between 12 PM and 3 PM Pacific Time each day.
+
+This option won't be available if the payment was made manually outside of Expensify. In that case, use **Unapprove** instead.
+
+</div>

docs/articles/new-expensify/reports-and-expenses/Expense-and-Report-Actions.md

@@ -72,6 +72,24 @@ To add a **business bank account** for **ACH reimbursements (US) or Expensify Ca
 - Enter a **physical address** for yourself, any **Beneficial Owner** (if applicable), and the **business**.
 - **US photo ID, address, and SSN** are required for all individuals associated with the account.
 
+## Are there certain industries or businesses for which Expensify cannot process automatic, in-app payments?
+Yes, Expensify cannot process direct payments for businesses in the following industries:
+
+- Security Brokers & Dealers
+- Dating & Escort Services
+- Massage Parlors
+- Casinos & Gambling/Betting Services
+- Non-FI, Money Orders
+- Wires, Money Orders
+- Government-Owned Lotteries
+- Government-Licensed Online Casinos (Online Gambling)
+- Government-Licensed Horse/Dog Racing
+- Crypto-currency businesses
+- Internet gambling
+- Marijuana-related businesses
+- Firearm-related businesses (manufacturing and selling)
+- NFT (non-fungible token) services
+
 ## What is a Beneficial Owner?
 A **Beneficial Owner** is an **individual** who owns **25% or more** of the business. If no individual meets this threshold, you do **not** need to list a **Beneficial Owner**.
 

docs/articles/new-expensify/wallet-and-payments/Connect-a-Business-Bank-Account.md

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.68</string>
+	<string>9.1.69</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.1.68.3</string>
+	<string>9.1.69.3</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.68</string>
+	<string>9.1.69</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.68.3</string>
+	<string>9.1.69.3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>