From b131879d309e705a4c2370149d320ce0bef719ae Mon Sep 17 00:00:00 2001 From: Trevor Farlow <trevdor@users.noreply.github.com> Date: Fri, 30 Dec 2022 11:14:54 -0700 Subject: [PATCH] fixup! Schedules editor: exclude closed accounts in Account autocomplete --- .../desktop-client/src/components/accounts/TransactionsTable.js | 1 - .../desktop-client/src/components/schedules/EditSchedule.js | 1 + packages/desktop-client/src/components/util/GenericInput.js | 1 - packages/loot-design/src/components/AccountAutocomplete.js | 2 +- packages/loot-design/src/components/modals/EditField.js | 1 - 5 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/desktop-client/src/components/accounts/TransactionsTable.js b/packages/desktop-client/src/components/accounts/TransactionsTable.js index ba9599821..2d25cbe84 100644 --- a/packages/desktop-client/src/components/accounts/TransactionsTable.js +++ b/packages/desktop-client/src/components/accounts/TransactionsTable.js @@ -762,7 +762,6 @@ export const Transaction = React.memo(function Transaction(props) { <AccountAutocomplete value={accountId} accounts={accounts} - includeClosedAccounts shouldSaveFromKey={shouldSaveFromKey} tableBehavior={true} focused={true} diff --git a/packages/desktop-client/src/components/schedules/EditSchedule.js b/packages/desktop-client/src/components/schedules/EditSchedule.js index 343322222..e8fcb19c4 100644 --- a/packages/desktop-client/src/components/schedules/EditSchedule.js +++ b/packages/desktop-client/src/components/schedules/EditSchedule.js @@ -442,6 +442,7 @@ export default function ScheduleDetails() { <FormField style={{ flex: 1 }}> <FormLabel title="Account" /> <AccountAutocomplete + includeClosedAccounts={false} value={state.fields.account} inputProps={{ placeholder: '(none)' }} onSelect={id => diff --git a/packages/desktop-client/src/components/util/GenericInput.js b/packages/desktop-client/src/components/util/GenericInput.js index 4813dd8a4..8d8c6aeaf 100644 --- a/packages/desktop-client/src/components/util/GenericInput.js +++ b/packages/desktop-client/src/components/util/GenericInput.js @@ -66,7 +66,6 @@ export default function GenericInput({ content = ( <AccountAutocomplete accounts={accounts} - includeClosedAccounts value={value} multi={multi} openOnFocus={false} diff --git a/packages/loot-design/src/components/AccountAutocomplete.js b/packages/loot-design/src/components/AccountAutocomplete.js index 7b2acadd3..e0e43e4d4 100644 --- a/packages/loot-design/src/components/AccountAutocomplete.js +++ b/packages/loot-design/src/components/AccountAutocomplete.js @@ -68,7 +68,7 @@ export function AccountList({ export default function AccountAutocomplete({ embedded, - includeClosedAccounts = false, + includeClosedAccounts = true, ...props }) { let accounts = useCachedAccounts() || []; diff --git a/packages/loot-design/src/components/modals/EditField.js b/packages/loot-design/src/components/modals/EditField.js index a9c2208c5..9b0277d68 100644 --- a/packages/loot-design/src/components/modals/EditField.js +++ b/packages/loot-design/src/components/modals/EditField.js @@ -72,7 +72,6 @@ function EditField({ <AccountAutocomplete value={null} accounts={accounts} - includeClosedAccounts focused={true} embedded={true} onSelect={value => { -- GitLab