From 20e41fac0d010993e4c9c0ee4ec3f5112143e1ee Mon Sep 17 00:00:00 2001 From: krishna2323 Date: Mon, 3 Nov 2025 00:51:30 +0530 Subject: [PATCH 1/2] fix: search header alignment and chevron press functionality. Signed-off-by: krishna2323 --- .../MoneyRequestReportTransactionItem.tsx | 5 +++++ .../MoneyRequestReportTransactionList.tsx | 1 + src/components/Search/index.tsx | 2 +- .../Search/TransactionGroupListExpanded.tsx | 1 + .../Search/TransactionListItem.tsx | 1 + src/components/TransactionItemRow/index.tsx | 6 ++++-- 6 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx index eddf35edd28d..ceae11003573 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx @@ -59,6 +59,9 @@ type MoneyRequestReportTransactionItemProps = ForwardedFSClassProps & { /** Callback function that scrolls to this transaction in case it is newly added */ scrollToNewTransaction?: (offset: number) => void; + + /** Callback function that navigates to the transaction thread */ + onArrowRightPress?: () => void; }; const expenseHeaders = getExpenseHeaders(); @@ -78,6 +81,7 @@ function MoneyRequestReportTransactionItem({ taxAmountColumnSize, scrollToNewTransaction, forwardedFSClass, + onArrowRightPress, }: MoneyRequestReportTransactionItemProps) { const {translate} = useLocalize(); const styles = useThemeStyles(); @@ -154,6 +158,7 @@ function MoneyRequestReportTransactionItem({ onButtonPress={() => { handleOnPress(transaction.transactionID); }} + onArrowRightPress={() => onArrowRightPress?.()} /> diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index c801dbdf40b3..fab95104aa0a 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -392,6 +392,7 @@ function MoneyRequestReportTransactionList({ // if we add few new transactions, then we need to scroll to the first one scrollToNewTransaction={transaction.transactionID === newTransactions?.at(0)?.transactionID ? scrollToNewTransaction : undefined} forwardedFSClass={transactionItemFSClass} + onArrowRightPress={() => navigateToTransaction(transaction.transactionID)} /> ); })} diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx index 26a8eda50c60..7aa5e040d98f 100644 --- a/src/components/Search/index.tsx +++ b/src/components/Search/index.tsx @@ -919,7 +919,7 @@ function Search({ onDEWModalOpen={handleDEWModalOpen} SearchTableHeader={ !shouldShowTableHeader ? undefined : ( - + ({ isInSingleTransactionReport={isInSingleTransactionReport} areAllOptionalColumnsHidden={areAllOptionalColumnsHidden} shouldShowBottomBorder={shouldShowBottomBorder} + onArrowRightPress={() => openReportInRHP(transaction)} /> ); diff --git a/src/components/SelectionListWithSections/Search/TransactionListItem.tsx b/src/components/SelectionListWithSections/Search/TransactionListItem.tsx index 60d53da0d020..d42aa30c0d53 100644 --- a/src/components/SelectionListWithSections/Search/TransactionListItem.tsx +++ b/src/components/SelectionListWithSections/Search/TransactionListItem.tsx @@ -197,6 +197,7 @@ function TransactionListItem({ style={[styles.p3, styles.pv2, shouldUseNarrowLayout ? styles.pt2 : {}, isLargeScreenWidth && styles.pr0]} areAllOptionalColumnsHidden={areAllOptionalColumnsHidden} violations={transactionViolations} + onArrowRightPress={onPress} /> diff --git a/src/components/TransactionItemRow/index.tsx b/src/components/TransactionItemRow/index.tsx index a1a1fe7258d6..ce8d1b05a3a1 100644 --- a/src/components/TransactionItemRow/index.tsx +++ b/src/components/TransactionItemRow/index.tsx @@ -113,6 +113,7 @@ type TransactionItemRowProps = { areAllOptionalColumnsHidden?: boolean; violations?: TransactionViolation[]; shouldShowBottomBorder?: boolean; + onArrowRightPress?: () => void; }; function getMerchantName(transactionItem: TransactionWithOptionalSearchFields, translate: (key: TranslationPaths) => string) { @@ -153,6 +154,7 @@ function TransactionItemRow({ areAllOptionalColumnsHidden = false, violations, shouldShowBottomBorder, + onArrowRightPress, }: TransactionItemRowProps) { const styles = useThemeStyles(); const {translate} = useLocalize(); @@ -554,9 +556,9 @@ function TransactionItemRow({ /> )} - {!!isLargeScreenWidth && ( + {!!isLargeScreenWidth && !!onArrowRightPress && ( onButtonPress()} + onPress={() => onArrowRightPress?.()} style={[styles.p3Half, styles.pl0half, styles.justifyContentCenter, styles.alignItemsEnd]} accessibilityRole={CONST.ROLE.BUTTON} accessibilityLabel={CONST.ROLE.BUTTON} From a5601a627cfd06ea1d2de66aed6ba796d766eb97 Mon Sep 17 00:00:00 2001 From: krishna2323 Date: Mon, 3 Nov 2025 02:37:18 +0530 Subject: [PATCH 2/2] fix comments. Signed-off-by: krishna2323 --- .../MoneyRequestReportTransactionItem.tsx | 4 ++-- .../MoneyRequestReportTransactionList.tsx | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx index ceae11003573..f4a3a38847a9 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionItem.tsx @@ -61,7 +61,7 @@ type MoneyRequestReportTransactionItemProps = ForwardedFSClassProps & { scrollToNewTransaction?: (offset: number) => void; /** Callback function that navigates to the transaction thread */ - onArrowRightPress?: () => void; + onArrowRightPress?: (transactionID: string) => void; }; const expenseHeaders = getExpenseHeaders(); @@ -158,7 +158,7 @@ function MoneyRequestReportTransactionItem({ onButtonPress={() => { handleOnPress(transaction.transactionID); }} - onArrowRightPress={() => onArrowRightPress?.()} + onArrowRightPress={() => onArrowRightPress?.(transaction.transactionID)} /> diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index fab95104aa0a..be5267b4cf08 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -312,6 +312,13 @@ function MoneyRequestReportTransactionList({ [isMobileSelectionModeEnabled, toggleTransaction, navigateToTransaction], ); + const handleArrowRightPress = useCallback( + (transactionID: string) => { + navigateToTransaction(transactionID); + }, + [navigateToTransaction], + ); + const listHorizontalPadding = styles.ph5; const transactionItemFSClass = FS.getChatFSClass(personalDetailsList, report); @@ -392,7 +399,7 @@ function MoneyRequestReportTransactionList({ // if we add few new transactions, then we need to scroll to the first one scrollToNewTransaction={transaction.transactionID === newTransactions?.at(0)?.transactionID ? scrollToNewTransaction : undefined} forwardedFSClass={transactionItemFSClass} - onArrowRightPress={() => navigateToTransaction(transaction.transactionID)} + onArrowRightPress={handleArrowRightPress} /> ); })}