Skip to content

Fix duplicate expense navigation arrows showing inverted state on first open #83753

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

Draft
MelvinBot wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix duplicate expense navigation arrows showing inverted state on first open #83753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,12 @@ function MoneyRequestReportTransactionList({
if (focusedRoute?.name !== SCREENS.RIGHT_MODAL.SEARCH_REPORT) {
return;
}
// Don't overwrite active transaction IDs when navigating from the duplicate review,
// as Review.tsx sets its own order via onPreviewPressed.
const backTo = (focusedRoute.params as Record<string, string> | undefined)?.backTo;
if (backTo?.replaceAll(/\?.*/g, '').endsWith('/duplicates/review')) {
return;
}
setActiveTransactionIDs(visualOrderTransactionIDs);
}, [visualOrderTransactionIDs]);

Expand Down
38 changes: 38 additions & 0 deletions tests/unit/MoneyRequestReportTransactionListActiveTransactionIDsTest.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ function useActiveTransactionIDsEffect(visualOrderTransactionIDs: string[]) {
if (focusedRoute?.name !== SCREENS.RIGHT_MODAL.SEARCH_REPORT) {
return;
}
const backTo = (focusedRoute.params as Record<string, string> | undefined)?.backTo;
if (backTo?.replaceAll(/\?.*/g, '').endsWith('/duplicates/review')) {
return;
}
setActiveTransactionIDs(visualOrderTransactionIDs);
}, [visualOrderTransactionIDs]);

Expand Down Expand Up @@ -173,6 +177,40 @@ describe('MoneyRequestReportTransactionList - Active Transaction IDs Effect', ()
expect(mockClearActiveTransactionIDs).not.toHaveBeenCalled();
});

it('should NOT call setActiveTransactionIDs when backTo includes duplicates review', () => {
// Given the focused route is SEARCH_REPORT with backTo pointing to a duplicate review
mockFindFocusedRoute.mockReturnValue({
name: SCREENS.RIGHT_MODAL.SEARCH_REPORT,
key: 'test-key',
params: {backTo: '/r/123/duplicates/review'},
});

const transactionIDs = ['trans1', 'trans2'];

// When the hook is rendered
renderHook(() => useActiveTransactionIDsEffect(transactionIDs));

// Then setActiveTransactionIDs should NOT be called because the IDs were already set by Review.tsx
expect(mockSetActiveTransactionIDs).not.toHaveBeenCalled();
});

it('should NOT call setActiveTransactionIDs when backTo includes duplicates review with query params', () => {
// Given the focused route is SEARCH_REPORT with backTo including query params after duplicates/review
mockFindFocusedRoute.mockReturnValue({
name: SCREENS.RIGHT_MODAL.SEARCH_REPORT,
key: 'test-key',
params: {backTo: '/r/456/duplicates/review?someParam=value'},
});

const transactionIDs = ['trans1', 'trans2'];

// When the hook is rendered
renderHook(() => useActiveTransactionIDsEffect(transactionIDs));

// Then setActiveTransactionIDs should NOT be called
expect(mockSetActiveTransactionIDs).not.toHaveBeenCalled();
});

it('should handle empty transaction IDs array', () => {
// Given the focused route is SEARCH_REPORT
mockFindFocusedRoute.mockReturnValue({name: SCREENS.RIGHT_MODAL.SEARCH_REPORT, key: 'test-key'});
Expand Down
Loading