Merge branch 'Expensify:main' into feat/sentry-search-modal-metric

Author: adhorodyski

Mobile-Expensify

@@ -30,7 +30,7 @@ const transactionR14932: Transaction = {
     reimbursable: true,
     hasEReceipt: true,
     cardID: 0,
-    modifiedAmount: '',
+    modifiedAmount: 0,
     originalAmount: 0,
     comment: {},
     bank: '',
@@ -59,7 +59,7 @@ const transactionR98765: Transaction = {
     hasEReceipt: true,
     managedCard: false,
     billable: false,
-    modifiedAmount: '',
+    modifiedAmount: 0,
     cardID: 0,
     originalAmount: 0,
     comment: {},

__mocks__/reportData/transactions.ts

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009026000
-        versionName "9.2.60-0"
+        versionCode 1009026100
+        versionName "9.2.61-0"
         // 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

@@ -97,6 +97,8 @@
         "capitalone",
         "CAROOT",
         "Carta",
+        "cacerts",
+        "changeit",
         "ccache",
         "ccupload",
         "cdfbmo",
@@ -211,10 +213,12 @@
         "Expensable",
         "expensescount",
         "Expensi",
+        "Expensidev",
         "Expensicon",
         "Expensicons",
         "expensicorp",
         "Expensifier",
+        "EXPENSIDEV",
         "EXPENSIFYAPI",
         "expensifyhelp",
         "expensifylite",
@@ -231,6 +235,7 @@
         "falso",
         "favicons",
         "Ferroalloy",
+        "firebaselogging",
         "firstname",
         "Fiscale",
         "flac",
@@ -437,6 +442,7 @@
         "noopener",
         "noreferer",
         "noreferrer",
+        "noprompt",
         "nosymbol",
         "Noto",
         "NSQS",
@@ -625,6 +631,7 @@
         "stdev",
         "stdlib",
         "storepass",
+        "stackoverflow",
         "STORYLANE",
         "strikethrough",
         "Strikethrough",
@@ -676,6 +683,7 @@
         "tranid",
         "Transpiles",
         "trivago",
+        "trustcacerts",
         "Typeform",
         "uatp",
         "UATP",

assets/images/simple-illustrations/simple-illustration__concierge-bot.svg

@@ -31,7 +31,8 @@ Once enabled, go to the **Rules** tab in the left menu to manage expense-level s
 - **Max Expense Amount** – Set a per-expense spending cap (supports decimals).
 - **Max Expense Age (Days)** – Define how old an expense can be (whole numbers only).
 - **Billable Default** – Choose whether expenses are billable by default.
-- **eReceipts** – Enable automatic receipt generation for most USD card transactions (requires USD as default currency).
+- **eReceipts** – Enable automatic receipt generation for all USD card transactions up to $75 (requires USD as default currency).
+- Note: Disabling **eReceipts** after enabling them will hide existing eReceipts. Enable **eReceipts** again to restore them.
 
 ---
 

assets/images/simple-illustrations/simple-illustration__magnifyingglass-receipt.svg

@@ -56,7 +56,7 @@ const config = defineConfig([
         ignores: ['**/libs/**/*.{ts,tsx}'],
         rules: {
             'no-restricted-imports': [
-                'error',
+                'warn',
                 {
                     paths: restrictedIconImportPaths,
                     patterns: restrictedIconImportPatterns,

cspell.json

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.2.60</string>
+	<string>9.2.61</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.2.60.0</string>
+	<string>9.2.61.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

docs/articles/new-expensify/workspaces/Workspace-Rules.md

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.2.60</string>
+	<string>9.2.61</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.60.0</string>
+	<string>9.2.61.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>