fix: conflicts

Author: truph01

.claude/scripts/createInlineComment.sh

@@ -3,7 +3,7 @@
 # Secure proxy script to create an inline comment on a GitHub PR.
 set -eu
 
-readonly ALLOWED_RULES_FILE="${GITHUB_WORKSPACE}/.claude/allowed-rules.txt"
+readonly ALLOWED_RULES_FILE="${ALLOWED_RULES_FILE:-${GITHUB_WORKSPACE}/.claude/allowed-rules.txt}"
 
 # Print error and exit.
 die() {

.github/workflows/claude-review.yml

@@ -57,7 +57,7 @@ jobs:
         run: |
           "$GITHUB_WORKSPACE/.github/scripts/extractAllowedRules.sh" \
             "$GITHUB_WORKSPACE/.claude/skills/coding-standards/rules" \
-            "$GITHUB_WORKSPACE/.claude/allowed-rules.txt"
+            "$RUNNER_TEMP/allowed-rules.txt"
 
       - name: Load code review JSON schema
         id: schema
@@ -82,6 +82,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
           STRUCTURED_OUTPUT: ${{ steps.code-review.outputs.structured_output }}
+          ALLOWED_RULES_FILE: ${{ runner.temp }}/allowed-rules.txt
         run: |
           if [ -z "$STRUCTURED_OUTPUT" ]; then
             echo "::error::Claude Code Action returned empty structured output"

android/app/build.gradle

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009035701
-        versionName "9.3.57-1"
+        versionCode 1009035903
+        versionName "9.3.59-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"

assets/images/integrationicons/gusto-icon-square.svg

@@ -1,7 +1,7 @@
 ---
 title: Using Your Expensify Card in New Expensify
 description: Learn how to activate, use, and manage your physical and virtual Expensify Card, including Smart Limits, notifications, and troubleshooting.
-keywords: [New Expensify, Expensify Card, Smart Limit, activate card, virtual card, card notifications, card declined, eReceipts]
+keywords: [New Expensify, Expensify Card, Smart Limit, activate card, virtual card, card notifications, card declined, eReceipts, freeze card, unfreeze card]
 ---
 
 Once you receive your Expensify Visa® Commercial Card, you can activate it and start using it immediately. When you use your Expensify Card, expenses are automatically created, and SmartScanned receipts are matched to the corresponding transactions. For most purchases, excluding lodging, Expensify also generates IRS-compliant eReceipts. If your organization doesn't require itemized receipts, you can rely on eReceipts to meet documentation requirements.
@@ -96,6 +96,30 @@ For more details on adding a card to Apple or Android Pay, see this [guide](http
 
 ---
 
+# How to freeze or unfreeze your Expensify Card
+
+Need to temporarily pause spending? You can freeze your Expensify Card at any time - without canceling or reissuing it.
+
+Freezing your card:
+- Immediately blocks new purchases on the card
+- Keeps your card number, CVV, and expiration date intact
+- Can be reversed at any time
+
+## To freeze or unfreeze your card
+
+1. From the navigation tabs (on the left on web, and at the bottom on mobile), go to **Account > Wallet > Expensify Card**.
+2. Click your Expensify Card to view its details.
+3. Click **Freeze card** or **Unfreeze card**, depending on the card's current state.
+4. Click **Confirm** in the dialog that appears.
+
+Once frozen:
+- You'll see a **Frozen** badge and a scarf graphic over your card
+- All new transactions will be declined until you unfreeze it
+
+**Note:** If your workspace admin froze the card, you'll need to contact them directly via Expensify Chat to request that they unfreeze it.
+
+---
+
 # FAQ
 
 ## What if I haven’t received my Expensify Card?

docs/articles/new-expensify/expensify-card/Cardholder-Settings-and-Features.md

@@ -97,6 +97,31 @@ If a card reaches its expiration date, it automatically deactivates and declines
 
 ---
 
+# How to freeze or unfreeze an Expensify Card
+
+As a Workspace Admin, you can freeze or unfreeze any card in your workspace without needing to cancel or reissue it.
+
+Freezing a card is helpful if:
+- You suspect misuse or a policy violation
+- You want to temporarily pause employee spending
+- You're enforcing a department-wide budget freeze
+
+To freeze or unfreeze a card:
+
+1. Go to **Settings > Workspaces > [Workspace Name] > Expensify Card**.
+2. Click a card from the list to open its details pane.
+3. Click **Freeze card** or **Unfreeze card**.
+4. Confirm the action in the popup modal.
+
+Once frozen:
+- The card immediately stops working for purchases
+- You'll see a note below the card indicating who froze the card and when
+- The employee sees the same message and cannot unfreeze the card themselves
+
+All freeze/unfreeze actions are automatically posted to the workspace chat.
+
+---
+
 # FAQ
 
 ## What kind of bank account is required?

docs/articles/new-expensify/expensify-card/Set-Up-and-Manage-the-Expensify-Card.md

@@ -1,11 +1,10 @@
 ---
-title: "How to use search operators in Expensify"
-description: "Learn how to use advanced search filters, comparisons, and groupings to find exactly what you need across expenses, chats, reports, and more."
-keywords: "search operators, filters, search rules, expense search, report search, chat filters, advanced search, group-by, search syntax"
+title: How to use search operators in Expensify
+description: Learn how to use advanced search filters, comparisons, and groupings to find exactly what you need across expenses, chats, reports, and more.
+keywords: [New Expensify, search operators, filters, search rules, expense search, report search, chat filters, advanced search, group-by, view, chart, search syntax]
+internalScope: Audience is all Expensify users. Covers search operator syntax for filtering, grouping, and chart views. Does not cover saved search management or Search page UI navigation.
 ---
 
-<div id="new-expensify" markdown="1">
-
 The search operator framework lets you quickly filter, sort, and group items like expenses, chats, reports, and tasks using powerful text-based rules. This guide walks you through the supported syntax, available filters, and usage tips.
 
 ---
@@ -101,12 +100,12 @@ type:task assignee:"Charlie Brown" status:outstanding
 
 ---
 
-# Available filters for grouping and currency conversion
+## How to use grouping, chart views, and currency conversion filters
 
-Use `group-by:` to analyze data by dimension, and `group-currency:` to normalize totals.
+Use `group-by:` to analyze data by dimension, `view:` to choose how grouped results are displayed, and `group-currency:` to normalize totals.
 
 ```
-group-by:merchant group-currency:USD
+group-by:category view:bar group-currency:USD
 ```
 
 Supported groupings include:
@@ -123,6 +122,19 @@ Supported groupings include:
 - `group-by:quarter` - Group by fiscal quarter
 - `group-by:year` - Group by calendar year
 
+## How to choose a chart view for grouped results
+
+When using `group-by:`, you can add `view:` to control the visualization type. If you save a grouped search with a specific `view:`, that choice is preserved in the saved search label.
+
+Supported views:
+
+- `view:table` - Display grouped results as a table (default)
+- `view:bar` - Display grouped results as a bar chart
+- `view:pie` - Display grouped results as a pie chart
+- `view:line` - Display grouped results as a line chart
+
+> **Note:** The `view:` operator only applies when `group-by:` is also used. Without `group-by:`, the `view:` value is ignored.
+
 ---
 
 # FAQ
@@ -139,4 +151,3 @@ If the search operator isn’t recognized, the system will ignore it and return
 
 Only use quotes for values that include spaces or exact phrases, like `description:"client lunch"` or `in:"#general"`.
 
-</div>