fix: resolve conflicts

Author: koko57

Mobile-Expensify

@@ -113,8 +113,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009031700
-        versionName "9.3.17-0"
+        versionCode 1009031705
+        versionName "9.3.17-5"
         // 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

@@ -0,0 +1,123 @@
+---
+title: View the Top Categories report
+description: Learn how to use the Top Categories report to understand category-level spending trends.
+keywords: [New Expensify, Top Categories, expense categories, category spending, monthly spending, Workspace Admin, Approver, Auditor, category insights, expense analytics, report by category]
+internalScope: Audience is Workspace Admins, Approvers, and Auditors. Covers using the Top Categories suggested search to view expense totals by category. Does not cover employee-level analysis or merchant-level grouping.
+---
+
+# View the Top Categories report
+
+The **Top Categories** report shows which expense categories had the highest total spend last month. It’s an easy way to:
+
+- Understand where the most money is being spent
+- Spot trends without exporting data
+- Make data-driven budget decisions with less effort
+
+This report is a pre-built suggested search that uses filters to group your expenses by category.
+
+![Top Categories bar chart]({{site.url}}/assets/images/top-categories.png){:width="100%"}
+
+---
+
+## Who can use the Top Categories report
+
+The Top Categories report is available to all workspace members on web and mobile.
+ - **Workspace members** can view top categories for expenses on reports they’ve submitted or approved.
+ - **Workspace Admins** and **Auditors** can view top categories for all expenses on the workspace.
+
+---
+
+## Where to find the Top Categories report
+
+**Web:**  
+Click **Reports** in the left navigation, then click **Top categories** under the **Insights** section
+
+**Mobile:**  
+Tap **Reports** from the navigation tabs on the bottom, then tap the hamburger menu in the top-right corner. Under **Insights**, tap **Top categories**.
+
+---
+
+## What the Top Categories report shows
+
+The Top Categories report is powered by Expensify’s search query engine using grouping and filters. The report shows:
+
+- All **expense categories** sorted by total spend in the last month  
+- The **total amount spent** in each category  
+- The **number of expenses** in each category  
+
+---
+
+## How to interpret the Top Categories report
+
+Each category entry represents a single expense category, ordered from highest to lowest total spend. The report shows:
+
+- **Number of expenses** in the category  
+- **Total amount spent** in that category  
+
+Select a category to review all expenses included in that grouping.
+
+---
+
+## How to customize the Top Categories report 
+
+You can adjust filters like status, expense type or employee to explore spending trends.
+
+The Top Categories report is a suggested search template. You cannot save changes directly to this report, but you can create a custom version.
+
+To create and save a custom report:
+
+1. Go to the **Reports** or **Expenses** tab.
+2. Use filters to adjust the category grouping or timeframe.
+3. Apply filters and click **Save search** to save your custom report.
+
+[Learn how to create custom reports](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Using-Reports-in-New-Expensify#How-to-use-Reports-search-query-commands)
+
+---
+
+## How to switch the Top Categories report to table view
+
+By default, the Top Categories report displays a bar chart. The table view shows expense categories sorted in descending order by total spend.
+
+To change the view:
+
+1. Click **View** in the top navigation tabs.
+2. Select **Table**.
+
+The table view shows expense categories as rows sorted in descending order by total spend.
+
+---
+
+## Ways to use the Top Categories report
+
+Workspace Admins and finance teams use the Top Categories report to:
+
+- Monitor which expense categories are driving most of the spend
+- Quickly compare expense volume by category
+- Make budget and policy decisions without needing spreadsheets
+
+---
+
+# FAQ
+
+## Can I export the Top Categories report?
+
+The Top Categories report can’t be exported with its grouped totals or summary data directly. However, if you expand each group to reveal the individual expenses, you can then select those expenses and use Export to CSV to download the raw data.
+
+To export expenses:
+
+1. Go to the **Reports** or **Expenses** tab.
+2. Use filters to group by category and apply the same timeframe.
+3. Expand the category group, select the expenses, and click **Export to CSV**.
+
+## What’s the difference between the Top Categories report and the Top Spenders report?
+
+The **Top Categories** report shows the highest-spending **expense categories**, while the **Top Spenders** report shows which **employees** submitted the most expenses. Both reports help identify trends, but from different perspectives:
+
+- Use **Top Categories** to track spending by type (e.g., Travel, Meals).
+- Use **Top Spenders** to track who is submitting the most expenses.
+
+## How is the Top Categories report calculated?
+
+The report uses all expenses from the previous calendar month and groups them by category. It shows the **top 10 categories** based on total spend.
+
+---

docs/articles/new-expensify/insights/View-the-Top-Categories-report.md

@@ -118,6 +118,7 @@ Supported groupings include:
 - `group-by:from`
 - `group-by:card`
 - `group-by:withdrawal-id`
+- `group-by:category` 
 
 ---
 

docs/articles/new-expensify/reports-and-expenses/Using-search-operators.md

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.3.17.0</string>
+	<string>9.3.17.5</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

docs/assets/images/top-categories.png

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.17</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.17.0</string>
+	<string>9.3.17.5</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.17</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.17.0</string>
+	<string>9.3.17.5</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/NotificationServiceExtension/Info.plist

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.3.17-0",
+  "version": "9.3.17-5",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",