[No QA] Merge main into my branch

.claude/commands/review-code-pr.md

@@ -1,5 +1,5 @@
 ---
-allowed-tools: Bash(gh pr diff:*),Bash(gh pr view:*)
+allowed-tools: Bash(gh pr diff:*),Bash(gh pr view:*),Bash(check-compiler.sh:*)
 description: Review a code contribution pull request
 ---
 

.claude/scripts/check-compiler.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Secure proxy script to run React Compiler compliance check on a single file.
+# Validates the filepath before passing it to the underlying npm script.
+set -eu
+
+if [[ $# -lt 1 ]]; then
+    echo "Usage: $0 <filepath>" >&2
+    exit 1
+fi
+
+readonly FILEPATH="$1"
+
+# Strict filepath validation - reject shell metacharacters
+if ! [[ "$FILEPATH" =~ ^[a-zA-Z0-9_./@-]+$ ]]; then
+    echo "Error: Invalid filepath (contains disallowed characters)" >&2
+    exit 1
+fi
+
+npm run react-compiler-compliance-check -- check "$FILEPATH"

.claude/skills/coding-standards/rules/clean-react-0-compiler.md

@@ -98,7 +98,7 @@ function Avatar({source, size}: AvatarProps) {
 Before flagging, verify that the file actually compiles with React Compiler:
 
 ```bash
-npx react-compiler-healthcheck --src "<filepath>" --verbose
+check-compiler.sh <filepath>
 ```
 
 If the output contains **"Failed to compile"** for the file under review, the rule **does not apply** — the author may have no alternative to manual memoization until the compilation issue is resolved.

.github/workflows/cherryPick.yml

@@ -211,6 +211,79 @@ jobs:
             git push origin ${{ inputs.TARGET }}
           fi
 
+      - name: Find deploy workflow run
+        # Also runs for version-bump-only CPs where HAS_CONFLICTS is unset
+        if: ${{ steps.cherryPick.outputs.HAS_CONFLICTS != 'true' }}
+        id: findDeployRun
+        run: |
+          PUSH_SHA=$(git rev-parse HEAD)
+          echo "Push SHA: $PUSH_SHA"
+
+          DEPLOY_RUN_URL=""
+          for i in 1 2 3 4 5 6; do
+            echo "Polling for deploy run (attempt $i)..."
+            sleep 10
+            DEPLOY_RUN_URL=$(gh api \
+              "repos/${{ github.repository }}/actions/workflows/deploy.yml/runs?head_sha=$PUSH_SHA&per_page=1" \
+              --jq '.workflow_runs[0].html_url // empty' 2>/dev/null || true)
+            if [ -n "$DEPLOY_RUN_URL" ]; then
+              echo "Found deploy run: $DEPLOY_RUN_URL"
+              break
+            fi
+          done
+
+          FALLBACK_URL="https://github.com/${{ github.repository }}/actions/workflows/deploy.yml"
+          if [ -z "$DEPLOY_RUN_URL" ]; then
+            echo "::warning::Could not find deploy workflow run for SHA $PUSH_SHA"
+            {
+              echo "DEPLOY_RUN_FOUND=false"
+              echo "DEPLOY_RUN_URL=$FALLBACK_URL"
+              echo "DEPLOY_RUN_MESSAGE=⚠️ Could not locate deploy run — check $FALLBACK_URL"
+            } >> "$GITHUB_OUTPUT"
+          else
+            {
+              echo "DEPLOY_RUN_FOUND=true"
+              echo "DEPLOY_RUN_URL=$DEPLOY_RUN_URL"
+              echo "DEPLOY_RUN_MESSAGE=$DEPLOY_RUN_URL"
+            } >> "$GITHUB_OUTPUT"
+          fi
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: Announce successful CP in #deployer
+        # Also runs for version-bump-only CPs where HAS_CONFLICTS is unset
+        if: ${{ steps.cherryPick.outputs.HAS_CONFLICTS != 'true' }}
+        uses: 8398a7/action-slack@1750b5085f3ec60384090fb7c52965ef822e869e
+        with:
+          status: custom
+          custom_payload: |
+            {
+              channel: '#deployer',
+              attachments: [{
+                color: 'good',
+                text: `🍒 Cherry-pick to *${{ inputs.TARGET }}* successful\nPR: ${{ inputs.PULL_REQUEST_URL || '(version bump only)' }}\nDeploy workflow: ${{ steps.findDeployRun.outputs.DEPLOY_RUN_MESSAGE }}`
+              }]
+            }
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+
+      - name: Write workflow summary
+        # Also runs for version-bump-only CPs where HAS_CONFLICTS is unset
+        if: ${{ steps.cherryPick.outputs.HAS_CONFLICTS != 'true' }}
+        run: |
+          {
+            echo "## Cherry-pick successful"
+            echo ""
+            echo "**Target:** \`${{ inputs.TARGET }}\`"
+            echo "**PR:** ${{ inputs.PULL_REQUEST_URL || 'N/A (version bump only)' }}"
+            if [[ "${{ steps.findDeployRun.outputs.DEPLOY_RUN_FOUND }}" == "true" ]]; then
+              echo "**Deploy workflow:** ${{ steps.findDeployRun.outputs.DEPLOY_RUN_URL }}"
+            else
+              echo "**Deploy workflow:** :warning: Could not locate deploy run — check [${{ inputs.TARGET }} deploy runs](${{ steps.findDeployRun.outputs.DEPLOY_RUN_URL }})"
+            fi
+          } >> "$GITHUB_STEP_SUMMARY"
+
       - name: Create Pull Request to manually finish CP
         if: steps.cherryPick.outputs.HAS_CONFLICTS == 'true'
         id: createPullRequest

.github/workflows/claude-review.yml

@@ -74,7 +74,7 @@ jobs:
           prompt: "/review-code-pr REPO: ${{ github.repository }} PR_NUMBER: ${{ github.event.pull_request.number }}"
           claude_args: |
             --model claude-opus-4-6
-            --allowedTools "Task,Glob,Grep,Read,Bash(gh pr diff:*),Bash(gh pr view:*)" --json-schema '${{ steps.schema.outputs.json }}'
+            --allowedTools "Task,Glob,Grep,Read,Bash(gh pr diff:*),Bash(gh pr view:*),Bash(check-compiler.sh:*)" --json-schema '${{ steps.schema.outputs.json }}'
 
       - name: Post code review results
         if: steps.code-review.outcome == 'success' && steps.filter.outputs.code == 'true'

android/app/build.gradle

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009033709
-        versionName "9.3.37-9"
+        versionCode 1009033903
+        versionName "9.3.39-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"

cspell.json

@@ -667,6 +667,8 @@
         "setuptools",
         "shareeEmail",
         "Sharees",
+        "sharee",
+        "sharees",
         "Sharons",
         "shellcheck",
         "shellenv",

docs/HELPSITE_NAMING_CONVENTIONS.md

@@ -10,6 +10,8 @@ This document governs UI language conventions. It does not define article struct
 
 docs/HELP_AUTHORING_GUIDELINES.md
 
+Note: All article headings (# and ##) must follow the task-based heading rules in HELP_AUTHORING_GUIDELINES.md Section 2, except for `# FAQ` which is exempt. This includes section headings that reference UI features — they must still be task-based, not just feature labels.
+
 ---
 
 # Core UI Referencing Rules

docs/HELP_AUTHORING_GUIDELINES.md

@@ -34,11 +34,14 @@ If multiple workflows are detected → split into multiple articles.
   - Setup
   - Options
   - Step 1
+- Noun-only or topic-only headings that describe a category rather than a task
+- Platform-only labels used as headings (e.g., "iPhone", "Android", "Desktop", "Web")
+- Any heading that does not describe an action the user takes or a question the user has
 
 ## Requirements
 
-- All headings must be:
-  - Task-based
+- All headings must be (except `# FAQ`, which is exempt from task-based rules):
+  - Task-based — must describe what the user will do or learn. Start with an action verb or question word (How, What, Where, Who, Why, When)
   - Searchable
   - Explicit
   - Feature-specific
@@ -48,6 +51,15 @@ If multiple workflows are detected → split into multiple articles.
 # Who can connect a business bank account in Expensify
 ## Where to enable ACH reimbursements in a Workspace
 ## How to troubleshoot bank connection errors in Expensify
+## How to enable Expensify Card notifications on iPhone
+
+**Invalid → Corrected Examples**
+
+- ❌ `## Transaction decline notifications` → ✅ `## How to understand why your Expensify Card transaction was declined`
+- ❌ `## iPhone` → ✅ `## How to enable notifications on iPhone`
+- ❌ `## Suspected fraud notifications` → ✅ `## What to do when you receive a fraud alert`
+- ❌ `## Banking and settlement notifications` → ✅ `## How banking and settlement alerts work for admins`
+- ❌ `## Card lifecycle notifications` → ✅ `## What card lifecycle notifications you'll receive`
 
 ---
 
@@ -72,11 +84,15 @@ Metadata must reflect real search queries.
 
 Each article must include:
  - YAML metadata
- - One primary # heading
- - Task-based ## sections
+ - Exactly one # heading (the article title). No other # headings are allowed except # FAQ
+ - Task-based ## sections for all content below the title
  - Sequential numbered steps (if procedural)
  - An FAQ section (if needed)
 
+Do not use multiple # headings to organize an article into major sections. If content feels like it needs its own # heading, either:
+ - Demote it to ## under the single # title, or
+ - Split it into a separate article (per Section 1: one workflow per article)
+
 If including an FAQ section, it must comply with:
 /docs/HELPSITE_NAMING_CONVENTIONS.md
 
@@ -224,8 +240,12 @@ Prioritize screenshots for:
 # 9. Pre-Publish Validation Checklist
 
 Before outputting an article, confirm:
- - Only # and ## used
- - No generic headings
+ - Exactly one # heading (the article title), plus optional # FAQ — no other # headings
+ - Only ## used for all content sections (no ### or deeper)
+ - Every ## heading starts with an action verb or question word (How, What, Where, Who, Why, When)
+ - `# FAQ` is exempt from task-based heading rules
+ - No noun-only, topic-only, or platform-only headings
+ - No generic headings (Overview, Introduction, Notes, Setup, Options, Step 1)
  - Feature names match UI
  - Metadata aligns with search intent
  - Navigation included (if applicable)

docs/articles/expensify-classic/expenses/Expense-Types.md

@@ -69,7 +69,7 @@ Use filters to narrow down the data:
 2. Adjust the filters at the top of the page:
    - **Date Range** – Select a specific time frame.
    - **Merchant Name** – Find expenses from a particular vendor (partial searches work).
-   - **Workspace** – View expenses for a specific Group or Individual Workspace.
+   - **Workspace** – View expenses for a specific workspace.
    - **Categories** – Filter by category to refine your search.
    - **Tags** – Locate expenses based on assigned tags.
    - **Submitters** – Find expenses by employee or vendor.

docs/articles/expensify-classic/expensify-billing/Change-Plan-Or-Subscription.md

@@ -5,35 +5,14 @@ keywords: [Expensify Classic, workspace plan, subscription]
 ---
 
 
-Expensify offers several plans based on your needs: **Track, Submit, Collect, Control,** and **Free**. Your choice depends on whether you manage expenses individually, for a group, or for a company. You may need to upgrade if you hire employees who need access to a **Group Workspace** or require features exclusive to paid plans.
+Expensify offers several plans based on your needs: **Collect, Control,** and **Free**. You may need to upgrade if you hire employees who need access to your workspace or require features exclusive to paid plans.
 
 ---
 
-# Change a Subscription on an Individual Plan
+# Changing Your Subscription
 
 **Web:**
-1. Go to **Settings > Workspaces > Individual > [Workspace Name]**.
-2. Click **Overview** and select **Switch** under your desired plan.
-
-**Mobile:**
-1. Open the Expensify app.
-2. Tap the **hamburger menu** (three lines) on the top left.
-3. Tap **Settings**.
-4. Tap **View All** under your Workspace.
-5. Select the Workspace under the **Individual** tab.
-6. Tap **Current Plan**.
-7. Tap **Switch** to change plans.
-
-## Upgrade to a Group Workspace
-1. Go to **Settings > Workspaces > Group**.
-2. Select a **Collect** or **Control** plan.
-
----
-
-# Changing a Subscription on a Group Plan
-
-**Web:**
-1. Go to **Settings > Workspaces > Group > [Your Group Workspace]**.
+1. Go to **Settings > Workspaces > [Your Workspace]**.
 2. Click **Overview** and select **Switch** under your desired plan.
 
 **Mobile:**
@@ -42,48 +21,32 @@ Expensify offers several plans based on your needs: **Track, Submit, Collect, Co
 
 ---
 
-## Adjust Subscription Size
-1. Go to **Settings > Workspaces > Group > Subscription**.
+## Adjust Annual Subscription Size
+1. Go to **Settings > Workspaces > Subscription**.
 2. Enter the desired number in the **Subscription size** field.
    - If left blank, your subscription size will be set automatically:
      - **New Workspaces**: Based on active users in the first month.
      - **Existing Workspaces Switching to Annual**: Based on the last month's active users.
 
 ## Auto-Increase Subscription Size
-1. Go to **Settings > Workspaces > Group > Subscription**.
-2. Toggle **Auto-increase annual seats**.
+1. Go to **Settings > Workspaces > Subscription**.
+2. Toggle **Auto Increase Subscription Size**.
 3. When enabled, your subscription size will adjust automatically based on usage, triggering a new 12-month commitment for the updated size.
 
 ## Auto-Renew Subscription
-1. Go to **Settings > Workspaces > Group > Subscription**.
-2. Toggle **Auto-renew** off before your current subscription ends if you do not want it to renew.
-   - If **Auto-renew** is disabled, your final bill at the annual rate will be issued on the date listed under **Subscriptions**.
-
----
-
-# Downgrading to a Free Account from an Individual Plan
-
-**Web:**
-1. Log in via a web browser.
-2. Go to **Settings > Workspaces > Individual > Subscription**.
-3. Click **Cancel Subscription**.
-   - **Note**: The subscription is prepaid for 30 days of unlimited **SmartScanning**. No refunds are issued, but you retain access until the period ends.
-
-**App Store (iOS Users):**
-1. Go to the **App Store**.
-2. Tap your **Apple ID** > **Subscriptions**.
-3. Cancel your Expensify subscription.
-   - **Note**: This cannot be done within Expensify. Downgrading to a free account must happen from the App Store. 
+1. Go to **Settings > Workspaces > Subscription**.
+2. Toggle **Auto Renew** off before your current subscription ends if you do not want it to renew.
+   - If **Auto Renew** is disabled, your final bill at the annual rate will be issued on the date listed under **Subscriptions**.
 
 ---
 
-# Downgrading to a Free Account from a Group Plan
+# Downgrading to a Free Account
 
 ## Pay-Per-Use Plan
-1. Go to **Settings > Workspaces > Group**.
+1. Go to **Settings > Workspaces**.
 2. Click the **cog icon** next to your Workspace name.
 3. Select **Delete**.
-   - **Note**: Deleting a Workspace removes its settings and members but does not delete their Expensify accounts.
+   - **Note**: Only the Billing Owner can delete a Workspace. Deleting a Workspace removes its settings and members but does not delete members' Expensify accounts.
    - If any members were active that month (submitted, approved, or edited reports), you will be billed for their usage.
 
 ## Annual Subscription
@@ -99,11 +62,11 @@ Once downgraded, your Workspace will be deleted, and a refund line item will app
 
 # FAQ
 
-## Will I be charged for a monthly subscription even if I don't use SmartScans?
+## Will I be charged for my subscription even if I don't use SmartScans?
 
-Yes, monthly subscriptions are prepaid and not usage-based, so you will be charged regardless of activity.
+Yes, Collect and Control subscriptions are prepaid and not usage-based, so you will be charged regardless of activity.
 
-## I'm in a Group Workspace. Do I need the monthly subscription too?
+## I'm in a workspace. Do I need my own subscription too?
 
-No, Group Workspace members already have unlimited **SmartScans**. However, you can keep a subscription for personal use if you leave your company's Workspace.
+No, workspace members already have unlimited **SmartScans**. However, you can keep a subscription for personal use if you leave your company's workspace.
 

docs/articles/expensify-classic/expensify-billing/Personal-and-Corporate-Karma.md

@@ -20,13 +20,7 @@ The fund from your Personal Karma is determined by the expense's MCC (Merchant C
 
 ## Setting Up Personal Karma Donations
 
-You can enable Personal Karma donations from your personal workspace settings.
-
-1. [Sign in](www.expensify.com) to your web account.
-2. Go to **Settings > Workspace > Individual**.
-3. Under the **Subscription** section, enable Karma donations.
-
-![Settings > Workspaces > Individual workspace > enable Personal Karma in settings](https://help.expensify.com/assets/images/ExpensifyHelp_OldDot_Karma_Individual.png){:width="100%"}
+Personal Karma is now managed in New Expensify. To enable or disable Personal Karma donations, see the [Personal Karma](https://help.expensify.com/articles/new-expensify/settings/Personal-Karma) help page.
 
 ---
 
@@ -40,11 +34,11 @@ The fund to which your Corporate Karma goes is determined by the expense's MCC (
 
 ## Setting Up Corporate Karma Donations
 
-As a [workspace billing owner](https://help.expensify.com/articles/expensify-classic/workspaces/Assign-billing-owner-and-payment-account), you can enable Corporate Karma from the group workspace settings.
+As a [workspace billing owner](https://help.expensify.com/articles/expensify-classic/workspaces/Assign-billing-owner-and-payment-account), you can enable Corporate Karma from your workspace settings.
 
-1. [Sign in](www.expensify.com) to your web account.
-2. Go to **Settings > Workspace > Group**.
-3. Under the **Subscription** section, enable Karma donations.
+1. [Sign in](https://www.expensify.com) to your web account.
+2. Go to **Settings > Workspace > [Your Workspace Name] > Subscription**.
+3. Enable Karma donations.
 
 ![Settings > Workspaces > Group > enable Corporate Karma in subscription settings](https://help.expensify.com/assets/images/ExpensifyHelp_OldDot_Karma_Group.png){:width="100%"}