Merge branch 'Expensify:main' into krishna2323/issue/65318

Author: Krishna2323

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009017409
-        versionName "9.1.74-9"
+        versionCode 1009017600
+        versionName "9.1.76-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

@@ -2,29 +2,25 @@
 title: Manage Expensify Subscription
 description: Learn how to manage your subscription, update billing details, cancel early, or delete a workspace in New Expensify.
 keywords: [New Expensify, subscription, billing, payment card, cancel subscription, delete workspace, remove workspace, subscription settings]
----
-<div id="new-expensify" markdown="1">
-
-Easily manage your subscription in New Expensify—update payment details, adjust your plan, request early cancellation, or delete a workspace if needed.
 
 ---
 
-# View Subscription and Add a Payment Card
+<div id="new-expensify" markdown="1">
 
-To view your subscription and add a payment card:
+Easily manage your subscription in New Expensify—update payment details, adjust your plan, request early cancellation, or delete a workspace if needed.
 
-1. Navigate to **Account > Subscription**.
-2. Click **Add Payment Card** and enter your card details to ensure uninterrupted billing.
+You can view and manage your subscription under **Account > Subscription**. 
 
 ---
 
-# Manage Subscription Plan
+# Manage Subscription
 
 In the Subscription section, you can view and update your plan details, including:
 
+- **Add a payment card**: Connect the credit card you want to use to pay for Expensify each month. 
 - **Current plan:** View your subscription type and number of seats.
 - **Billing info:** See your payment method and next renewal date.
-- **Auto-renew:** Check when your subscription will automatically renew (e.g., **Renews on Nov 1, 2027**).
+- **Auto-renew:** Check when your subscription will automatically renew (e.g., **Renews on Nov 1, 2026**).
 - **Auto-increase annual seats:** See how much you could save by automatically increasing seats if your team grows.
 
 **Note:** Enabling auto-increase will extend your annual subscription end date.
@@ -35,18 +31,19 @@ In the Subscription section, you can view and update your plan details, includin
 
 To request an early cancellation:
 
-1. Go to the **Subscription** section.
-2. Click **Request Early Cancellation**.
+1. Head to **Account > Subscription**.
+2. Click the **Request early cancellation** button.
+3. Depending on how your subscription is configured, the early cancellation will happen automatically or be sent to our team for review. 
 
 **Note:** Early cancellations aren’t available to all customers.
 
 ---
 
 # Delete a Workspace
 
-To permanently delete a workspace:
+To permanently delete a workspace and downgrade to a free account:
 
-1. Go to **Settings > Workspaces**.
+1. From the left-hand menu, click **Workspaces**.
 2. Click the three dots next to the workspace name.
 3. Select **Delete workspace** from the dropdown.
 4. Confirm the deletion when prompted.

docs/articles/new-expensify/billing-and-subscriptions/Add-a-payment-card-and-view-your-subscription.md

@@ -43,7 +43,7 @@ For a full breakdown, visit the [Expensify pricing page](https://www.expensify.c
 ## 🧾 Receipts
 
 - Your billing receipts show: `X Collect members @ $5.00`
-- View them in **Workspaces > Subscription**
+- View them in **Account > Subscription**
 
 ---
 
@@ -92,7 +92,7 @@ For a full breakdown, visit the [Expensify pricing page](https://www.expensify.c
 
 ## 🧾 Receipts
 
-- View billing receipts under **Workspaces > Subscription**
+- View billing receipts under **Account > Subscription**
 - Each workspace can only have **one billing owner**
 
 ---

docs/articles/new-expensify/billing-and-subscriptions/Billing-Overview.md

@@ -13,7 +13,7 @@ Take a look at this resource to learn how to update your Expensify workspace sub
 
 To update your subscription plan:
 
-1. Use the **left-hand navigation bar (LHB)** to go to **Workspaces > Subscription**.
+1. Use the **left-hand menu** to go to **Account > Subscription**.
 2. Click **Explore all plans** and choose the one that best fits your needs.
 
 ---
@@ -22,7 +22,7 @@ To update your subscription plan:
 
 If you're on an Annual Subscription (a 12-month commitment), you may be eligible to request early cancellation and switch to a free account:
 
-1. Use the **left-hand navigation bar** to go to **Workspaces > Subscription**.
+1. Use the **left-hand navigation bar** to go to **Account > Subscription**.
 2. Click **Request early cancellation**.
 
 **Note:** Early cancellations are subject to eligibility review.
@@ -33,7 +33,7 @@ If you're on an Annual Subscription (a 12-month commitment), you may be eligible
 
 If you're on a Pay-per-use plan and want to switch to a free account:
 
-1. Go to **Workspaces > Subscription**.
+1. Go to **Account > Subscription**.
 2. Click the three dots **(⋮)** next to your workspace name.
 3. Select **Delete workspace**.
 

docs/articles/new-expensify/billing-and-subscriptions/Changing-Your-Workspace-Plan.md

@@ -20,7 +20,7 @@ If your organization qualifies as tax-exempt, you can request to remove sales ta
 
 **To request tax-exempt status for your Expensify subscription:**
 
-1. Go to **Account > Workspaces > Subscription > Subscription settings**.
+1. Go to **Account > Subscription > Subscription settings**.
 2. Click **Tax exempt status**.
 3. Selecting **Tax exempt status** will begin a chat with Concierge.
 4. From there, communicate that your account is tax-exempt and attach a PDF of your tax-exempt document.

docs/articles/new-expensify/billing-and-subscriptions/Tax-Exemption.md

@@ -49,7 +49,7 @@ The **Reports** tab consolidates all filtering and reporting tools:
 
 # Workspaces Page
 
-The **Workspaces** tab helps you manage everything related to your company or personal workspaces. Whether you're creating a new workspace, editing an existing one, or managing features like billing and card connections, this section is your main hub.
+The **Workspaces** tab shows you a clean list of all your workspaces and allows you to manage everything related to your company or personal workspaces. This section is your main hub for workspace management.
 
 From the **Workspaces** tab, you can:
 
@@ -59,10 +59,8 @@ From the **Workspaces** tab, you can:
 - **Enable features** – Turn on or off modules like Company Cards, Workflows, Tags, Distance tracking, and more via the **More features** menu.
 - **Set up accounting connections** – Integrate tools like QuickBooks or NetSuite under **Accounting**.
 - **Edit categories and tags** – Create or disable expense categories and tags to organize expenses.
-- **Track billing and subscription** – Navigate to the **Subscription** section to choose a plan, view billing history, or cancel your subscription.
-- **Access domains** (if applicable) – Allow centralized control over company-wide settings like SAML, domain groups, and company card feeds.
 
-**Tip:** All workspace-specific settings live under this tab, while account specific settings live under the **Account** tab.
+**Tip:** All workspace-specific settings live under this tab, while account-level settings (including billing and subscription management) live under the **Account** tab.
 
 ---
 
@@ -74,6 +72,7 @@ The **Account** tab includes all personal and account-level settings. Here’s w
 - **Wallet** – Add or manage personal payment methods (e.g., cards or bank accounts).
 - **Preferences** – Choose your default payment currency, language, and notification preferences.
 - **Security** – Set up two-factor authentication and manage device access.
+- **Subscription** – Manage your billing, view subscription details, and track usage.
 - **Help** – Access Expensify Help docs and reach out to Concierge.
 - **Switch to Expensify Classic** – Return to the classic layout if needed.
 - **About** – View app version details and system information.

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

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.74</string>
+	<string>9.1.76</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.1.74.9</string>
+	<string>9.1.76.0</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.74</string>
+	<string>9.1.76</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.74.9</string>
+	<string>9.1.76.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -1,24 +1,24 @@
 PODS:
-  - Airship (19.2.1):
-    - Airship/Automation (= 19.2.1)
-    - Airship/Basement (= 19.2.1)
-    - Airship/Core (= 19.2.1)
-    - Airship/FeatureFlags (= 19.2.1)
-    - Airship/MessageCenter (= 19.2.1)
-    - Airship/PreferenceCenter (= 19.2.1)
-  - Airship/Automation (19.2.1):
+  - Airship (19.6.1):
+    - Airship/Automation (= 19.6.1)
+    - Airship/Basement (= 19.6.1)
+    - Airship/Core (= 19.6.1)
+    - Airship/FeatureFlags (= 19.6.1)
+    - Airship/MessageCenter (= 19.6.1)
+    - Airship/PreferenceCenter (= 19.6.1)
+  - Airship/Automation (19.6.1):
     - Airship/Core
-  - Airship/Basement (19.2.1)
-  - Airship/Core (19.2.1):
+  - Airship/Basement (19.6.1)
+  - Airship/Core (19.6.1):
     - Airship/Basement
-  - Airship/FeatureFlags (19.2.1):
+  - Airship/FeatureFlags (19.6.1):
     - Airship/Core
-  - Airship/MessageCenter (19.2.1):
+  - Airship/MessageCenter (19.6.1):
     - Airship/Core
-  - Airship/PreferenceCenter (19.2.1):
+  - Airship/PreferenceCenter (19.6.1):
     - Airship/Core
-  - AirshipFrameworkProxy (14.1.1):
-    - Airship (= 19.2.1)
+  - AirshipFrameworkProxy (14.5.1):
+    - Airship (= 19.6.1)
   - AirshipServiceExtension (18.7.2)
   - AppAuth (1.7.5):
     - AppAuth/Core (= 1.7.5)
@@ -1783,8 +1783,8 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-airship (24.0.0):
-    - AirshipFrameworkProxy (= 14.1.1)
+  - react-native-airship (24.4.0):
+    - AirshipFrameworkProxy (= 14.5.1)
     - DoubleConversion
     - glog
     - hermes-engine
@@ -3697,8 +3697,8 @@ CHECKOUT OPTIONS:
     :http: https://ios-releases.fullstory.com/fullstory-1.52.0-xcframework.tar.gz
 
 SPEC CHECKSUMS:
-  Airship: a5de82c19ebca996fd8fecfcfbb3803f3de29a74
-  AirshipFrameworkProxy: 71ddba175bb22974cfa673d26ce8303ed6546212
+  Airship: aa8a8f48805425d1a292db60d79235d4a4afa1cb
+  AirshipFrameworkProxy: d5873f774b28d13c2189c920b4bafdb9c152f353
   AirshipServiceExtension: 9c73369f426396d9fb9ff222d86d842fac76ba46
   AppAuth: 501c04eda8a8d11f179dbe8637b7a91bb7e5d2fa
   AppLogs: 3bc4e9b141dbf265b9464409caaa40416a9ee0e0
@@ -3788,7 +3788,7 @@ SPEC CHECKSUMS:
   React-Mapbuffer: c04fcda1c6281fc0a6824c7dcc1633dd217ac1ec
   React-microtasksnativemodule: ca2804a25fdcefffa0aa942aa23ab53b99614a34
   react-native-advanced-input-mask: d4aa4ce2496f6b75076974e90a8260c0af3c1176
-  react-native-airship: e400f0d3056113b167623214695f5ff6d4cb839c
+  react-native-airship: 1c77b61b665bcbbba4d32c57a1eaf67310aab1f0
   react-native-app-logs: 6af30dbe7eee481a88380e3e66313a597ac0eaeb
   react-native-blob-util: 2aeac5a5274d88310dadc1ddfd5b01f36d490bc2
   react-native-cameraroll: 3d2cc0692f384ead14e5d9e2e5fbf0e6e0139163