Merge branch 'main' into VickyStash/bugfix/88238-fix-new-message-indication

Author: sosek108

.github/actions/composite/isContributorPlus/action.yml

@@ -0,0 +1,33 @@
+name: Is Contributor+
+description: Check whether a GitHub user is a member of the Expensify/contributor-plus team. Sets IS_CPLUS=true when the user is a member, IS_CPLUS=false otherwise.
+
+inputs:
+  USERNAME:
+    description: The GitHub login of the user to check.
+    required: true
+  OS_BOTIFY_TOKEN:
+    description: OSBotify token. Needed to read team memberships (the default GITHUB_TOKEN lacks the read:org scope).
+    required: true
+
+outputs:
+  IS_CPLUS:
+    description: "'true' if the user is a member of Expensify/contributor-plus, 'false' otherwise."
+    value: ${{ steps.check.outputs.IS_CPLUS }}
+
+runs:
+  using: composite
+  steps:
+    - name: Check Contributor+ membership
+      id: check
+      shell: bash
+      env:
+        GH_TOKEN: ${{ inputs.OS_BOTIFY_TOKEN }}
+        USERNAME: ${{ inputs.USERNAME }}
+      run: |
+        if gh api "/orgs/Expensify/teams/contributor-plus/memberships/$USERNAME" --silent; then
+          echo "::notice::✅ $USERNAME is a Contributor+ member"
+          echo "IS_CPLUS=true" >> "$GITHUB_OUTPUT"
+        else
+          echo "::notice::$USERNAME is not a Contributor+ member"
+          echo "IS_CPLUS=false" >> "$GITHUB_OUTPUT"
+        fi

.github/workflows/claude-review.yml

@@ -7,25 +7,50 @@ permissions:
 on:
   pull_request_target:
     types: [opened, ready_for_review]
+  pull_request_review:
+    types: [submitted]
 
 concurrency:
   group: claude-review-${{ github.event.pull_request.html_url }}
   cancel-in-progress: true
 
 jobs:
   validate:
+    if: github.event_name == 'pull_request_target'
     uses: ./.github/workflows/contributorValidationGate.yml
     with:
       PR_NUMBER: ${{ github.event.pull_request.number }}
       PR_AUTHOR: ${{ github.event.pull_request.user.login }}
       AUTHOR_ASSOCIATION: ${{ github.event.pull_request.author_association }}
 
+  checkCPlusApproval:
+    if: github.event_name == 'pull_request_review' && github.event.review.state == 'approved'
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    outputs:
+      IS_CPLUS: ${{ steps.check.outputs.IS_CPLUS }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          fetch-depth: 1
+
+      - name: Check Contributor+ membership
+        id: check
+        uses: ./.github/actions/composite/isContributorPlus
+        with:
+          USERNAME: ${{ github.event.review.user.login }}
+          OS_BOTIFY_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+
   review:
-    needs: [validate]
+    needs: [validate, checkCPlusApproval]
     if: |
-      needs.validate.outputs.IS_AUTHORIZED == 'true'
+      !cancelled()
       && github.event.pull_request.draft != true
       && !contains(github.event.pull_request.title, 'Revert')
+      && (
+        (github.event_name == 'pull_request_target' && needs.validate.outputs.IS_AUTHORIZED == 'true')
+        || (github.event_name == 'pull_request_review' && needs.checkCPlusApproval.outputs.IS_CPLUS == 'true')
+      )
     runs-on: blacksmith-2vcpu-ubuntu-2404
     env:
       PR_NUMBER: ${{ github.event.pull_request.number }}

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009036102
-        versionName "9.3.61-2"
+        versionCode 1009036201
+        versionName "9.3.62-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

@@ -73,7 +73,8 @@ If you haven't done any intentional edits outside of `src/` (like adding new dep
 - Changes applied to Javascript will be applied automatically, any changes to native code will require a recompile
 
 ### Expensify Employees
-If you are an Expensify employee and want to point the emulator to your local VM, follow [this](https://stackoverflow.com/c/expensify/questions/7699)
+- To point the **Development Emulator** at your local VM, follow [these steps](https://stackoverflow.com/c/expensify/questions/7699).
+- You must configure the local dev email account; follow [these instructions](https://stackoverflowteams.com/c/expensify/questions/23537/23538#23538).
 
 ## Enabling Prebuilt React Native Artifacts
 

assets/images/simple-illustrations/simple-illustration__newuser.svg

@@ -80,7 +80,8 @@ For an M1 Mac, read this [Stack Overflow post](https://stackoverflow.com/questio
 If you want to run the app on an actual physical iOS device, please follow the instructions [here](https://github.com/Expensify/App/blob/main/contributingGuides/HOW_TO_BUILD_APP_ON_PHYSICAL_IOS_DEVICE.md).
 
 ### Expensify Employees
-If you are an Expensify employee and want to point the emulator to your local VM, follow [this](https://stackoverflow.com/c/expensify/questions/7699)
+- To point the **Development Simulator** at your local VM, follow [these steps](https://stackoverflow.com/c/expensify/questions/7699).
+- You must configure the local dev email account; follow [these instructions](https://stackoverflowteams.com/c/expensify/questions/23537/23538#23538).
 
 ## Push Notifications Setup
 

contributingGuides/SETUP_ANDROID.md

@@ -13,7 +13,7 @@ REMOVE noindex: true AND sitemap: false FROM YAML HEADER BEFORE PUBLISHING!
 
 # Set up the Expensify Card in the UK and EU
 
-The Expensify Card is available for companies in the United Kingdom and select European countries. This guide walks you through eligibility and how to set up and start using the card in GBP or EUR. 
+The Expensify Card is available for companies in the United Kingdom and select European countries. This guide walks you through eligibility and how to set up and start using the card in GBP or EUR.
 
 Workspace Admins can issue virtual Expensify Cards to members and manage spending in GBP or EUR. Physical cards will be available soon.
 
@@ -33,34 +33,27 @@ If your company hasn’t yet connected a GBP or EUR business bank account, [foll
 
 The Expensify Card can be used **anywhere Visa is accepted**.
 
-However, only companies registered in the following 20 UK and EU countries can enable the Expensify Card for their Workspace:
-
-- Belgium  
-- Denmark  
-- Estonia  
-- Finland  
-- Gibraltar  
-- Greece 
-- Ireland  
-- Latvia  
-- Liechtenstein  
-- Lithuania  
-- Luxembourg  
-- Malta  
-- Netherlands  
-- Poland  
-- Romania  
-- Slovakia  
-- Slovenia  
-- Spain  
-- Sweden  
+Companies registered in the following countries can enable the Expensify Card for their Workspaces:
+
+- Belgium
+- Denmark
+- Finland
+- Gibraltar
+- Ireland
+- Latvia
+- Lithuania
+- Luxembourg
+- Netherlands
+- Poland
+- Spain
+- Sweden
 - United Kingdom
 
 ## What are the pre-requisites to set up the Expensify Card in the UK and EU
 
-To set up the Expensify Card in the UK and EU, you must: 
+To set up the Expensify Card in the UK and EU, you must:
 
-1. Have a GBP or EUR bank account connected. To connect one, [Enable Global Reimbursement](https://help.expensify.com/articles/new-expensify/wallet-and-payments/Enable-Global-Reimbursement). 
+1. Have a GBP or EUR bank account connected. To connect one, [Enable Global Reimbursement](https://help.expensify.com/articles/new-expensify/wallet-and-payments/Enable-Global-Reimbursement).
 2. Complete the **[Know Your Customer (KYC)](https://launch-workflow.trulioo.com/68223577c5dae52a6ec9347f)** and **[Know Your Business (KYB)](https://launch-workflow.trulioo.com/681a7cc4e65d2e48f19de9c3)** forms.
 3. Share the last 90 days of statements from your connected GBP or EUR bank account with Concierge so they can assess your eligible limit
 
@@ -70,9 +63,9 @@ To set up the Expensify Card in the UK and EU, you must:
 
 1. From navigation tabs (on the left on Web, on the bottom on Mobile), choose **Workspaces > [Workspace Name] > More features**.
 2. In the **Spend** section, enable **Expensify Card**.
-3. So that we can assess your request, reach out to Concierge and provide the last 90 days of statements from the connected UK or EU bank account 
+3. So that we can assess your request, reach out to Concierge and provide the last 90 days of statements from the connected UK or EU bank account
 
-Once enabled, **Expensify Card** will appear in the navigation tabs. 
+Once enabled, **Expensify Card** will appear in the navigation tabs.
 
 ---
 
@@ -88,7 +81,7 @@ Once enabled, **Expensify Card** will appear in the navigation tabs.
 
 1. From navigation tabs (on the left on Web, on the bottom on Mobile), choose **Workspaces > [Workspace Name] > Expensify Card**
 2. Click **Issue new card**.
-3. Select the employee the card should be issued to. 
+3. Select the employee the card should be issued to.
 4. Choose **Virtual**.
 5. Pick a limit type:
    - **Smart limit** – Spend up to a threshold before needing approval
@@ -110,7 +103,7 @@ We use the [Visa FX calculator](https://www.visa.co.uk/support/consumer/travel-s
 
 ## Does the Expensify Card support Visa Secure for online transactions?
 
-Yes, the Expensify Card protects online transactions with Visa Secure. Please review the [Visa Secure FAQs]({{site.url}}/assets/Files/Visa-secure-faq-expensify.pdf) for more information. 
+Yes, the Expensify Card protects online transactions with Visa Secure. Please review the [Visa Secure FAQs]({{site.url}}/assets/Files/Visa-secure-faq-expensify.pdf) for more information.
 
 ## How do I get help with the Expensify Card in the UK and EU?
 

contributingGuides/SETUP_IOS.md

@@ -0,0 +1,101 @@
+---
+title: Troubleshoot SmartScan Issues
+description: Fix common SmartScan problems, including failed, stuck and incorrect scans. 
+keywords: [Expensify Classic, SmartScan, scan failed, receipt not scanning, illegible receipt, blurry receipt, stuck scanning, SmartScan error, scan not working, SmartScan troubleshooting, SCANREADY, wrong amount, wrong merchant, wrong date, SmartScan incorrect]
+internalScope: Audience is all Expensify members. Covers troubleshooting SmartScan failures, image quality tips, and what to do when SmartScan returns incorrect data. Does not cover how to attach, replace, or crop receipts.
+---
+
+# Troubleshoot SmartScan Issues
+
+SmartScan reads receipt images and automatically fills in expense details like the amount, date, and merchant. If SmartScan fails, gets stuck, or scans incorrectly, use this guide to identify the cause and fix the issue.
+
+[Learn how to SmartScan a receipt](/articles/expensify-classic/expenses/Add-an-expense#add-an-expense-with-smartscan). 
+
+---
+
+## Why SmartScan fails to complete a scan
+
+SmartScan requires a readable date and total amount on the receipt. If either of these cannot be detected, the scan will fail.
+
+Common reasons include: 
+
+ - The receipt does not include a date or total
+ - The date or total is cut off or cropped out
+ - The image is blurry or out of focus
+ - The receipt is faded or low contrast
+ - The text is obscured by shadows, glare, or folds
+
+If SmartScan cannot confidently read these required fields, the scan will fail and will show the message: "Receipt scanning failed. Enter details manually".  
+
+---
+
+## How to fix when SmartScan fails to complete a scan
+
+SmartScan may fail if the receipt image is unreadable, or if the image is missing a clear expense date or amount. 
+
+To retry:
+
+**On web:** 
+
+1. In the navigation tabs on the left, go to **Expenses**.
+2. Click the expense with the failed scan to open it.
+3. Drag and drop a receipt image onto the window to replace the existing receipt.
+
+**On mobile:** 
+
+1. Tap the hamburger menu in the top-left corner.
+2. Tap **Expenses**.
+3. Tap the expense with the failed scan to open it.
+4. Tap the receipt image.
+5. Tap **Retake**.
+
+Once a new receipt image is added, SmartScan will run again. 
+
+---
+
+## How to troubleshoot stuck or delayed scans
+
+SmartScan usually completes within a few seconds, but delays can happen.
+
+- **Wait a few minutes**. Scans may take longer during high-traffic periods.
+- **Check your internet connection**. SmartScan requires an active connection to process. If you were offline when you took the photo, the scan will begin once you reconnect.
+- **Check the photo library on your device**. If SmartScan fails to process the images, it will be saved to the photo library on your device.
+
+If the scan is still stuck after several minutes, you can retry SmartScan with a new photo to trigger a fresh scan.
+
+---
+
+## How to fix incorrect scans
+
+SmartScan extracts data automatically, but it may misread certain receipts — especially handwritten receipts, faded ink, or unusual formats.
+
+To fix an incorrectly scanned merchant name, date or amount you can edit the expense manually. [Learn how to edit expenses](/articles/expensify-classic/expenses/Edit-expenses). 
+
+---
+
+## How to take better receipt photos for SmartScan
+
+Improving image quality helps prevent most SmartScan issues.
+
+- Lay the receipt flat on a contrasting surface (e.g., a dark receipt on a light table).
+- Capture the full receipt and make sure all edges, the total, date, and merchant name are visible.
+- Avoid shadows and glare. Hold your phone directly above the receipt and use even lighting.
+- Keep the camera steady - blurry images are the most common cause of scan failures.
+- Avoid folded or crumpled receipts. Flatten the receipt before photographing it.
+- Use the in-app camera. The Expensify camera is optimized for receipt scanning. 
+
+---
+
+# FAQ
+
+## Why does SmartScan keep failing on the same receipt?
+
+The receipt image may be too low quality for SmartScan to process. Try taking a new photo with better lighting and ensure the full receipt is in frame. If it continues to fail, the receipt may be too faded, damaged, or in a non-standard format — in that case, enter the expense details manually instead.
+
+## What file types does SmartScan support?
+
+SmartScan works with common image formats (JPG, PNG) and PDF files. For best results on mobile, use the in-app camera to take a photo directly.
+
+## SmartScan got the currency wrong. How do I fix it?
+
+Open the expense, tap the **Amount** field, and change the currency manually. This can happen with receipts from international merchants or receipts that don't clearly display a currency symbol.