Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 14 additions & 2 deletions src/components/MoneyReportHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
import {exportReportToCSV, exportToIntegration, markAsManuallyExported} from '@libs/actions/Report';
import {convertToDisplayString} from '@libs/CurrencyUtils';
import {getThreadReportIDsForTransactions} from '@libs/MoneyRequestReportUtils';
import Navigation from '@libs/Navigation/Navigation';
import {buildOptimisticNextStepForPreventSelfApprovalsEnabled} from '@libs/NextStepUtils';
import {getConnectedIntegration} from '@libs/PolicyUtils';
Expand Down Expand Up @@ -44,6 +45,7 @@ import {
import {
allHavePendingRTERViolation,
hasDuplicateTransactions,
isDuplicate,
isExpensifyCardTransaction,
isOnHold as isOnHoldTransactionUtils,
isPayAtEndExpense as isPayAtEndExpenseTransactionUtils,
Expand Down Expand Up @@ -350,6 +352,15 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
}
};

const getFirstDuplicateThreadID = (reportTransactions: OnyxTypes.Transaction[], allReportActions: OnyxTypes.ReportAction[]) => {
const duplicateTransaction = reportTransactions.find((reportTransaction) => isDuplicate(reportTransaction.transactionID));
if (!duplicateTransaction) {
return null;
}

return getThreadReportIDsForTransactions(allReportActions, [duplicateTransaction]).at(0);
};

const statusBarProps = getStatusBarProps();
const shouldAddGapToContents = shouldUseNarrowLayout && shouldShowSelectedTransactionsButton && (!!statusBarProps || shouldShowNextStep);

Expand Down Expand Up @@ -472,10 +483,11 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
success
text={translate('iou.reviewDuplicates')}
onPress={() => {
if (!transactionThreadReportID) {
const threadID = transactionThreadReportID ?? getFirstDuplicateThreadID(transactions, reportActions);
if (!threadID) {
return;
}
Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(transactionThreadReportID, Navigation.getReportRHPActiveRoute()));
Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(threadID));
}}
/>
),
Expand Down
4 changes: 0 additions & 4 deletions src/libs/ReportPrimaryActionUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,6 @@ function isRemoveHoldAction(report: Report, reportTransactions: Transaction[]) {
}

function isReviewDuplicatesAction(report: Report, reportTransactions: Transaction[], policy?: Policy) {
if (reportTransactions.length !== 1) {
return false;
}

const hasDuplicates = reportTransactions.some((transaction) => isDuplicate(transaction.transactionID));

if (!hasDuplicates) {
Expand Down
22 changes: 16 additions & 6 deletions src/pages/TransactionDuplicate/Confirmation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {ShowContextMenuContext} from '@components/ShowContextMenuContext';
import Text from '@components/Text';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useLocalize from '@hooks/useLocalize';
import usePermissions from '@hooks/usePermissions';
import useReviewDuplicatesNavigation from '@hooks/useReviewDuplicatesNavigation';
import useThemeStyles from '@hooks/useThemeStyles';
import Navigation from '@libs/Navigation/Navigation';
Expand All @@ -35,16 +36,17 @@ import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
function Confirmation() {
const styles = useThemeStyles();
const {translate} = useLocalize();
const {canUseTableReportView} = usePermissions();
const route = useRoute<PlatformStackRouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.REVIEW>>();
const currentUserPersonalDetails = useCurrentUserPersonalDetails();
const [reviewDuplicates, reviewDuplicatesResult] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES);
const [reviewDuplicates, reviewDuplicatesResult] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES, {canBeMissing: true});
const transaction = useMemo(() => TransactionUtils.buildNewTransactionAfterReviewingDuplicates(reviewDuplicates), [reviewDuplicates]);
const transactionID = TransactionUtils.getTransactionID(route.params.threadReportID);
const compareResult = TransactionUtils.compareDuplicateTransactionFields(transactionID, reviewDuplicates?.reportID);
const {goBack} = useReviewDuplicatesNavigation(Object.keys(compareResult.change ?? {}), 'confirmation', route.params.threadReportID, route.params.backTo);
const [report, reportResult] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`);
const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`);
const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transaction?.reportID}`);
const [report, reportResult] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`, {canBeMissing: true});
const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`, {canBeMissing: true});
const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transaction?.reportID}`, {canBeMissing: true});
const reportAction = Object.values(reportActions ?? {}).find(
(action) => ReportActionsUtils.isMoneyRequestAction(action) && ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID === reviewDuplicates?.transactionID,
);
Expand All @@ -57,20 +59,28 @@ function Confirmation() {
return;
}
IOU.mergeDuplicates(transactionsMergeParams);
if (canUseTableReportView) {
Navigation.dismissModal();
return;
}
if (!reportAction?.childReportID) {
return;
}
Navigation.dismissModalWithReport({reportID: reportAction.childReportID});
}, [reportAction?.childReportID, transactionsMergeParams]);
}, [reportAction?.childReportID, transactionsMergeParams, canUseTableReportView]);

const resolveDuplicates = useCallback(() => {
IOU.resolveDuplicates(transactionsMergeParams);
if (canUseTableReportView) {
Navigation.dismissModal();
return;
}
if (!reportAction?.childReportID) {
Navigation.dismissModal();
return;
}
Navigation.dismissModalWithReport({reportID: reportAction.childReportID});
}, [transactionsMergeParams, reportAction?.childReportID]);
}, [transactionsMergeParams, reportAction?.childReportID, canUseTableReportView]);

const contextValue = useMemo(
() => ({
Expand Down