Skip to content

Temporarily highlight the expense row in the table view when a new expense is added #60662

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.

Sign up for GitHub

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

Merged
mountiny merged 8 commits into from
Apr 30, 2025
Merged

Temporarily highlight the expense row in the table view when a new expense is added #60662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a5a0c9f
add new transaction highlighting
SzymczakJ Apr 22, 2025
2b19eee
add scrolling to new transaction on web
SzymczakJ Apr 23, 2025
5d99138
Merge branch 'main' into @szymczak/highlight-new-transactions-in-report
SzymczakJ Apr 24, 2025
54d5823
revert scrolling to new transaction on web
SzymczakJ Apr 24, 2025
a1e7e6a
fix PR comments
SzymczakJ Apr 25, 2025
9a8d54e
add filter by inserted date
sumo-slonik Apr 30, 2025
0629194
change logic after highlighting
sumo-slonik Apr 30, 2025
3fbad17
fix name changed
sumo-slonik Apr 30, 2025
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
34 changes: 31 additions & 3 deletions src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import useHover from '@hooks/useHover';
import useLocalize from '@hooks/useLocalize';
import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
import {useMouseContext} from '@hooks/useMouseContext';
import usePrevious from '@hooks/usePrevious';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useStyleUtils from '@hooks/useStyleUtils';
import useThemeStyles from '@hooks/useThemeStyles';
Expand Down Expand Up @@ -51,6 +52,11 @@ type MoneyRequestReportTransactionListProps = {
hasComments: boolean;
};

type TransactionWithOptionalHighlight = OnyxTypes.Transaction & {
/** Whether the transaction should be highlighted, when it is added to the report */
shouldBeHighlighted?: boolean;
};

const sortableColumnNames = [
CONST.SEARCH.TABLE_COLUMNS.DATE,
CONST.SEARCH.TABLE_COLUMNS.MERCHANT,
Expand Down Expand Up @@ -104,6 +110,8 @@ function MoneyRequestReportTransactionList({report, transactions, reportActions,
}, [setSelectedTransactionsID]),
);

const prevTransactions = usePrevious(transactions);

const handleMouseLeave = (e: React.MouseEvent<Element, MouseEvent>) => {
bind.onMouseLeave();
e.stopPropagation();
Expand All @@ -117,9 +125,28 @@ function MoneyRequestReportTransactionList({report, transactions, reportActions,

const {sortBy, sortOrder} = sortConfig;

const sortedTransactions = useMemo(() => {
return [...transactions].sort((a, b) => compareValues(a[getTransactionKey(a, sortBy)], b[getTransactionKey(b, sortBy)], sortOrder, sortBy));
}, [sortBy, sortOrder, transactions]);
const newTransactionID = useMemo(() => {
if (!prevTransactions || transactions.length === prevTransactions.length) {
return CONST.EMPTY_ARRAY as unknown as string[];
}

return transactions
.filter((transaction) => !prevTransactions.some((prevTransaction) => prevTransaction.transactionID === transaction.transactionID))
.reduce((latest, t) => {
const inserted = t?.inserted ?? 0;
const latestInserted = latest?.inserted ?? 0;
return inserted > latestInserted ? t : latest;
}, transactions.at(0))?.transactionID;
}, [prevTransactions, transactions]);

const sortedTransactions: TransactionWithOptionalHighlight[] = useMemo(() => {
return [...transactions]
.sort((a, b) => compareValues(a[getTransactionKey(a, sortBy)], b[getTransactionKey(b, sortBy)], sortOrder, sortBy))
.map((transaction) => ({
...transaction,
shouldBeHighlighted: newTransactionID === transaction.transactionID,
}));
}, [newTransactionID, sortBy, sortOrder, transactions]);

const navigateToTransaction = useCallback(
(activeTransaction: OnyxTypes.Transaction) => {
Expand Down Expand Up @@ -292,3 +319,4 @@ function MoneyRequestReportTransactionList({report, transactions, reportActions,
MoneyRequestReportTransactionList.displayName = 'MoneyRequestReportTransactionList';

export default memo(MoneyRequestReportTransactionList);
export type {TransactionWithOptionalHighlight};
Loading