Merge branch 'main' into update-2FA-page

Author: themoonalsofall

.github/scripts/verifyRedirect.sh

@@ -55,7 +55,7 @@ while read -r line; do
     exit 1
 fi
 
-    if ! [[ $DEST_URL =~ ^https://(help|use|integrations)\.expensify\.com|^https://www\.expensify\.org ]]; then
+    if ! [[ $DEST_URL =~ ^https://(www|help|use|integrations)\.expensify\.com|^https://www\.expensify\.org ]]; then
         error "Found destination URL that is not a supported URL: $DEST_URL"
         exit 1
     fi

.github/workflows/deploy.yml

@@ -595,10 +595,10 @@ jobs:
 
       - name: 🚀 Create prerelease 🚀
         run: |
-          gh release create ${{ needs.prep.outputs.APP_VERSION }} --repo ${{ github.repository }} --title ${{ needs.prep.outputs.APP_VERSION }} --generate-notes --prerelease --target staging
+          gh release create ${{ needs.prep.outputs.APP_VERSION }}-staging --repo ${{ github.repository }} --title ${{ needs.prep.outputs.APP_VERSION }} --generate-notes --prerelease --verify-tag --target staging
           RETRIES=0
           MAX_RETRIES=10
-          until [[ $(gh release view ${{ needs.prep.outputs.APP_VERSION }} --repo ${{ github.repository }}) || $RETRIES -ge $MAX_RETRIES ]]; do
+          until [[ $(gh release view ${{ needs.prep.outputs.APP_VERSION }}-staging --repo ${{ github.repository }}) || $RETRIES -ge $MAX_RETRIES ]]; do
             echo "release not found, retrying $((MAX_RETRIES - RETRIES++)) times"
             sleep 1
           done

.github/workflows/postDeployComments.yml

@@ -100,7 +100,8 @@ jobs:
         id: getPullRequestList
         uses: ./.github/actions/javascript/getDeployPullRequestList
         with:
-          TAG: ${{ inputs.version }}
+          # Staging tags use the `-staging` suffix, production tags use the version only
+          TAG: ${{ inputs.version }}${{ inputs.env == 'staging' && '-staging' || '' }}
           GITHUB_TOKEN: ${{ github.token }}
           IS_PRODUCTION_DEPLOY: ${{ inputs.env == 'production' }}
 

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

@@ -0,0 +1,42 @@
+name: Remote Build Android
+
+on:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest-xl
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - project_root: ./
+            variant: 'developmentDebug'
+
+          - project_root: Mobile-Expensify/
+            is_hybrid_build: true
+            variant: 'Debug'
+    steps:
+      - name: Checkout
+        # v4
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+        with:
+          submodules: ${{ matrix.is_hybrid_build || false }}
+          token: ${{ secrets.OS_BOTIFY_TOKEN }}
+
+      - name: Setup Node
+        uses: ./.github/actions/composite/setupNode
+        with:
+          IS_HYBRID_BUILD: ${{ matrix.is_hybrid_build && 'true' || 'false' }}
+
+      - name: RNEF Remote Build - Android
+        uses: callstackincubator/android@a49920aadab9f41951944ea52bb7983fa6b20b03
+        env:
+          PROJECT_ROOT_PATH: ${{ matrix.project_root }}
+        with:
+          variant: ${{ matrix.variant }}
+          github-token: ${{ github.token }}
+          comment-bot: false

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

@@ -0,0 +1,48 @@
+name: Remote Build iOS
+
+on:
+  workflow_dispatch:
+  push:
+    branches-ignore: [staging, production]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  build:
+    runs-on: macos-15-xlarge
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - project_root: ./
+            scheme: 'New Expensify Dev'
+            configuration: 'DebugDevelopment'
+
+          - project_root: Mobile-Expensify/
+            is_hybrid_build: true
+            scheme: 'Expensify Dev'
+            configuration: 'Debug'
+    steps:
+      - name: Checkout
+        # v4
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+        with:
+          submodules: ${{ matrix.is_hybrid_build || false }}
+          token: ${{ secrets.OS_BOTIFY_TOKEN }}
+
+      - name: Setup Node
+        uses: ./.github/actions/composite/setupNode
+        with:
+          IS_HYBRID_BUILD: ${{ matrix.is_hybrid_build && 'true' || 'false' }}
+
+      - name: RNEF Remote Build - iOS
+        uses: callstackincubator/ios@4c2dcc0d6b9c35407cf294e17386b65258a3b6af
+        env:
+          PROJECT_ROOT_PATH: ${{ matrix.project_root }}
+        with:
+          destination: simulator
+          scheme: ${{ matrix.scheme }}
+          configuration: ${{ matrix.configuration }}
+          github-token: ${{ github.token }}
+          comment-bot: false

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009012700
-        versionName "9.1.27-0"
+        versionCode 1009012704
+        versionName "9.1.27-4"
         // 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

@@ -0,0 +1,73 @@
+---
+title: Free-Features-in-Expensify.md
+description: Learn what features are available for free in Expensify and common use cases like tracking receipts for taxes, budgeting, and freelance expense management.
+keywords: free features, SmartScan, receipt tracking, tax documentation, freelance expenses, personal finance
+---
+
+<div id="expensify-classic" markdown="1">
+
+You don’t need a paid Workspace to use Expensify! This guide covers the free features available to individual users who want to manage personal, freelance, or household expenses.
+
+# What’s available for free in Expensify
+
+You can access these features without joining a paid Workspace:
+
+- **SmartScan** receipts (limited free scans each month)
+- Email receipts to [receipts@expensify.com](mailto:receipts@expensify.com) for automatic upload
+- **Create and organize expenses** using categories and tags
+- **Export expense reports** as spreadsheet or CSV files
+- **Manually enter and edit expenses** in the mobile or web app
+
+**Note:** Features like automatic reimbursement, Expensify Cards, integrations, and team collaboration require a paid Workspace.
+
+---
+
+# Common use cases for free users
+
+## Tracking receipts for tax purposes
+
+Stay organized throughout the year and simplify tax filing:
+- Create reports like **“2024 Tax-Deductible Expenses”**
+- Tag expenses for business or personal use
+- Export reports to share with your tax software or accountant
+
+[Learn how to export expenses](https://help.expensify.com/classic/for-individuals/exporting-expenses)
+
+## Managing freelance or gig work expenses
+
+Freelancers often use Expensify to:
+- **Scan receipts** for client-related purchases
+- Generate reports to attach to invoices
+- **Track mileage manually** for tax deductions
+
+[How to add expenses manually](https://help.expensify.com/classic/for-individuals/adding-expenses-manually)
+
+## Personal budgeting and finance tracking
+
+Expensify is also great for everyday spending:
+- Monitor spending in categories like groceries, utilities, or entertainment
+- Save digital receipts for warranties or large purchases
+- Use tags to track **shared expenses** with family or roommates
+
+[Organize expenses with categories and tags](https://help.expensify.com/classic/for-individuals/categorizing-and-tagging-expenses)
+
+---
+
+# FAQ
+
+## Is SmartScan free?
+
+Yes, each account includes a limited number of free SmartScans per month. After that, you can still upload receipts manually.
+
+## Can I use Expensify without a business?
+
+Absolutely. Expensify is designed for anyone—individuals, freelancers, or households—who want to track expenses.
+
+## Do I need to upgrade to export expenses?
+
+No upgrade is required. You can export your expenses anytime as a spreadsheet or CSV.
+
+## What if I need advanced features later?
+
+You can always **create or join a Workspace** to unlock more tools like bank connections, accounting integrations, and company card support.
+

docs/new-expensify/hubs/getting-started/Free-Features-in-Expensify.md

@@ -710,3 +710,4 @@ https://help.expensify.com/articles/new-expensify/expenses-&-payments/Unlock-a-B
 https://help.expensify.com/articles/new-expensify/expenses-&-payments/Validate-a-Business-Bank-Account,https://help.expensify.com/articles/new-expensify/expenses-and-payments/Validate-a-Business-Bank-Account
 https://help.expensify.com/articles/new-expensify/expenses-and-payments/Export-download-expenses,https://help.expensify.com/articles/new-expensify/expenses-and-payments/Search-and-Download-Expenses
 https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Global-Reimbursements,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Enable-Global-Reimbursement
+https://help.expensify.com/articles/new-expensify/billing-and-subscriptions/Plan-types-and-pricing,https://www.expensify.com/pricing

docs/redirects.csv

@@ -0,0 +1,88 @@
+//
+//  AppDelegate.swift
+//  NewExpensify
+//
+//  Created by Marcin Warchoł on 08/04/2025.
+//
+
+import UIKit
+import React
+import React_RCTAppDelegate
+import ReactAppDependencyProvider
+import ExpoModulesCore
+import Firebase
+
+ 
+@main
+class AppDelegate: ExpoAppDelegate, UNUserNotificationCenterDelegate {
+  override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
+    self.moduleName = "NewExpensify"
+    self.dependencyProvider = RCTAppDependencyProvider()
+    self.initialProps = [:]
+    
+    // Configure firebase
+    FirebaseApp.configure()
+    
+    // Force the app to LTR mode.
+    RCTI18nUtil.sharedInstance().allowRTL(false)
+    RCTI18nUtil.sharedInstance().forceRTL(false)
+    
+    _ = super.application(application, didFinishLaunchingWithOptions: launchOptions)
+    
+    if let rootView = self.window.rootViewController?.view as? RCTRootView {
+        RCTBootSplash.initWithStoryboard("BootSplash", rootView: rootView) // <- initialization using the storyboard file name
+    }
+    
+    // Define UNUserNotificationCenter
+    let center = UNUserNotificationCenter.current()
+    center.delegate = self
+    
+    // Start the "js_load" custom performance tracing metric. This timer is
+    // stopped by a native module in the JS so we can measure total time starting
+    // in the native layer and ending in the JS layer.
+    RCTStartupTimer.start()
+    
+    if !UserDefaults.standard.bool(forKey: "isFirstRunComplete") {
+        UIApplication.shared.applicationIconBadgeNumber = 0
+        UserDefaults.standard.set(true, forKey: "isFirstRunComplete")
+    }
+
+    RNBackgroundTaskManager.setup()
+ 
+    return true
+  }
+  
+  
+  override func application(_ application: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
+      return RCTLinkingManager.application(application, open: url, options: options)
+  }
+  
+  override func application(_ application: UIApplication,
+                   continue userActivity: NSUserActivity,
+                   restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
+      return RCTLinkingManager.application(application,
+                                           continue: userActivity,
+                                           restorationHandler: restorationHandler)
+  }
+ 
+  override func sourceURL(for bridge: RCTBridge) -> URL? {
+    return self.bundleURL()
+  }
+ 
+  override func bundleURL() -> URL? {
+#if DEBUG
+    return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
+#else
+    return Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+#endif
+  }
+  
+  // This methods is needed to support the hardware keyboard shortcuts
+  func keyCommands() -> [Any]? {
+    return HardwareShortcuts.sharedInstance().keyCommands()
+  }
+
+  func handleKeyCommand(_ keyCommand: UIKeyCommand) {
+      HardwareShortcuts.sharedInstance().handleKeyCommand(keyCommand)
+  }
+}