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
30 changes: 21 additions & 9 deletions src/libs/actions/Transaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@
import {getPolicyTagsData} from './Policy/Tag';

let recentWaypoints: RecentWaypoint[] = [];
Onyx.connect({

Check warning on line 54 in src/libs/actions/Transaction.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.NVP_RECENT_WAYPOINTS,
callback: (val) => (recentWaypoints = val ?? []),
});

const allTransactions: Record<string, Transaction> = {};
Onyx.connect({

Check warning on line 60 in src/libs/actions/Transaction.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION,
callback: (transaction, key) => {
if (!key || !transaction) {
Expand All @@ -69,7 +69,7 @@
});

let allTransactionDrafts: OnyxCollection<Transaction> = {};
Onyx.connect({

Check warning on line 72 in src/libs/actions/Transaction.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -78,7 +78,7 @@
});

let allReports: OnyxCollection<Report> = {};
Onyx.connect({

Check warning on line 81 in src/libs/actions/Transaction.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.REPORT,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -90,7 +90,7 @@
});

const allTransactionViolation: OnyxCollection<TransactionViolation[]> = {};
Onyx.connect({

Check warning on line 93 in src/libs/actions/Transaction.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
callback: (transactionViolation, key) => {
if (!key || !transactionViolation) {
Expand All @@ -102,7 +102,7 @@
});

let allTransactionViolations: TransactionViolations = [];
Onyx.connect({

Check warning on line 105 in src/libs/actions/Transaction.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
callback: (val) => (allTransactionViolations = val ?? []),
});
Expand Down Expand Up @@ -389,19 +389,31 @@
});
}

type DismissDuplicateTransactionViolationProps = {
transactionIDs: string[];
dismissedPersonalDetails: PersonalDetails;
expenseReport: OnyxEntry<Report>;
policy: OnyxEntry<Policy>;
isASAPSubmitBetaEnabled: boolean;
allTransactionsCollection: OnyxCollection<Transaction>;
allTransactionViolationsCollection: OnyxCollection<TransactionViolation[]>;
};

/**
* Dismisses the duplicate transaction violation for the provided transactionIDs
* and updates the transaction to include the dismissed violation in the comment.
*/
function dismissDuplicateTransactionViolation(
transactionIDs: string[],
dismissedPersonalDetails: PersonalDetails,
expenseReport: OnyxEntry<Report>,
policy: OnyxEntry<Policy>,
isASAPSubmitBetaEnabled: boolean,
) {
const currentTransactionViolations = transactionIDs.map((id) => ({transactionID: id, violations: allTransactionViolation?.[id] ?? []}));
const currentTransactions = transactionIDs.map((id) => allTransactions?.[id]);
function dismissDuplicateTransactionViolation({
transactionIDs,
dismissedPersonalDetails,
expenseReport,
policy,
isASAPSubmitBetaEnabled,
allTransactionsCollection,
allTransactionViolationsCollection,
}: DismissDuplicateTransactionViolationProps) {
const currentTransactionViolations = transactionIDs.map((id) => ({transactionID: id, violations: allTransactionViolationsCollection?.[id] ?? []}));
const currentTransactions = transactionIDs.map((id) => allTransactionsCollection?.[id]).filter((transaction): transaction is Transaction => transaction !== undefined);
const transactionsReportActions = currentTransactions.map((transaction) => getIOUActionForReportID(transaction.reportID, transaction.transactionID));
const optimisticDismissedViolationReportActions = transactionsReportActions.map(() => {
return buildOptimisticDismissedViolationReportAction({reason: 'manual', violationName: CONST.VIOLATIONS.DUPLICATED_TRANSACTION});
Expand Down
72 changes: 66 additions & 6 deletions src/pages/TransactionDuplicate/Review.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {isReportIDApproved, isSettled} from '@libs/ReportUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type SCREENS from '@src/SCREENS';
import type {Transaction} from '@src/types/onyx';
import type {Transaction, TransactionViolations} from '@src/types/onyx';
import DuplicateTransactionsList from './DuplicateTransactionsList';

function TransactionDuplicateReview() {
Expand All @@ -47,11 +47,63 @@ function TransactionDuplicateReview() {
[transactionViolations],
);
const transactionIDs = useMemo(() => (transactionID ? [transactionID, ...duplicateTransactionIDs] : duplicateTransactionIDs), [transactionID, duplicateTransactionIDs]);

const allTransactionsSelector = useCallback(
(allTransactions: OnyxCollection<Transaction>): OnyxCollection<Transaction> => {
if (!allTransactions) {
return {};
}

const filteredTransactions: OnyxCollection<Transaction> = {};
transactionIDs.forEach((id) => {
const key = `${ONYXKEYS.COLLECTION.TRANSACTION}${id}`;
if (allTransactions[key]) {
filteredTransactions[key] = allTransactions[key];
}
});
return filteredTransactions;
},
[transactionIDs],
);

const [allTransactions] = useOnyx(
ONYXKEYS.COLLECTION.TRANSACTION,
{
selector: allTransactionsSelector,
canBeMissing: false,
},
[allTransactionsSelector],
);

const allTransactionViolationsSelector = useCallback(
(allViolations: OnyxCollection<TransactionViolations>): OnyxCollection<TransactionViolations> => {
if (!allViolations) {
return {};
}
const filteredViolations: OnyxCollection<TransactionViolations> = {};
transactionIDs.forEach((id) => {
const key = `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${id}`;
if (allViolations[key]) {
filteredViolations[key] = allViolations[key];
}
});
return filteredViolations;
},
[transactionIDs],
);

const [allTransactionViolation] = useOnyx(
ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
{
selector: allTransactionViolationsSelector,
canBeMissing: false,
},
[allTransactionViolationsSelector],
);

const transactionsSelector = useCallback(
(allTransactions: OnyxCollection<Transaction>) =>
transactionIDs
.map((id) => allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${id}`])
.sort((a, b) => new Date(a?.created ?? '').getTime() - new Date(b?.created ?? '').getTime()),
(transactions: OnyxCollection<Transaction>) =>
transactionIDs.map((id) => transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${id}`]).sort((a, b) => new Date(a?.created ?? '').getTime() - new Date(b?.created ?? '').getTime()),
[transactionIDs],
);

Expand All @@ -65,7 +117,15 @@ function TransactionDuplicateReview() {
);

const keepAll = () => {
dismissDuplicateTransactionViolation(transactionIDs, currentPersonalDetails, expenseReport, policy, isASAPSubmitBetaEnabled);
dismissDuplicateTransactionViolation({
transactionIDs,
dismissedPersonalDetails: currentPersonalDetails,
expenseReport,
policy,
isASAPSubmitBetaEnabled,
allTransactionsCollection: allTransactions,
allTransactionViolationsCollection: allTransactionViolation,
});
Navigation.goBack();
};

Expand Down
Loading
Loading