Merge branch 'master' into goal-template-apply

packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx

@@ -88,7 +88,8 @@ function CategoryList({
     <View>
       <View
         style={{
-          overflow: 'auto',
+          overflowY: 'auto',
+          willChange: 'transform',
           padding: '5px 0',
           ...(!embedded && { maxHeight: 175 }),
         }}

packages/desktop-client/src/components/common/Modal.tsx

@@ -22,6 +22,7 @@ import { useModalState } from '../../hooks/useModalState';
 import { AnimatedLoading } from '../../icons/AnimatedLoading';
 import { SvgLogo } from '../../icons/logo';
 import { SvgDelete } from '../../icons/v0';
+import { useResponsive } from '../../ResponsiveProvider';
 import { styles, theme } from '../../style';
 import { tokens } from '../../tokens';
 
@@ -52,6 +53,7 @@ export const Modal = ({
   containerProps,
   ...props
 }: ModalProps) => {
+  const { isNarrowWidth } = useResponsive();
   const { enableScope, disableScope } = useHotkeysContext();
 
   // This deactivates any key handlers in the "app" scope
@@ -82,7 +84,15 @@ export const Modal = ({
         alignItems: 'center',
         justifyContent: 'center',
         fontSize: 14,
-        backdropFilter: 'blur(1px) brightness(0.9)',
+        willChange: 'transform',
+        // on mobile, we disable the blurred background for performance reasons
+        ...(isNarrowWidth
+          ? {
+              backgroundColor: 'rgba(0, 0, 0, 0.4)',
+            }
+          : {
+              backdropFilter: 'blur(1px) brightness(0.9)',
+            }),
         ...style,
       }}
       {...props}

packages/desktop-client/src/components/reports/DateRange.tsx

@@ -2,6 +2,8 @@ import React, { type ReactElement } from 'react';
 
 import * as d from 'date-fns';
 
+import * as monthUtils from 'loot-core/src/shared/months';
+
 import { theme } from '../../style';
 import { styles } from '../../style/styles';
 import { Block } from '../common/Block';
@@ -14,8 +16,8 @@ type DateRangeProps = {
 };
 
 function checkDate(date: string) {
-  const dateParsed = new Date(date);
-  if (dateParsed.toString() !== 'Invalid Date') {
+  const dateParsed = monthUtils.parseDate(date);
+  if (dateParsed) {
     return d.format(dateParsed, 'yyyy-MM-dd');
   } else {
     return null;

packages/desktop-client/src/components/reports/spreadsheets/spending-spreadsheet.ts

@@ -194,7 +194,11 @@ export function createSpendingSpreadsheet({
               }
               return null;
             });
-            if (month.month >= startDate && month.month < compare) {
+
+            if (
+              month.month >= monthUtils.monthFromDate(startDate) &&
+              month.month < compare
+            ) {
               if (day === '28') {
                 if (monthUtils.getMonthEnd(intervalItem) === intervalItem) {
                   averageSum += cumulativeAssets + cumulativeDebts;

packages/desktop-client/src/components/schedules/SchedulesTable.tsx

@@ -283,9 +283,7 @@ export function SchedulesTable({
         <Field width="flex" name="name">
           <Text
             style={
-              schedule.name == null
-                ? { color: theme.buttonNormalDisabledText }
-                : null
+              !schedule.name ? { color: theme.buttonNormalDisabledText } : null
             }
             title={schedule.name ? schedule.name : ''}
           >

packages/desktop-client/src/components/transactions/TransactionList.jsx

@@ -106,6 +106,7 @@ export function TransactionList({
 
   const onSave = useCallback(async transaction => {
     const changes = updateTransaction(transactionsLatest.current, transaction);
+    transactionsLatest.current = changes.data;
 
     if (changes.diff.updated.length > 0) {
       const dateChanged = !!changes.diff.updated[0].date;

packages/loot-core/src/client/actions/queries.ts

@@ -33,10 +33,16 @@ export function applyBudgetAction(month, type, args) {
         dispatch(addNotification(await send('budget/check-templates')));
         break;
       case 'apply-goal-template':
-        await send('budget/apply-goal-template', { month });
+        dispatch(
+          addNotification(await send('budget/apply-goal-template', { month })),
+        );
         break;
       case 'overwrite-goal-template':
-        await send('budget/overwrite-goal-template', { month });
+        dispatch(
+          addNotification(
+            await send('budget/overwrite-goal-template', { month }),
+          ),
+        );
         break;
       case 'cleanup-goal-template':
         dispatch(

packages/loot-core/src/server/accounts/rules.test.ts

@@ -406,6 +406,10 @@ describe('Action', () => {
       testHelper('{{month "2002-07-25"}}', '7');
       testHelper('{{year "2002-07-25"}}', '2002');
       testHelper('{{format "2002-07-25" "MM yyyy d"}}', '07 2002 25');
+      testHelper('{{day undefined}}', '');
+      testHelper('{{month undefined}}', '');
+      testHelper('{{year undefined}}', '');
+      testHelper('{{format undefined undefined}}', '');
     });
 
     test('{{debug}} should log the item', () => {

packages/loot-core/src/server/accounts/rules.ts

@@ -76,10 +76,10 @@ function registerHandlebarsHelpers() {
     min: mathHelper((a, b) => Math.min(a, b)),
     max: mathHelper((a, b) => Math.max(a, b)),
     fixed: (a: unknown, digits: unknown) => Number(a).toFixed(Number(digits)),
-    day: (date: string) => format(date, 'd'),
-    month: (date: string) => format(date, 'M'),
-    year: (date: string) => format(date, 'yyyy'),
-    format: (date: string, f: string) => format(date, f),
+    day: (date?: string) => date && format(date, 'd'),
+    month: (date?: string) => date && format(date, 'M'),
+    year: (date?: string) => date && format(date, 'yyyy'),
+    format: (date?: string, f?: string) => date && f && format(date, f),
     debug: (value: unknown) => {
       console.log(value);
     },

packages/loot-core/src/server/accounts/transaction-rules.ts

@@ -468,7 +468,9 @@ export function conditionsToAQL(conditions, { recurDateBounds = 100 } = {}) {
 
         return {
           $and: tagValues.map(v => {
-            const regex = new RegExp(`(^|\\s)${v}(\\s|$)`);
+            const regex = new RegExp(
+              `(^|\\s)${v.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}(\\s|$)`,
+            );
             return apply(field, '$regexp', regex.source);
           }),
         };

packages/loot-core/src/server/server-config.ts

@@ -27,13 +27,22 @@ export function setServer(url: string): void {
 // `url` is optional; if not given it will provide the global config
 export function getServer(url?: string): ServerConfig | null {
   if (url) {
-    return {
-      BASE_SERVER: url,
-      SYNC_SERVER: joinURL(url, '/sync'),
-      SIGNUP_SERVER: joinURL(url, '/account'),
-      GOCARDLESS_SERVER: joinURL(url, '/gocardless'),
-      SIMPLEFIN_SERVER: joinURL(url, '/simplefin'),
-    };
+    try {
+      return {
+        BASE_SERVER: url,
+        SYNC_SERVER: joinURL(url, '/sync'),
+        SIGNUP_SERVER: joinURL(url, '/account'),
+        GOCARDLESS_SERVER: joinURL(url, '/gocardless'),
+        SIMPLEFIN_SERVER: joinURL(url, '/simplefin'),
+      };
+    } catch (error) {
+      console.warn(
+        'Unable to parse server URL - using the global config.',
+        { config },
+        error,
+      );
+      return config;
+    }
   }
   return config;
 }

upcoming-release-notes/3343.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [tim-smart]
+---
+
+Fix slow scrolling in mobile modals

upcoming-release-notes/3721.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [youngcw]
+---
+
+Fix template notifications not showing

upcoming-release-notes/3723.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [joel-rich]
+---
+
+Fix issue with Monthly Spending report not properly averaging previous three months

upcoming-release-notes/3725.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [joel-rich]
+---
+
+fix Tag filtering crashing app when tag has regex special character

upcoming-release-notes/3728.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [lelemm]
+---
+
+Fix Distribute button calculates splits one at a time.

upcoming-release-notes/3735.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [carkom]
+---
+
+Fix parse date in DateRange element which is causing the cards to display the wrong dates.

upcoming-release-notes/3736.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [MikesGlitch]
+---
+
+Add extra error handling for when an incorrect server URL has been setup

upcoming-release-notes/3739.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [aappaapp]
+---
+
+Fix "Name" field being in wrong colour in Schedules page

upcoming-release-notes/3749.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [UnderKoen]
+---
+
+Fix usage of date functions in action rule templating.