Enhance Telegram settings with a new test message feature, allowing users to send test messages directly from the UI. Update localization for new strings and improve analytics by excluding loan categories from spending charts. Update package-lock.json for Rollup dependencies and add error handling in the Telegram routes for better feedback.

Author: Cohen, Yohay

client/dev-dist/sw.js

@@ -82,7 +82,7 @@ define(['./workbox-46f6dd99'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.nostcd9l0mg"
+    "revision": "0.lnhr78ntask"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {

client/src/components/TelegramSettings.tsx

@@ -155,6 +155,28 @@ export function TelegramSettings({ isOpen, onClose, isInline }: TelegramSettings
         },
     });
 
+    const { mutate: sendTestMessage, isPending: isSendingTest } = useMutation({
+        mutationFn: async () => {
+            const res = await fetch(`${API_BASE}/telegram/send-test-message`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({}),
+            });
+            const data = await res.json();
+            if (!res.ok) throw new Error(data.error || 'Failed to send test message');
+            return data;
+        },
+        onSuccess: (data) => {
+            const msg = data?.sent > 0
+                ? (data.sent === 1 ? t('telegram.test_success') : `Test message sent to ${data.sent} chats.`)
+                : (data?.errors?.[0] || t('telegram.test_success'));
+            showNotification('success', msg);
+        },
+        onError: (err: any) => {
+            showNotification('error', err.message || 'Failed to send test message');
+        },
+    });
+
     const { mutate: testConnection, isPending: isTesting } = useMutation({
         mutationFn: async () => {
             if (!botToken || !chatId) {
@@ -298,19 +320,38 @@ export function TelegramSettings({ isOpen, onClose, isInline }: TelegramSettings
                                             {isStarting ? t('telegram.starting') : t('telegram.start')}
                                         </button>
                                     ) : (
-                                        <button
-                                            onClick={() => stopBot()}
-                                            disabled={isStopping}
-                                            className="flex items-center gap-2 bg-red-600 text-white px-4 py-2.5 rounded-2xl hover:bg-red-700 disabled:bg-gray-400"
-                                        >
-                                            <Square className="w-4 h-4" />
-                                            {isStopping ? t('telegram.stopping') : t('telegram.stop')}
-                                        </button>
+                                        <>
+                                            <button
+                                                onClick={() => sendTestMessage()}
+                                                disabled={isSendingTest}
+                                                className="flex items-center gap-2 bg-blue-600 text-white px-4 py-2.5 rounded-2xl hover:bg-blue-700 disabled:bg-gray-400"
+                                            >
+                                                {isSendingTest ? t('telegram.testing') : t('telegram.send_test_message')}
+                                            </button>
+                                            <button
+                                                onClick={() => stopBot()}
+                                                disabled={isStopping}
+                                                className="flex items-center gap-2 bg-red-600 text-white px-4 py-2.5 rounded-2xl hover:bg-red-700 disabled:bg-gray-400"
+                                            >
+                                                <Square className="w-4 h-4" />
+                                                {isStopping ? t('telegram.stopping') : t('telegram.stop')}
+                                            </button>
+                                        </>
                                     )}
                                 </div>
                             </div>
                         </div>
 
+                        {!status?.isActive && status?.lastStartError && (
+                            <div className="mb-6 p-4 rounded-2xl bg-red-50 border border-red-200 flex items-start gap-3">
+                                <AlertCircle className="w-5 h-5 text-red-600 flex-shrink-0 mt-0.5" />
+                                <div>
+                                    <p className="font-semibold text-red-900">{t('telegram.why_bot_not_started')}</p>
+                                    <p className="text-sm text-red-800 mt-1">{status.lastStartError}</p>
+                                </div>
+                            </div>
+                        )}
+
                         {!status?.usersConfigured && (
                             <div className="mb-6 p-4 rounded-2xl bg-amber-100 border border-amber-300 flex items-start gap-3">
                                 <AlertCircle className="w-5 h-5 text-amber-700 flex-shrink-0 mt-0.5" />

client/src/hooks/useAnalytics.ts

@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 import { Transaction } from '@app/shared';
-import { isInternalTransfer } from '../utils/transactionUtils';
+import { isInternalTransfer, isLoanCategory } from '../utils/transactionUtils';
 
 interface AnalyticsData {
     totalIncome: number;
@@ -73,6 +73,12 @@ function parseTransactionDate(dateValue: string): Date {
     return new Date(dateValue);
 }
 
+/** Exclude mortgage/loan category from analytics spending charts and related totals */
+function skipLoanExpense(t: Transaction): boolean {
+    const amount = t.chargedAmount || t.amount || 0;
+    return amount < 0 && isLoanCategory(t.category);
+}
+
 export function useAnalytics(transactions: Transaction[], customCCKeywords: string[] = []): AnalyticsData {
     return useMemo(() => {
         if (!transactions || transactions.length === 0) {
@@ -94,6 +100,7 @@ export function useAnalytics(transactions: Transaction[], customCCKeywords: stri
 
         transactions.forEach(t => {
             if (isInternalTransfer(t, customCCKeywords)) return;
+            if (skipLoanExpense(t)) return;
             const amount = t.chargedAmount || t.amount || 0;
             if (amount > 0) {
                 totalIncome += amount;
@@ -106,6 +113,7 @@ export function useAnalytics(transactions: Transaction[], customCCKeywords: stri
         const categoryMap = new Map<string, number>();
         transactions.forEach(t => {
             if (isInternalTransfer(t, customCCKeywords)) return;
+            if (skipLoanExpense(t)) return;
             const category = t.category || 'אחר';
             const amount = Math.abs(t.chargedAmount || t.amount || 0);
 
@@ -138,7 +146,7 @@ export function useAnalytics(transactions: Transaction[], customCCKeywords: stri
             const entry = monthMap.get(monthKey)!;
             if (amount > 0) {
                 entry.income += amount;
-            } else {
+            } else if (!skipLoanExpense(t)) {
                 entry.expenses += Math.abs(amount);
             }
         });
@@ -155,6 +163,7 @@ export function useAnalytics(transactions: Transaction[], customCCKeywords: stri
         const weekdayMap = new Map<number, number>();
         transactions.forEach(t => {
             if (isInternalTransfer(t, customCCKeywords)) return;
+            if (skipLoanExpense(t)) return;
             const amount = t.chargedAmount || t.amount || 0;
             if (amount >= 0) return;
 
@@ -172,6 +181,7 @@ export function useAnalytics(transactions: Transaction[], customCCKeywords: stri
         const monthDayMap = new Map<number, number>();
         transactions.forEach(t => {
             if (isInternalTransfer(t, customCCKeywords)) return;
+            if (skipLoanExpense(t)) return;
             const amount = t.chargedAmount || t.amount || 0;
             if (amount >= 0) return;
 
@@ -191,6 +201,7 @@ export function useAnalytics(transactions: Transaction[], customCCKeywords: stri
         const merchantMap = new Map<string, { count: number; total: number }>();
         transactions.forEach(t => {
             if (isInternalTransfer(t, customCCKeywords)) return;
+            if (skipLoanExpense(t)) return;
             const desc = t.description;
             if (!merchantMap.has(desc)) {
                 merchantMap.set(desc, { count: 0, total: 0 });

client/src/locales/en.json

@@ -656,6 +656,8 @@
         "test": "Test",
         "testing": "Testing...",
         "test_success": "Test message sent successfully",
+        "send_test_message": "Send test message",
+        "why_bot_not_started": "Why the bot did not start",
         "loading_status": "Loading status...",
         "user_added": "User added to allowed list",
         "user_removed": "User removed from allowed list",

client/src/locales/he.json

@@ -656,6 +656,8 @@
         "test": "בדוק",
         "testing": "בודק...",
         "test_success": "הודעת בדיקה נשלחה בהצלחה",
+        "send_test_message": "שלח הודעת בדיקה",
+        "why_bot_not_started": "מדוע הבוט לא הופעל",
         "chat_id_placeholder": "הכנס זהות צ'אט או זהות קבוצה",
         "chat_id_help": "בדרך כלל מתחיל ב- עבור קבוצות או מספר לצ'אטים פרטיים",
         "config_saved": "התצורה נשמרה",

client/src/utils/transactionUtils.ts

@@ -64,3 +64,12 @@ export function isInternalTransfer(txn: Transaction, customCCKeywords: string[]
 
     return true;
 }
+
+/** Mortgage / loan payment category — excluded from daily spend pace vs historical baseline. */
+export function isLoanCategory(category: string | undefined): boolean {
+    if (!category) return false;
+    const c = category.trim();
+    if (c === 'משכנתא והלוואות') return true;
+    const lower = c.toLowerCase();
+    return lower === 'mortgage & loans' || lower === 'mortgage and loans';
+}