Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

♻️ (typescript) convert CategoryTransactions.jsx to .tsx #3875

Closed
wants to merge 7 commits into from
Closed

♻️ (typescript) convert CategoryTransactions.jsx to .tsx #3875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e2ad98
convert CategoryTransactions.jsx to .tsx
cindywu Nov 22, 2024
11eb241
adds release notes
cindywu Nov 22, 2024
add0a67
fixes linting error
cindywu Nov 22, 2024
fe47e51
simplify
cindywu Nov 22, 2024
ac41690
types
cindywu Nov 23, 2024
9024f36
make onRefresh optional
cindywu Nov 23, 2024
dc65fa2
Merge branch 'master' into cindywu/refactor-categorytransactions-jsx
cindywu Nov 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions ...ts/mobile/budget/CategoryTransactions.jsx → ...ts/mobile/budget/CategoryTransactions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ import { listen } from 'loot-core/platform/client/fetch';
import * as monthUtils from 'loot-core/shared/months';
import { q } from 'loot-core/shared/query';
import { isPreviewId } from 'loot-core/shared/transactions';
import {
type TransactionEntity,
type CategoryEntity,
} from 'loot-core/src/types/models';

import { useDateFormat } from '../../../hooks/useDateFormat';
import { useNavigate } from '../../../hooks/useNavigate';
Expand All @@ -21,15 +25,23 @@ import { MobileBackButton } from '../MobileBackButton';
import { AddTransactionButton } from '../transactions/AddTransactionButton';
import { TransactionListWithBalances } from '../transactions/TransactionListWithBalances';

export function CategoryTransactions({ category, month }) {
type CategoryTransactionsProps = {
category: CategoryEntity;
month: string;
};

export function CategoryTransactions({
category,
month,
}: CategoryTransactionsProps) {
const dispatch = useDispatch();
const navigate = useNavigate();

const baseTransactionsQuery = useCallback(
() =>
q('transactions')
.options({ splits: 'inline' })
.filter(getCategoryMonthFilter(category, month))
.filter(getCategoryMonthFilter({ category, month }))
.select('*'),
[category, month],
);
Expand Down Expand Up @@ -73,7 +85,7 @@ export function CategoryTransactions({ category, month }) {
});

const onOpenTransaction = useCallback(
transaction => {
(transaction: TransactionEntity) => {
// details of how the native app used to handle preview transactions here can be found at commit 05e58279
if (!isPreviewId(transaction.id)) {
navigate(`/transactions/${transaction.id}`);
Expand Down Expand Up @@ -119,7 +131,13 @@ export function CategoryTransactions({ category, month }) {
);
}

function getCategoryMonthFilter(category, month) {
function getCategoryMonthFilter({
category,
month,
}: {
category: CategoryEntity;
month: string;
}) {
return {
category: category.id,
date: { $transform: '$month', $eq: month },
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop-client/src/components/mobile/transactions/TransactionListWithBalances.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export function TransactionListWithBalances({
onSearch,
onLoadMore,
onOpenTransaction,
onRefresh,
onRefresh = () => {},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be undefined as default because there's logic below which checks for this prop. Setting an empty function will introduce a regression.

}) {
const selectedInst = useSelected('transactions', transactions);

Expand Down
6 changes: 6 additions & 0 deletions upcoming-release-notes/3875.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
category: Maintenance
authors: [cindywu]
---

Convert CategoryTransactions.jsx to tsx
Loading