Skip to content

Fix expense carousel position jump when creating expense without category #91467

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
grgia merged 1 commit into from
May 25, 2026
Merged

Fix expense carousel position jump when creating expense without category #91467

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
17 changes: 11 additions & 6 deletions ...omponents/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ import {startSpan} from '@libs/telemetry/activeSpans';
import {getPendingSubmitFollowUpAction} from '@libs/telemetry/submitFollowUpAction';
import type {SkeletonSpanReasonAttributes} from '@libs/telemetry/useSkeletonSpan';
import {compareByRBR} from '@libs/TransactionPreviewUtils';
import {hasPendingUI, isManagedCardTransaction, isPending} from '@libs/TransactionUtils';
import {getCreated, hasPendingUI, isManagedCardTransaction, isPending} from '@libs/TransactionUtils';
import colors from '@styles/theme/colors';
import variables from '@styles/variables';
import CONST from '@src/CONST';
Expand Down Expand Up @@ -160,7 +160,7 @@ function MoneyRequestReportPreviewContent({
const styles = useThemeStyles();
const StyleUtils = useStyleUtils();
const currentUserDetails = useCurrentUserPersonalDetails();
const {translate, formatPhoneNumber} = useLocalize();
const {translate, formatPhoneNumber, localeCompare} = useLocalize();
const {convertToDisplayString} = useCurrencyListActions();
// eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
const {shouldUseNarrowLayout, isSmallScreenWidth} = useResponsiveLayout();
Expand Down Expand Up @@ -357,11 +357,16 @@ function MoneyRequestReportPreviewContent({
if (shouldShowAccessPlaceHolder) {
return [];
}
const sorted = [...transactions].sort((a, b) =>
compareByRBR(a, b, transactionViolations, currentUserDetails?.login ?? '', currentUserDetails?.accountID ?? CONST.DEFAULT_NUMBER_ID, iouReport, policy),
);
const sorted = [...transactions].sort((a, b) => {
const rbrComparison = compareByRBR(a, b, transactionViolations, currentUserDetails?.login ?? '', currentUserDetails?.accountID ?? CONST.DEFAULT_NUMBER_ID, iouReport, policy);
if (rbrComparison !== 0) {
return rbrComparison;
}
// Tiebreak by date (ascending — oldest first) so position is stable across RBR state changes
return localeCompare(getCreated(a), getCreated(b));
});
return sorted.slice(0, 11);
}, [shouldShowAccessPlaceHolder, transactions, transactionViolations, currentUserDetails?.login, currentUserDetails?.accountID, iouReport, policy]);
}, [shouldShowAccessPlaceHolder, transactions, transactionViolations, currentUserDetails?.login, currentUserDetails?.accountID, iouReport, policy, localeCompare]);
const prevCarouselTransactionLength = useRef(0);

useEffect(() => {
Expand Down
4 changes: 3 additions & 1 deletion src/libs/TransactionUtils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,9 @@ function buildOptimisticTransaction(params: BuildOptimisticTransactionParams): T
created = '',
merchant = '',
receipt,
category = '',
// Prevent RBR flip and transaction jump: initialize category to 'Uncategorized' instead of
// empty string so optimistic missing category violation isn't added then removed during backend sync
category = CONST.SEARCH.CATEGORY_DEFAULT_VALUE,
tag = '',
taxCode = '',
taxAmount = 0,
Expand Down
Loading