A local-first personal finance app
Slow improvements to `Account.tsx` (1/many) (#4824)
Julian Dominguez-Schatzd91fd2fb0e8e
diff --git a/packages/desktop-client/src/components/accounts/Account.tsx b/packages/desktop-client/src/components/accounts/Account.tsxindex 36d2a24ce8..689067e791 100644--- a/packages/desktop-client/src/components/accounts/Account.tsx+++ b/packages/desktop-client/src/components/accounts/Account.tsx@@ -9,9 +9,7 @@ import React, {import { Trans } from 'react-i18next';import { Navigate, useParams, useLocation } from 'react-router-dom';-import { Button } from '@actual-app/components/button';import { styles } from '@actual-app/components/styles';-import { Text } from '@actual-app/components/text';import { theme } from '@actual-app/components/theme';import { View } from '@actual-app/components/view';import { debounce } from 'debounce';@@ -91,6 +89,7 @@ import { type SavedFilter } from '../filters/SavedFilterMenuButton';import { TransactionList } from '../transactions/TransactionList';import { validateAccountName } from '../util/accountValidation';+import { AccountEmptyMessage } from './AccountEmptyMessage';import { AccountHeader } from './Header';type ConditionEntity = Partial<RuleConditionEntity> | TransactionFilterEntity;@@ -101,57 +100,6 @@ function isTransactionFilterEntity(return 'id' in filter;}-type EmptyMessageProps = {- onAdd: () => void;-};--function EmptyMessage({ onAdd }: EmptyMessageProps) {- return (- <View- style={{- color: theme.tableText,- backgroundColor: theme.tableBackground,- flex: 1,- alignItems: 'center',- borderTopWidth: 1,- borderColor: theme.tableBorder,- }}- >- <View- style={{- width: 550,- marginTop: 75,- fontSize: 15,- alignItems: 'center',- }}- >- <Text style={{ textAlign: 'center', lineHeight: '1.4em' }}>- <Trans>- For Actual to be useful, you need to <strong>add an account</strong>- . You can link an account to automatically download transactions, or- manage it locally yourself.- </Trans>- </Text>-- <Button- variant="primary"- style={{ marginTop: 20 }}- autoFocus- onPress={onAdd}- >- <Trans>Add account</Trans>- </Button>-- <View- style={{ marginTop: 20, fontSize: 13, color: theme.tableTextLight }}- >- <Trans>In the future, you can add accounts from the sidebar.</Trans>- </View>- </View>- </View>- );-}-type AllTransactionsProps = {account?: AccountEntity | undefined;transactions: TransactionEntity[];@@ -325,7 +273,6 @@ type AccountInternalState = {showCleared?: boolean | undefined;prevShowCleared?: boolean | undefined;showReconciled: boolean;- editingName: boolean;nameError: string;isAdding: boolean;modalShowing?: boolean;@@ -376,7 +323,6 @@ class AccountInternal extends PureComponent<balances: null,showCleared: props.showCleared,showReconciled: props.showReconciled,- editingName: false,nameError: '',isAdding: false,sort: null,@@ -590,7 +536,6 @@ class AccountInternal extends PureComponent<if (this.props.accountId !== nextProps.accountId) {this.setState({- editingName: false,loading: true,search: '',showBalances: nextProps.showBalances,@@ -782,10 +727,6 @@ class AccountInternal extends PureComponent<this.setState({ isAdding: true });};- onExposeName = (flag: boolean) => {- this.setState({ editingName: flag });- };-onSaveName = (name: string) => {const accountNameError = validateAccountName(name,@@ -802,7 +743,7 @@ class AccountInternal extends PureComponent<throw new Error(`Account with ID ${this.props.accountId} not found.`);}this.props.dispatch(updateAccount({ account: { ...account, name } }));- this.setState({ editingName: false, nameError: '' });+ this.setState({ nameError: '' });}};@@ -1738,7 +1679,6 @@ class AccountInternal extends PureComponent<filterId,reconcileAmount,transactionsFiltered,- editingName,showBalances,balances,showCleared,@@ -1788,7 +1728,6 @@ class AccountInternal extends PureComponent<<View style={styles.page}><AccountHeadertableRef={this.table}- editingName={editingName ?? false}isNameEditable={isNameEditable ?? false}workingHard={workingHard ?? false}account={account}@@ -1821,7 +1760,6 @@ class AccountInternal extends PureComponent<onToggleExtraBalances={this.onToggleExtraBalances}onSaveName={this.onSaveName}saveNameError={this.state.nameError}- onExposeName={this.onExposeName}onReconcile={this.onReconcile}onDoneReconciling={this.onDoneReconciling}onCreateReconciliationTransaction={@@ -1881,7 +1819,7 @@ class AccountInternal extends PureComponent<hideFraction={hideFraction}renderEmpty={() =>showEmptyMessage ? (- <EmptyMessage+ <AccountEmptyMessageonAdd={() =>this.props.dispatch(replaceModal({diff --git a/packages/desktop-client/src/components/accounts/AccountEmptyMessage.tsx b/packages/desktop-client/src/components/accounts/AccountEmptyMessage.tsxnew file mode 100644index 0000000000..5faa7a128c--- /dev/null+++ b/packages/desktop-client/src/components/accounts/AccountEmptyMessage.tsx@@ -0,0 +1,57 @@+import { Trans } from 'react-i18next';++import { Button } from '@actual-app/components/button';+import { Text } from '@actual-app/components/text';+import { theme } from '@actual-app/components/theme';+import { View } from '@actual-app/components/view';++type AccountEmptyMessageProps = {+ onAdd: () => void;+};++export function AccountEmptyMessage({ onAdd }: AccountEmptyMessageProps) {+ return (+ <View+ style={{+ color: theme.tableText,+ backgroundColor: theme.tableBackground,+ flex: 1,+ alignItems: 'center',+ borderTopWidth: 1,+ borderColor: theme.tableBorder,+ }}+ >+ <View+ style={{+ width: 550,+ marginTop: 75,+ fontSize: 15,+ alignItems: 'center',+ }}+ >+ <Text style={{ textAlign: 'center', lineHeight: '1.4em' }}>+ <Trans>+ For Actual to be useful, you need to <strong>add an account</strong>+ . You can link an account to automatically download transactions, or+ manage it locally yourself.+ </Trans>+ </Text>++ <Button+ variant="primary"+ style={{ marginTop: 20 }}+ autoFocus+ onPress={onAdd}+ >+ <Trans>Add account</Trans>+ </Button>++ <View+ style={{ marginTop: 20, fontSize: 13, color: theme.tableTextLight }}+ >+ <Trans>In the future, you can add accounts from the sidebar.</Trans>+ </View>+ </View>+ </View>+ );+}diff --git a/packages/desktop-client/src/components/accounts/Header.tsx b/packages/desktop-client/src/components/accounts/Header.tsxindex 7988dac4e2..3a17e4d9b3 100644--- a/packages/desktop-client/src/components/accounts/Header.tsx+++ b/packages/desktop-client/src/components/accounts/Header.tsx@@ -58,7 +58,6 @@ import { ReconcilingMessage, ReconcileMenu } from './Reconcile';type AccountHeaderProps = {tableRef: TableRef;- editingName: boolean;isNameEditable: boolean;workingHard: boolean;accountName: string;@@ -97,7 +96,6 @@ type AccountHeaderProps = {>['onToggleExtraBalances'];onSaveName: AccountNameFieldProps['onSaveName'];saveNameError: AccountNameFieldProps['saveNameError'];- onExposeName: (isExposed: boolean) => void;onSync: () => void;onImport: () => void;onMenuSelect: AccountMenuProps['onMenuSelect'];@@ -135,7 +133,6 @@ type AccountHeaderProps = {export function AccountHeader({tableRef,- editingName,isNameEditable,workingHard,accountName,@@ -168,7 +165,6 @@ export function AccountHeader({onToggleExtraBalances,onSaveName,saveNameError,- onExposeName,onSync,onImport,onMenuSelect,@@ -291,10 +287,8 @@ export function AccountHeader({account={account}accountName={accountName}isNameEditable={isNameEditable}- editingName={editingName}saveNameError={saveNameError}onSaveName={onSaveName}- onExposeName={onExposeName}/></View></View>@@ -582,22 +576,24 @@ type AccountNameFieldProps = {account?: AccountEntity;accountName: string;isNameEditable: boolean;- editingName: boolean;saveNameError?: ReactNode;onSaveName: (newName: string) => void;- onExposeName: (isExposed: boolean) => void;};function AccountNameField({account,accountName,isNameEditable,- editingName,saveNameError,onSaveName,- onExposeName,}: AccountNameFieldProps) {const { t } = useTranslation();+ const [editingName, setEditingName] = useState(false);++ const handleSave = (newName: string) => {+ onSaveName(newName);+ setEditingName(false);+ };if (editingName) {return (@@ -605,9 +601,9 @@ function AccountNameField({<InitialFocus><InputdefaultValue={accountName}- onEnter={e => onSaveName(e.currentTarget.value)}- onBlur={e => onSaveName(e.target.value)}- onEscape={() => onExposeName(false)}+ onEnter={e => handleSave(e.currentTarget.value)}+ onBlur={e => handleSave(e.target.value)}+ onEscape={() => setEditingName(false)}style={{fontSize: 25,fontWeight: 500,@@ -666,7 +662,7 @@ function AccountNameField({variant="bare"aria-label={t('Edit account name')}className="hover-visible"- onPress={() => onExposeName(true)}+ onPress={() => setEditingName(true)}><SvgPencil1style={{diff --git a/upcoming-release-notes/4824.md b/upcoming-release-notes/4824.mdnew file mode 100644index 0000000000..1e56b14f44--- /dev/null+++ b/upcoming-release-notes/4824.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [jfdoming]+---++Slow improvements to Account.tsx (1/many)