Merge remote-tracking branch 'origin/master' into enhancement/context…

…_menu # Conflicts: # packages/desktop-client/src/components/payees/PayeeTable.tsx
actualbudget · Nov 3, 2024 · a0502ef · a0502ef
2 parents 16367fb + 6666014
commit a0502ef
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 49 deletions.
diff --git a/packages/desktop-client/src/components/payees/PayeeTable.tsx b/packages/desktop-client/src/components/payees/PayeeTable.tsx
@@ -12,7 +12,7 @@ import { type PayeeEntity } from 'loot-core/src/types/models';
 
 import { useSelectedItems } from '../../hooks/useSelected';
 import { View } from '../common/View';
-import { Table } from '../table';
+import { useTableNavigator, Table } from '../table';
 
 import { PayeeTableRow } from './PayeeTableRow';
 
@@ -33,15 +33,7 @@ export const PayeeTable = forwardRef<
   PayeeTableProps
 >(
   (
-    {
-      payees,
-      ruleCounts,
-
-      onUpdate,
-      onDelete,
-      onViewRules,
-      onCreateRule,
-    },
+    { payees, ruleCounts, onUpdate, onDelete, onViewRules, onCreateRule },
     ref,
   ) => {
     const [hovered, setHovered] = useState(null);
@@ -58,9 +50,16 @@ export const PayeeTable = forwardRef<
       setHovered(id);
     }, []);
 
+    const tableNavigator = useTableNavigator(payees, item =>
+      item.transfer_acct == null
+        ? ['select', 'name', 'rule-count']
+        : ['rule-count'],
+    );
+
     return (
       <View style={{ flex: 1 }} onMouseLeave={() => setHovered(null)}>
         <Table
+          navigator={tableNavigator}
           ref={ref}
           items={payees}
           renderItem={({ item, editing, focusedField, onEdit }) => {

diff --git a/packages/desktop-client/src/components/payees/PayeeTableRow.tsx b/packages/desktop-client/src/components/payees/PayeeTableRow.tsx
@@ -197,6 +197,9 @@ export const PayeeTableRow = memo(
           focused={focusedField === 'select'}
           selected={selected}
           onSelect={e => {
+            if (payee.transfer_acct != null) {
+              return;
+            }
             dispatchSelected({
               type: 'select',
               id: payee.id,

diff --git a/packages/loot-core/init-node.js b/packages/loot-core/init-node.js
diff --git a/upcoming-release-notes/3756.md b/upcoming-release-notes/3756.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MikesGlitch]
+---
+
+Remove unneeded node test file
diff --git a/upcoming-release-notes/3768.md b/upcoming-release-notes/3768.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [jfdoming]
+---
+
+Fix bugs on payee management page