Merge remote-tracking branch 'upstream/main' into agent-devtools-recordings

Author: kacper-mikolajczak

.github/workflows/cherryPick.yml

@@ -76,6 +76,17 @@ jobs:
     needs: createNewVersion
     runs-on: blacksmith-2vcpu-ubuntu-2404
     steps:
+      - name: Check for in-progress deploy on target branch
+        id: checkInProgressDeploy
+        run: |
+          # Capture in-progress deploy URL before we push. The actual Slack post is gated on a successful target-branch push.
+          DEPLOY_RUN_URL=$(gh api \
+            "repos/${{ github.repository }}/actions/workflows/deploy.yml/runs?branch=${{ inputs.TARGET }}&per_page=5" \
+            --jq '.workflow_runs[] | select(.status != "completed") | .html_url' | head -n 1)
+          echo "DEPLOY_RUN_URL=$DEPLOY_RUN_URL" >> "$GITHUB_OUTPUT"
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
       - name: Extract PR information
         # Note: this step is only skipped when there's no PULL_REQUEST_URL, which is only ever be the case when we're CPing just a version bump.
         if: ${{ inputs.PULL_REQUEST_URL != '' }}
@@ -229,6 +240,22 @@ jobs:
             git push origin ${{ inputs.TARGET }}
           fi
 
+      - name: Warn that previous deploy was superseded
+        if: ${{ steps.cherryPick.outputs.HAS_CONFLICTS != 'true' && steps.checkInProgressDeploy.outputs.DEPLOY_RUN_URL != '' }}
+        uses: 8398a7/action-slack@1750b5085f3ec60384090fb7c52965ef822e869e
+        with:
+          status: custom
+          custom_payload: |
+            {
+              channel: '#deployer',
+              attachments: [{
+                color: 'warning',
+                text: `⚠️ ${{ inputs.TARGET == 'production' && 'Production' || 'Staging' }} <${{ steps.checkInProgressDeploy.outputs.DEPLOY_RUN_URL }}|deploy> cancelled by new cherry-pick`
+              }]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+
       - name: Find deploy workflow run
         # Also runs for version-bump-only CPs where HAS_CONFLICTS is unset
         if: ${{ steps.cherryPick.outputs.HAS_CONFLICTS != 'true' }}

.github/workflows/deploy.yml

@@ -649,6 +649,42 @@ jobs:
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
 
+  postSlackMessageOnCancellation:
+    name: Post a Slack message when the deploy is cancelled manually
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    if: ${{ cancelled() }}
+    needs: [androidBuild, androidUploadGooglePlay, androidSubmit, iosBuild, iosUploadTestflight, iosSubmit, webBuild, webDeploy]
+    steps:
+      - name: Check whether a newer deploy run exists
+        id: check
+        run: |
+          # If a newer run exists, the cherry-pick workflow already announced this. Skip to avoid double-posting.
+          LATEST=$(gh api \
+            "repos/${{ github.repository }}/actions/workflows/deploy.yml/runs?branch=${{ github.ref_name }}&per_page=1" \
+            --jq '.workflow_runs[0].id')
+          if [ "$LATEST" != "${{ github.run_id }}" ]; then
+            echo "SKIP=true" >> "$GITHUB_OUTPUT"
+          fi
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: Post Slack message on manual cancellation
+        if: ${{ steps.check.outputs.SKIP != 'true' }}
+        # v3
+        uses: 8398a7/action-slack@1750b5085f3ec60384090fb7c52965ef822e869e
+        with:
+          status: custom
+          custom_payload: |
+            {
+              channel: '#deployer',
+              attachments: [{
+                color: 'warning',
+                text: `⚠️ ${{ github.ref == 'refs/heads/production' && 'Production' || 'Staging' }} <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|deploy> cancelled manually`
+              }]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+
   checkDeploymentSuccess:
     runs-on: blacksmith-2vcpu-ubuntu-2404
     outputs:

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009036712
-        versionName "9.3.67-12"
+        versionCode 1009036801
+        versionName "9.3.68-1"
         // 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

@@ -34,7 +34,8 @@ You can reach Concierge by email at concierge@expensify.com or directly in the a
 
 - **Expensify Classic (web):** Click the chat icon in the navigation tabs on the left.  
 - **Expensify Classic (mobile):** Tap the chat icon in the upper right corner.  
-- **New Expensify:** Press the **+** button, select **New Chat**, and type *Concierge* into the composer box.  
+- **New Expensify:** Press the **+** button, select **New Chat**, and type *Concierge* into the composer box.
+- **New Expensify (search bar):** Type your question in the search bar and select **Ask Concierge**. Your message is sent to Concierge immediately.  
 
 # Common Concierge use cases
 

docs/articles/Unlisted/Concierge-in-Expensify.md

@@ -59,6 +59,7 @@ You can view and update your plan details from the **Subscription** section:
 - **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, 2026**).
+- **Credit balance:** If your account has prepaid Expensify credits, this row displays your current credit balance. It appears only when you have a positive balance.
 - **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.

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

@@ -132,7 +132,7 @@ No, members must remove themselves.
 Yes, an “edited” label will appear.
 
 ## Why can’t I message in some rooms?
-Rooms may have restricted posting permissions for Admins only.
+Rooms may have restricted posting permissions for Admins only. In other cases, the conversation may be read-only, and you’ll see a "This conversation is read-only" banner at the bottom of the chat.
 
 ## What happens when I flag a message?
 The moderation team reviews it, may hide or delete the message, and can restrict the sender’s account.

docs/articles/new-expensify/chat/Chat-Features-and-Moderation-Tools.md

@@ -25,6 +25,7 @@ You can chat with Concierge from anywhere in the app:
 
 - **On web:** Click the **Concierge** icon at the top right corner of the page. 
 - **On mobile:** Tap **Account** > **Help** and tap **Concierge** to navigate to the Concierge chat.
+- **From the search bar:** Type your question in the search bar and select **Ask Concierge**. Your message is sent to Concierge immediately.
 
 You can also contact Concierge by:
 - Email: **concierge@expensify.com**  

docs/articles/new-expensify/concierge-ai/Concierge-Basics.md

@@ -17,9 +17,8 @@ Anyone with an Expensify account can contact Concierge for help—whether you're
 
 You can ask Concierge for help from anywhere in Expensify:
 
-- **Account:** Go to **Account** > **Help** and select **Concierge**.  
-- **Web:** Click the chat icon in the top-right corner  
-- **Mobile:** Tap the hamburger menu in the top-left corner, then tap **Concierge**  
+- **Web:** Click the **Concierge** icon in the top-right corner.  
+- **Mobile:** Tap the **Concierge** icon in the top-right corner of the screen, or go to **Account** > **Help** and select **Concierge**.  
 - **Workspace chat:** Mention Concierge in a chat room (e.g., `#admins`)  
 - **Report or expense threads:** Ask a question in the thread  
 - **Email:** Send a message to concierge@expensify.com  

docs/articles/new-expensify/concierge-ai/Support-Agent.md

@@ -1,8 +1,8 @@
 ---
 title: Manage Domain Members
 description: Learn how to manage domain members in New Expensify.
-internalScope: Audience is Domain Admins. Covers inviting/adding domain members, closing accounts, and promoting members to Domain Admin. Does not cover domain verification, SAML setup, Domain Groups configuration, or account access troubleshooting.
-keywords: [New Expensify, Workspaces, Domains, domain members, verify domain, domain admin, domain control, remove domain member, deactivate domain user, invite domain user, promote to domain admin, workspace admins]
+internalScope: Audience is Domain Admins. Covers inviting/adding domain members, closing accounts, promoting members to Domain Admin, and moving a member between domain groups. Does not cover domain verification, SAML setup, Domain Groups configuration, or account access troubleshooting.
+keywords: [New Expensify, Workspaces, Domains, domain members, verify domain, domain admin, domain control, remove domain member, deactivate domain user, invite domain user, promote to domain admin, workspace admins, move member to group, domain group]
 ---
 
 # Manage Domain Members
@@ -71,6 +71,20 @@ You can give any member permission to manage domain settings by promoting them t
 3. Open **Domain Admins**.
 4. Add the member’s email address or phone number.
 
+## How to move a Domain Member to a different domain group
+
+Domain Admins can move a member from one domain group to another to change which domain-level rules apply to them.
+
+1. Go to **Workspaces > Domains**.
+2. Select your domain.
+3. Click **Domain Members**.
+4. Select the member.
+5. Click **Domain group**.
+6. Select the group you want to move the member to.
+7. Click **Save**.
+
+---
+
 # FAQ
 
 ## What happens if a member removes their domain email?