Merge branch 'master' into pluggy.ai

packages/desktop-client/src/components/banksync/AccountsList.tsx

@@ -24,7 +24,11 @@ export function AccountsList({
   }
 
   return (
-    <View>
+    <View
+      style={{
+        minHeight: 'initial',
+      }}
+    >
       {accounts.map(account => {
         const hovered = hoveredAccount === account.id;
 

packages/desktop-client/src/components/banksync/index.tsx

@@ -116,7 +116,7 @@ export function BankSync() {
         )}
         {Object.entries(groupedAccounts).map(([syncProvider, accounts]) => {
           return (
-            <View key={syncProvider}>
+            <View key={syncProvider} style={{ minHeight: 'initial' }}>
               {Object.keys(groupedAccounts).length > 1 && (
                 <Text
                   style={{ fontWeight: 500, fontSize: 20, margin: '.5em 0' }}

packages/desktop-client/src/components/mobile/budget/index.tsx

@@ -159,7 +159,7 @@ export function Budget() {
         );
       } else {
         dispatch(collapseModals('category-group-menu'));
-        dispatch(deleteGroup(groupId));
+        dispatch(deleteGroup({ id: groupId }));
       }
     },
     [categoryGroups, dispatch],

packages/desktop-client/src/components/modals/CreateAccountModal.tsx

@@ -394,11 +394,9 @@ export function CreateAccountModal({ upgradingAccountId }: CreateAccountProps) {
                           <strong>
                             Link a <em>European</em> bank account
                           </strong>{' '}
-                          to automatically download transactions.
-                        </Trans>
-                        <Trans>
-                          GoCardless provides reliable, up-to-date information
-                          from hundreds of banks.
+                          to automatically download transactions. GoCardless
+                          provides reliable, up-to-date information from
+                          hundreds of banks.
                         </Trans>
                       </Text>
                       <View
@@ -459,11 +457,9 @@ export function CreateAccountModal({ upgradingAccountId }: CreateAccountProps) {
                           <strong>
                             Link a <em>North American</em> bank account
                           </strong>{' '}
-                          to automatically download transactions.
-                        </Trans>
-                        <Trans>
-                          SimpleFIN provides reliable, up-to-date information
-                          from hundreds of banks.
+                          to automatically download transactions. SimpleFIN
+                          provides reliable, up-to-date information from
+                          hundreds of banks.
                         </Trans>
                       </Text>
                       {isPluggyAiEnabled && (

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

@@ -220,7 +220,7 @@ export function TransactionList({
 
   const onManagePayees = useCallback(
     id => {
-      navigate('/payees', { state: { selectedPayee: id } });
+      navigate('/payees', id && { state: { selectedPayee: id } });
     },
     [navigate],
   );

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

@@ -1861,6 +1861,7 @@ function TransactionTableInner({
       : trans.error;
 
     const hasSplitError =
+      (trans.is_parent || trans.is_child) &&
       (!expanded || isLastChild(transactions, index)) &&
       error &&
       error.type === 'SplitTransactionError';

packages/loot-core/src/client/data-hooks/transactions.ts

@@ -317,6 +317,7 @@ export function useTransactionsSearch({
           resetQuery();
           setIsSearching(false);
         } else if (searchText) {
+          resetQuery();
           updateQuery(previousQuery =>
             queries.transactionsSearch(previousQuery, searchText, dateFormat),
           );

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

@@ -744,13 +744,13 @@ type SyncResponse = {
   updatedAccounts: Array<AccountEntity['id']>;
 };
 
-function handleSyncResponse(
+async function handleSyncResponse(
   res: {
     added: Array<TransactionEntity['id']>;
     updated: Array<TransactionEntity['id']>;
   },
   acct: db.DbAccount,
-): SyncResponse {
+): Promise<SyncResponse> {
   const { added, updated } = res;
   const newTransactions: Array<TransactionEntity['id']> = [];
   const matchedTransactions: Array<TransactionEntity['id']> = [];
@@ -763,6 +763,9 @@ function handleSyncResponse(
     updatedAccounts.push(acct.id);
   }
 
+  const ts = new Date().getTime().toString();
+  await db.update('accounts', { id: acct.id, last_sync: ts });
+
   return {
     newTransactions,
     matchedTransactions,
@@ -861,7 +864,7 @@ async function accountsBankSync({
           acct.bankId,
         );
 
-        const syncResponseData = handleSyncResponse(syncResponse, acct);
+        const syncResponseData = await handleSyncResponse(syncResponse, acct);
 
         newTransactions.push(...syncResponseData.newTransactions);
         matchedTransactions.push(...syncResponseData.matchedTransactions);
@@ -964,7 +967,10 @@ async function simpleFinBatchSync({
           ),
         );
       } else {
-        const syncResponseData = handleSyncResponse(syncResponse.res, account);
+        const syncResponseData = await handleSyncResponse(
+          syncResponse.res,
+          account,
+        );
 
         newTransactions.push(...syncResponseData.newTransactions);
         matchedTransactions.push(...syncResponseData.matchedTransactions);

packages/loot-core/src/server/budget/cleanup-template.ts

@@ -284,7 +284,7 @@ async function processCleanup(month: string): Promise<Notification> {
   }
 
   const budgetAvailable = await getSheetValue(sheetName, `to-budget`);
-  if (budgetAvailable <= 0) {
+  if (budgetAvailable < 0) {
     warnings.push('Global: No funds are available to reallocate.');
   }
 
@@ -351,6 +351,11 @@ async function processCleanup(month: string): Promise<Notification> {
         message: 'Global: Funds not available:',
         pre: warnings.join('\n\n'),
       };
+    } else if (budgetAvailable === 0) {
+      return {
+        type: 'message',
+        message: 'All categories were up to date.',
+      };
     } else {
       return {
         type: 'message',

packages/loot-core/src/shared/transactions.test.ts

@@ -206,4 +206,23 @@ describe('Transactions', () => {
       expect.objectContaining({ amount: 3002 }),
     ]);
   });
+
+  test('deleting all child split transactions works', () => {
+    const transactions = [
+      makeTransaction({ amount: 2001 }),
+      ...makeSplitTransaction(
+        { id: 't1', amount: 2500, error: splitError(500) },
+        [{ id: 't2', amount: 2000 }],
+      ),
+      makeTransaction({ amount: 3002 }),
+    ];
+    const { data } = deleteTransaction(transactions, 't2');
+
+    expect(data).toEqual([
+      expect.objectContaining({ amount: 2001 }),
+      // Must delete error if no children
+      expect.objectContaining({ amount: 2500, error: null }),
+      expect.objectContaining({ amount: 3002 }),
+    ]);
+  });
 });

packages/loot-core/src/shared/transactions.ts

@@ -282,10 +282,11 @@ export function deleteTransaction(
       if (trans.id === id) {
         return null;
       } else if (trans.subtransactions?.length === 1) {
-        const { error, subtransactions, ...rest } = trans;
+        const { subtransactions, ...rest } = trans;
         return {
           ...rest,
           is_parent: false,
+          error: null,
         } satisfies TransactionEntity;
       } else {
         const sub = trans.subtransactions?.filter(t => t.id !== id);

upcoming-release-notes/4458.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [matt-fidd]
+---
+
+Fix row spacing on bank sync page

upcoming-release-notes/4461.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [alecbakholdin]
+---
+
+Fixed bug where partially erasing search string would not reset search and result in incorrect search results.

upcoming-release-notes/4462.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [alecbakholdin]
+---
+
+Fixed bug where navigating to payees page by clicking "manage payees" with an empty payee from a transaction would result in a crash.

upcoming-release-notes/4463.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [jfdoming]
+---
+
+Add missing space in translation for bank sync

upcoming-release-notes/4465.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [jfdoming]
+---
+
+Fix crash when deleting child transactions from an errored split

upcoming-release-notes/4468.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [youngcw]
+---
+
+Remove warning on cleanup templates if budget is already "clean"

upcoming-release-notes/4469.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [matt-fidd]
+---
+
+Fix category group deletion on mobile

upcoming-release-notes/4472.md

@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [matt-fidd]
+---
+
+Add last bank sync tracking back in