A local-first personal finance app
Updated account ordering in the account autocomplete popup (#1034)
Jack4ecb58cd5c5d
diff --git a/packages/desktop-client/src/components/accounts/TransactionsTable.js b/packages/desktop-client/src/components/accounts/TransactionsTable.jsindex 76fe8dde03..3bf1914432 100644--- a/packages/desktop-client/src/components/accounts/TransactionsTable.js+++ b/packages/desktop-client/src/components/accounts/TransactionsTable.js@@ -771,6 +771,7 @@ export const Transaction = memo(function Transaction(props) {inputStyle,}) => (<AccountAutocomplete+ includeClosedAccounts={false}value={accountId}accounts={accounts}shouldSaveFromKey={shouldSaveFromKey}diff --git a/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.js b/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.jsindex 067718e58a..d03ae01488 100644--- a/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.js+++ b/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.js@@ -25,9 +25,18 @@ export function AccountList({>{items.map((item, idx) => {const showGroup = lastItem- ? item.offbudget !== lastItem.offbudget+ ? (item.offbudget !== lastItem.offbudget && !item.closed) ||+ (item.closed !== lastItem.closed && !item.offbudget): true;- const group = item.offbudget ? 'Off Budget' : 'For Budget';++ const group = `${+ item.closed+ ? 'Closed Accounts'+ : item.offbudget+ ? 'Off Budget'+ : 'For Budget'+ }`;+lastItem = item;return [@@ -74,16 +83,26 @@ export default function AccountAutocomplete({}) {let accounts = useCachedAccounts() || [];+ //remove closed accounts if needed+ //then sort by closed, then offbudget+ accounts = accounts+ .filter(item => {+ return includeClosedAccounts ? item : !item.closed;+ })+ .sort((a, b) => {+ if (a.closed === b.closed) {+ return a.offbudget === b.offbudget ? 0 : a.offbudget ? 1 : -1;+ } else {+ return a.closed ? 1 : -1;+ }+ });+return (<Autocompletestrict={true}highlightFirst={true}embedded={embedded}- suggestions={- includeClosedAccounts- ? accounts- : accounts.filter(a => a.closed === false)- }+ suggestions={accounts}renderItems={(items, getItemProps, highlightedIndex) => (<AccountListitems={items}diff --git a/upcoming-release-notes/1034.md b/upcoming-release-notes/1034.mdnew file mode 100644index 0000000000..f08d9910e6--- /dev/null+++ b/upcoming-release-notes/1034.md@@ -0,0 +1,6 @@+---+category: Enhancements+authors: [Miodec]+---++Updated account order inside the account autocomplete popup to: On Budget, Off Budget, Closed Accounts. Removed closed accounts from suggestions when creating a new transaction.