Skip to content

[Better Expense Report View] Add missing touch handlers to new report preview #61057

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 6 commits into from
May 5, 2025
Merged

[Better Expense Report View] Add missing touch handlers to new report preview #61057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
14ca07c
Fix long-press & press in carousel
JakubKorytko Apr 29, 2025
c8205d5
Merge branch 'main' into korytko/fix-carousel-scrolling
JakubKorytko Apr 30, 2025
07a0b08
Merge branch 'main' into korytko/fix-carousel-scrolling
JakubKorytko Apr 30, 2025
347bb57
Merge branch 'main' into korytko/fix-carousel-scrolling
JakubKorytko May 5, 2025
9729797
Fix ESLint issue after merge
JakubKorytko May 5, 2025
fd82a4e
Pass context action to TransactionPreview from carousel
JakubKorytko May 5, 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
3 changes: 3 additions & 0 deletions src/components/ReportActionItem/MoneyRequestReportPreview/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ function MoneyRequestReportPreview({
<TransactionPreview
chatReportID={chatReportID}
action={getIOUActionForReportID(item.reportID, item.transactionID)}
contextAction={action}
reportID={item.reportID}
isBillSplit={isSplitBillAction}
isTrackExpense={isTrackExpenseAction}
Expand All @@ -95,9 +96,11 @@ function MoneyRequestReportPreview({
isHovered={isHovered}
iouReportID={iouReportID}
containerStyles={[styles.h100, reportPreviewStyles.transactionPreviewStyle, containerStyles]}
shouldDisplayContextMenu={shouldDisplayContextMenu}
Comment thread
JakubKorytko marked this conversation as resolved.
transactionPreviewWidth={reportPreviewStyles.transactionPreviewStyle.width}
transactionID={item.transactionID}
reportPreviewAction={action}
onPreviewPressed={openReportFromPreview}
shouldShowIOUData={shouldShowIOUData}
/>
);
Expand Down
3 changes: 2 additions & 1 deletion src/components/ReportActionItem/TransactionPreview/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ function TransactionPreview(props: TransactionPreviewProps) {
iouReportID,
transactionID: transactionIDFromProps,
onPreviewPressed,
contextAction,
} = props;

const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`, {canBeMissing: true});
Expand Down Expand Up @@ -64,7 +65,7 @@ function TransactionPreview(props: TransactionPreviewProps) {
if (!shouldDisplayContextMenu) {
return;
}
showContextMenuForReport(event, contextMenuAnchor, reportID, action, checkIfContextMenuActive);
showContextMenuForReport(event, contextMenuAnchor, contextAction ? chatReportID : reportID, contextAction ?? action, checkIfContextMenuActive);
};

const offlineWithFeedbackOnClose = useCallback(() => {
Expand Down
3 changes: 3 additions & 0 deletions src/components/ReportActionItem/TransactionPreview/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ type TransactionPreviewProps = {

/** Whether to show payer/receiver data in the preview */
shouldShowIOUData?: boolean;

/** In case we want to override context menu action */
contextAction?: OnyxEntry<ReportAction>;
};

type TransactionPreviewContentProps = {
Expand Down