Add Model clear, and link transactions automatically

actualbudget · Jan 17, 2024 · 3e17d1f · 3e17d1f
1 parent 2e937ec
commit 3e17d1f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/packages/desktop-client/src/components/schedules/ScheduleLink.tsx b/packages/desktop-client/src/components/schedules/ScheduleLink.tsx
@@ -31,8 +31,8 @@ export function ScheduleLink({
   actions: BoundActions;
   modalProps?: CommonModalProps;
   transactionIds: string[];
-  getTransaction: (a: string) => TransactionEntity;
-  pushModal: (a: string, b: ModalParams) => void;
+  getTransaction: (tranID: string) => TransactionEntity;
+  pushModal: (name: string, params: ModalParams) => void;
 }) {
   const [filter, setFilter] = useState('');
 
@@ -56,11 +56,10 @@ export function ScheduleLink({
     actions.popModal();
   }
   async function onCreate() {
-    const firstId1 = [...ids][0];
     actions.popModal();
     pushModal('schedule-edit', {
       id: null,
-      transaction: getTransaction(firstId1),
+      transaction: getTransaction(ids[0]),
     });
   }
 

diff --git a/packages/desktop-client/src/components/transactions/SelectedTransactions.jsx b/packages/desktop-client/src/components/transactions/SelectedTransactions.jsx
@@ -135,8 +135,8 @@ export function SelectedTransactionsButton({
           case 'link-schedule':
             pushModal('schedule-link', {
               transactionIds: [...selectedItems],
-              getTransaction : getTransaction,
-              pushModal: pushModal,
+              getTransaction,
+              pushModal,
             });
             break;
           case 'unlink-schedule':

diff --git a/packages/desktop-client/src/components/transactions/SimpleTransactionsTable.jsx b/packages/desktop-client/src/components/transactions/SimpleTransactionsTable.jsx
@@ -1,4 +1,4 @@
-import React, { memo, useCallback, useMemo } from 'react';
+import React, { memo, useCallback, useEffect, useMemo } from 'react';
 import { useSelector } from 'react-redux';
 
 import {
@@ -156,11 +156,19 @@ export function SimpleTransactionsTable({
     transactions = transactions.map(trans =>
       serializeTransaction(trans, dateFormat),
     );
-    const selected = transactions.filter(x => x.selected).map(x => x.id);
-    selected.forEach(x => dispatchSelected({ type: 'select', id: x }));
     return transactions;
   }, [transactions]);
 
+  useEffect(() => {
+    const selected = transactions.filter(x => x.selected).map(x => x.id);
+    //Type Select will toggle the record
+    //On init this class is called twice,(due to the memoization
+    //So we check if it is selected before we dispatch.
+    selected.forEach(
+      x => !selectedItems.has(x) && dispatchSelected({ type: 'select', id: x }),
+    );
+  }, [transactions]);
+
   const renderItem = useCallback(
     ({ item }) => {
       return (