Skip to content

Revert "Fix duplicate-review confirmation redirecting to “It’s not here”" #77062

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
yuwenmemon merged 1 commit into from
Dec 9, 2025
Merged

Revert "Fix duplicate-review confirmation redirecting to “It’s not here”" #77062

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
25 changes: 7 additions & 18 deletions src/pages/TransactionDuplicate/Confirmation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import {generateReportID} from '@src/libs/ReportUtils';
import * as TransactionUtils from '@src/libs/TransactionUtils';
import {getTransactionID} from '@src/libs/TransactionUtils';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
import type {Transaction} from '@src/types/onyx';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
Expand All @@ -41,12 +40,11 @@ function Confirmation() {
const styles = useThemeStyles();
const {translate} = useLocalize();
const route = useRoute<PlatformStackRouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.REVIEW>>();
const {threadReportID, backTo} = route.params;
const currentUserPersonalDetails = useCurrentUserPersonalDetails();
const [reviewDuplicates, reviewDuplicatesResult] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES, {canBeMissing: true});
const [duplicatedTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(reviewDuplicates?.transactionID)}`, {canBeMissing: true});
const newTransaction = useMemo(() => TransactionUtils.buildNewTransactionAfterReviewingDuplicates(reviewDuplicates, duplicatedTransaction), [duplicatedTransaction, reviewDuplicates]);
const transactionID = TransactionUtils.getTransactionID(threadReportID);
const transactionID = TransactionUtils.getTransactionID(route.params.threadReportID);
const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {canBeMissing: false});
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, {canBeMissing: true});
const [transactionViolations] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${getNonEmptyStringOnyxID(transactionID)}`, {
Expand All @@ -60,8 +58,8 @@ function Confirmation() {
const reviewDuplicatesReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reviewDuplicates?.reportID}`];
const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${getNonEmptyStringOnyxID(reviewDuplicatesReport?.policyID)}`, {canBeMissing: true});
const compareResult = TransactionUtils.compareDuplicateTransactionFields(transaction, allDuplicates, reviewDuplicatesReport, undefined, policyCategories);
const {goBack} = useReviewDuplicatesNavigation(Object.keys(compareResult.change ?? {}), 'confirmation', threadReportID, backTo);
const [report, reportResult] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${threadReportID}`, {canBeMissing: true});
const {goBack} = useReviewDuplicatesNavigation(Object.keys(compareResult.change ?? {}), 'confirmation', route.params.threadReportID, route.params.backTo);
const [report, reportResult] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`, {canBeMissing: true});
const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${newTransaction?.reportID}`, {canBeMissing: true});
const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${newTransaction?.reportID}`, {canBeMissing: true});
const reportAction = Object.values(reportActions ?? {}).find(
Expand All @@ -76,28 +74,19 @@ function Confirmation() {
);
const isReportOwner = iouReport?.ownerAccountID === currentUserPersonalDetails?.accountID;

const closeReviewDuplicates = useCallback(() => {
if (reviewDuplicates?.reportID) {
Navigation.setNavigationActionToMicrotaskQueue(() => {
Navigation.navigate(ROUTES.SEARCH_MONEY_REQUEST_REPORT.getRoute({reportID: reviewDuplicates.reportID}), {forceReplace: true});
});
}
Navigation.dismissModal();
}, [reviewDuplicates?.reportID]);

const mergeDuplicates = useCallback(() => {
const transactionThreadReportID = reportAction?.childReportID ?? generateReportID();
if (!reportAction?.childReportID) {
transactionsMergeParams.transactionThreadReportID = transactionThreadReportID;
}
closeReviewDuplicates();
IOU.mergeDuplicates(transactionsMergeParams);
}, [reportAction?.childReportID, transactionsMergeParams, closeReviewDuplicates]);
Navigation.dismissModal();
}, [reportAction?.childReportID, transactionsMergeParams]);

const resolveDuplicates = useCallback(() => {
closeReviewDuplicates();
IOU.resolveDuplicates(transactionsMergeParams);
}, [transactionsMergeParams, closeReviewDuplicates]);
Navigation.dismissModal();
}, [transactionsMergeParams]);

const contextValue = useMemo(
() => ({
Expand Down
150 changes: 0 additions & 150 deletions tests/unit/TransactionDuplicateConfirmationTest.ts
View file
Open in desktop

This file was deleted.

Loading