A local-first personal finance app
[Maintenance] Remove usage of a raw variable in PayeeAutocomplete component (#5687)
Joel Jeremy Marquezbbf91ccbcac5
diff --git a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsxindex 54b8f76539..a387862f6f 100644--- a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx+++ b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx@@ -166,20 +166,44 @@ function PayeeList({}: PayeeListProps) {const { t } = useTranslation();- let createNew = null;- items = [...items];-// If the "new payee" item exists, create it as a special-cased item// with the value of the input so it always shows whatever the user// entered- if (items[0].id === 'new') {- const [first, ...rest] = items;- createNew = first;- items = rest;- }- const offset = createNew ? 1 : 0;- let lastType = null;+ const { newPayee, suggestedPayees, payees, transferPayees } = useMemo(() => {+ return items.reduce(+ (acc, item, index) => {+ if (item.id === 'new') {+ acc.newPayee = { ...item, highlightedIndex: index };+ } else if (item.itemType === 'common_payee') {+ acc.suggestedPayees.push({ ...item, highlightedIndex: index });+ } else if (item.itemType === 'payee') {+ acc.payees.push({ ...item, highlightedIndex: index });+ } else if (item.itemType === 'account') {+ acc.transferPayees.push({ ...item, highlightedIndex: index });+ }+ return acc;+ },+ {+ newPayee: null as PayeeAutocompleteItem & {+ highlightedIndex: number;+ },+ suggestedPayees: [] as Array<+ PayeeAutocompleteItem & { highlightedIndex: number }+ >,+ payees: [] as Array<+ PayeeAutocompleteItem & { highlightedIndex: number }+ >,+ transferPayees: [] as Array<+ PayeeAutocompleteItem & { highlightedIndex: number }+ >,+ },+ );+ }, [items]);++ // We limit the number of payees shown to 100.+ // So we show a hint that more are available via search.+ const showSearchForMore = items.length > 100;return (<View>@@ -190,60 +214,65 @@ function PayeeList({...(!embedded && { maxHeight: 175 }),}}>- {createNew &&+ {newPayee &&renderCreatePayeeButton({- ...(getItemProps ? getItemProps({ item: createNew }) : null),+ ...(getItemProps ? getItemProps({ item: newPayee }) : {}),payeeName: inputValue,highlighted: highlightedIndex === 0,embedded,})}- {items.map((item, idx) => {- const itemType = item.itemType;- let title;-- if (itemType === 'common_payee' && lastType !== itemType) {- title = t('Suggested Payees');- } else if (itemType === 'payee' && lastType !== itemType) {- title = t('Payees');- } else if (itemType === 'account' && lastType !== itemType) {- title = t('Transfer To/From');- }- const showMoreMessage =- idx === items.length - 1 && items.length > 100;- lastType = itemType;-- return (- <Fragment key={item.id}>- {title && (- <Fragment key={`title-${idx}`}>- {renderPayeeItemGroupHeader({ title })}- </Fragment>- )}- <Fragment key={item.id}>- {renderPayeeItem({- ...(getItemProps ? getItemProps({ item }) : null),- item,- highlighted: highlightedIndex === idx + offset,- embedded,- })}- </Fragment>-- {showMoreMessage && (- <div- style={{- fontSize: 11,- padding: 5,- color: theme.pageTextLight,- textAlign: 'center',- }}- >- <Trans>More payees are available, search to find them</Trans>- </div>- )}- </Fragment>- );- })}+ {suggestedPayees.length > 0 &&+ renderPayeeItemGroupHeader({ title: t('Suggested Payees') })}+ {suggestedPayees.map(item => (+ <Fragment key={item.id}>+ {renderPayeeItem({+ ...(getItemProps ? getItemProps({ item }) : {}),+ item,+ highlighted: highlightedIndex === item.highlightedIndex,+ embedded,+ })}+ </Fragment>+ ))}++ {payees.length > 0 &&+ renderPayeeItemGroupHeader({ title: t('Payees') })}+ {payees.map(item => (+ <Fragment key={item.id}>+ {renderPayeeItem({+ ...(getItemProps ? getItemProps({ item }) : {}),+ item,+ highlighted: highlightedIndex === item.highlightedIndex,+ embedded,+ })}+ </Fragment>+ ))}++ {transferPayees.length > 0 &&+ renderPayeeItemGroupHeader({ title: t('Transfer To/From') })}+ {transferPayees.map(item => (+ <Fragment key={item.id}>+ {renderPayeeItem({+ ...(getItemProps ? getItemProps({ item }) : {}),+ item,+ highlighted: highlightedIndex === item.highlightedIndex,+ embedded,+ })}+ </Fragment>+ ))}++ {showSearchForMore && (+ <div+ style={{+ fontSize: 11,+ padding: 5,+ color: theme.pageTextLight,+ textAlign: 'center',+ }}+ >+ <Trans>More payees are available, search to find them</Trans>+ </div>+ )}</View>{footer}</View>@@ -432,6 +461,8 @@ export function PayeeAutocomplete({}});+ // Only show the first 100 results, users can search to find more.+ // If user want to view all payees, it can be done via the manage payees page.filtered = filtered.slice(0, 100);if (filtered.length >= 2 && filtered[0].id === 'new') {diff --git a/upcoming-release-notes/5687.md b/upcoming-release-notes/5687.mdnew file mode 100644index 0000000000..26b1bdf7a9--- /dev/null+++ b/upcoming-release-notes/5687.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [joel-jeremy]+---++Remove usage of a raw variable in PayeeAutocomplete component