Skip to content

Commit

Permalink
Merge branch 'master' into jfdoming/reload-on-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jfdoming authored Nov 3, 2024
2 parents b202c3f + 1c05d7e commit 63fc5b5
Show file tree
Hide file tree
Showing 82 changed files with 14 additions and 498 deletions.
2 changes: 1 addition & 1 deletion packages/api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@actual-app/api",
"version": "24.10.1",
"version": "24.11.0",
"license": "MIT",
"description": "An API for Actual",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@actual-app/web",
"version": "24.10.1",
"version": "24.11.0",
"license": "MIT",
"files": [
"build"
Expand Down
9 changes: 8 additions & 1 deletion packages/desktop-client/src/components/payees/PayeeTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -46,9 +46,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 }) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ export const PayeeTableRow = memo(
focused={focusedField === 'select'}
selected={selected}
onSelect={e => {
if (payee.transfer_acct != null) {
return;
}
dispatchSelected({
type: 'select',
id: payee.id,
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop-electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"author": "Actual",
"productName": "Actual",
"description": "A simple and powerful personal finance system",
"version": "24.10.1",
"version": "24.11.0",
"scripts": {
"clean": "rm -rf dist",
"update-client": "bin/update-client",
Expand Down
39 changes: 0 additions & 39 deletions packages/loot-core/init-node.js

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3305.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3310.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3343.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3365.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3444.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3471.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3499.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3506.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3507.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3511.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3527.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3543.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3549.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3552.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3553.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3554.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3570.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3572.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3576.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3577.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3580.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3584.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3587.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3588.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3594.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3598.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3599.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3600.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3601.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3602.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3603.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3605.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3607.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3609.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3611.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3613.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3615.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3617.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3619.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3622.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3623.md

This file was deleted.

6 changes: 0 additions & 6 deletions upcoming-release-notes/3624.md

This file was deleted.

Loading

0 comments on commit 63fc5b5

Please sign in to comment.