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.

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

Convert mobile Accounts.jsx to tsx #3862

Merged
merged 3 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
8 changes: 4 additions & 4 deletions packages/desktop-client/src/components/accounts/Account.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,8 @@ type AccountInternalProps = {
accounts: AccountEntity[];
getPayees: () => Promise<PayeeEntity[]>;
updateAccount: (newAccount: AccountEntity) => void;
newTransactions: string[];
matchedTransactions: string[];
newTransactions: Array<TransactionEntity['id']>;
matchedTransactions: Array<TransactionEntity['id']>;
splitsExpandedDispatch: ReturnType<typeof useSplitsExpanded>['dispatch'];
expandSplits?: boolean;
savedFilters: TransactionFilterEntity[];
Expand Down Expand Up @@ -870,11 +870,11 @@ class AccountInternal extends PureComponent<
return amount;
};

isNew = (id: string) => {
isNew = (id: TransactionEntity['id']) => {
return this.props.newTransactions.includes(id);
};

isMatched = (id: string) => {
isMatched = (id: TransactionEntity['id']) => {
return this.props.matchedTransactions.includes(id);
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import React from 'react';
import React, { type CSSProperties, useCallback } from 'react';
import { useDispatch, useSelector } from 'react-redux';

import { t } from 'i18next';

import { replaceModal, syncAndDownload } from 'loot-core/src/client/actions';
import * as queries from 'loot-core/src/client/queries';
import { type AccountEntity } from 'loot-core/types/models';

import { useAccounts } from '../../../hooks/useAccounts';
import { useFailedAccounts } from '../../../hooks/useFailedAccounts';
Expand All @@ -18,11 +19,22 @@
import { TextOneLine } from '../../common/TextOneLine';
import { View } from '../../common/View';
import { MobilePageHeader, Page } from '../../Page';
import { type Binding, type SheetFields } from '../../spreadsheet';
import { CellValue, CellValueText } from '../../spreadsheet/CellValue';
import { MOBILE_NAV_HEIGHT } from '../MobileNavTabs';
import { PullToRefresh } from '../PullToRefresh';

function AccountHeader({ name, amount, style = {} }) {
type AccountHeaderProps<SheetFieldName extends SheetFields<'account'>> = {
name: string;
amount: Binding<'account', SheetFieldName>;
style?: CSSProperties;
};

function AccountHeader<SheetFieldName extends SheetFields<'account'>>({
name,
amount,
style = {},
}: AccountHeaderProps<SheetFieldName>) {
return (
<View
style={{
Expand All @@ -48,13 +60,26 @@
</View>
<CellValue binding={amount} type="financial">
{props => (
<CellValueText {...props} style={{ ...styles.text, fontSize: 14 }} />
<CellValueText<'account', SheetFieldName>
{...props}
style={{ ...styles.text, fontSize: 14 }}
/>
)}
</CellValue>
</View>
);
}

type AccountCardProps = {
account: AccountEntity;
updated: boolean;
connected: boolean;
pending: boolean;
failed: boolean;
getBalanceQuery: (account: AccountEntity) => Binding<'account', 'balance'>;
onSelect: (id: string) => void;
};

function AccountCard({
account,
updated,
Expand All @@ -63,7 +88,7 @@
failed,
getBalanceQuery,
onSelect,
}) {
}: AccountCardProps) {
return (
<Button
onPress={() => onSelect(account.id)}
Expand All @@ -87,23 +112,23 @@
alignItems: 'center',
}}
>
{account.bankId && (
{/* TODO: Should bankId be part of the AccountEntity type? */ 'bankId' in account && account.bankId ? (

Check warning on line 115 in packages/desktop-client/src/components/mobile/accounts/Accounts.tsx

View workflow job for this annotation

GitHub Actions / lint

Replace `/*·TODO:·Should·bankId·be·part·of·the·AccountEntity·type?·*/·'bankId'·in` with `⏎············/*·TODO:·Should·bankId·be·part·of·the·AccountEntity·type?·*/·'bankId'·in⏎·············`
<View

Check warning on line 116 in packages/desktop-client/src/components/mobile/accounts/Accounts.tsx

View workflow job for this annotation

GitHub Actions / lint

Insert `··`
style={{

Check warning on line 117 in packages/desktop-client/src/components/mobile/accounts/Accounts.tsx

View workflow job for this annotation

GitHub Actions / lint

Insert `··`
backgroundColor: pending

Check warning on line 118 in packages/desktop-client/src/components/mobile/accounts/Accounts.tsx

View workflow job for this annotation

GitHub Actions / lint

Insert `··`
? theme.sidebarItemBackgroundPending

Check warning on line 119 in packages/desktop-client/src/components/mobile/accounts/Accounts.tsx

View workflow job for this annotation

GitHub Actions / lint

Insert `··`
: failed

Check warning on line 120 in packages/desktop-client/src/components/mobile/accounts/Accounts.tsx

View workflow job for this annotation

GitHub Actions / lint

Insert `··`
? theme.sidebarItemBackgroundFailed

Check warning on line 121 in packages/desktop-client/src/components/mobile/accounts/Accounts.tsx

View workflow job for this annotation

GitHub Actions / lint

Insert `··`
: theme.sidebarItemBackgroundPositive,

Check warning on line 122 in packages/desktop-client/src/components/mobile/accounts/Accounts.tsx

View workflow job for this annotation

GitHub Actions / lint

Replace `····················` with `······················`
marginRight: '8px',

Check warning on line 123 in packages/desktop-client/src/components/mobile/accounts/Accounts.tsx

View workflow job for this annotation

GitHub Actions / lint

Insert `··`
width: 8,

Check warning on line 124 in packages/desktop-client/src/components/mobile/accounts/Accounts.tsx

View workflow job for this annotation

GitHub Actions / lint

Replace `················` with `··················`
flexShrink: 0,
height: 8,
borderRadius: 8,
opacity: connected ? 1 : 0,
}}
/>
)}
) : null}
<TextOneLine
style={{
...styles.text,
Expand All @@ -124,7 +149,6 @@
{...props}
style={{
fontSize: 16,
color: 'inherit',
...makeAmountFullStyle(props.value),
}}
data-testid="account-balance"
Expand All @@ -147,6 +171,17 @@
);
}

type AccountListProps = {
accounts: AccountEntity[];
updatedAccounts: Array<AccountEntity['id']>;
getBalanceQuery: (account: AccountEntity) => Binding<'account', 'balance'>;
getOnBudgetBalance: () => Binding<'account', 'budgeted-accounts-balance'>;
getOffBudgetBalance: () => Binding<'account', 'offbudget-accounts-balance'>;
onAddAccount: () => void;
onSelectAccount: (id: string) => void;
onSync: () => Promise<void>;
};

function AccountList({
accounts,
updatedAccounts,
Expand All @@ -156,7 +191,7 @@
onAddAccount,
onSelectAccount,
onSync,
}) {
}: AccountListProps) {
const failedAccounts = useFailedAccounts();
const syncingAccountIds = useSelector(state => state.account.accountsSyncing);
const budgetedAccounts = accounts.filter(account => account.offbudget === 0);
Expand Down Expand Up @@ -238,17 +273,20 @@

const navigate = useNavigate();

const onSelectAccount = id => {
navigate(`/accounts/${id}`);
};
const onSelectAccount = useCallback(
(id: AccountEntity['id']) => {
navigate(`/accounts/${id}`);
},
[navigate],
);

const onAddAccount = () => {
const onAddAccount = useCallback(() => {
dispatch(replaceModal('add-account'));
};
}, [dispatch]);

const onSync = () => {
const onSync = useCallback(async () => {
dispatch(syncAndDownload());
};
}, [dispatch]);

return (
<View style={{ flex: 1 }}>
Expand Down
1 change: 0 additions & 1 deletion packages/loot-core/src/client/reducers/queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ const initialState: QueriesState = {
commonPayeesLoaded: false,
payees: [],
payeesLoaded: false,
earliestTransaction: null,
};

export function update(state = initialState, action: Action): QueriesState {
Expand Down
19 changes: 9 additions & 10 deletions packages/loot-core/src/client/state-types/queries.d.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import type { Handlers } from '../../types/handlers';
import { type AccountEntity } from '../../types/models';
import { type TransactionEntity, type AccountEntity } from '../../types/models';
import type * as constants from '../constants';

export type QueriesState = {
newTransactions: string[];
matchedTransactions: string[];
lastTransaction: unknown | null;
updatedAccounts: string[];
newTransactions: Array<TransactionEntity['id']>;
matchedTransactions: Array<TransactionEntity['id']>;
lastTransaction: TransactionEntity | null;
updatedAccounts: Array<AccountEntity['id']>;
accounts: AccountEntity[];
accountsLoaded: boolean;
categories: Awaited<ReturnType<Handlers['get-categories']>>;
Expand All @@ -15,14 +15,13 @@ export type QueriesState = {
commonPayees: Awaited<ReturnType<Handlers['common-payees-get']>>;
payees: Awaited<ReturnType<Handlers['payees-get']>>;
payeesLoaded: boolean;
earliestTransaction: unknown | null;
};

type SetNewTransactionsAction = {
type: typeof constants.SET_NEW_TRANSACTIONS;
newTransactions?: string[];
matchedTransactions?: string[];
updatedAccounts?: string[];
newTransactions?: Array<TransactionEntity['id']>;
matchedTransactions?: Array<TransactionEntity['id']>;
updatedAccounts?: Array<AccountEntity['id']>;
};

type UpdateNewTransactionsAction = {
Expand All @@ -32,7 +31,7 @@ type UpdateNewTransactionsAction = {

type SetLastTransactionAction = {
type: typeof constants.SET_LAST_TRANSACTION;
transaction: unknown;
transaction: TransactionEntity;
};

type MarkAccountReadAction = {
Expand Down
6 changes: 6 additions & 0 deletions upcoming-release-notes/3862.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
category: Maintenance
authors: [joel-jeremy]
---

Convert mobile Accounts.jsx to Typescript.
Loading