Skip to content
Open
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
type GetDuplicateTransactionDetailsParams = {
transactionID: string;
};

export default GetDuplicateTransactionDetailsParams;
1 change: 1 addition & 0 deletions src/libs/API/parameters/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -455,3 +455,4 @@ export type {default as OpenSearchPageParams} from './OpenSearchPageParams';
export type {default as SetPolicyRequireCompanyCardsEnabledParams} from './SetPolicyRequireCompanyCardsEnabled';
export type {default as SetTechnicalContactEmailParams} from './SetTechnicalContactEmailParams';
export type {default as ToggleConsolidatedDomainBillingParams} from './ToggleConsolidatedDomainBillingParams';
export type {default as GetDuplicateTransactionDetailsParams} from './GetDuplicateTransactionDetailsParams';
2 changes: 2 additions & 0 deletions src/libs/API/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1164,6 +1164,7 @@ const READ_COMMANDS = {
GET_DOMAIN_VALIDATE_CODE: 'GetDomainValidateCode',
OPEN_DOMAIN_INITIAL_PAGE: 'OpenDomainInitialPage',
GET_SAML_SETTINGS: 'GetSAMLSettings',
GET_DUPLICATE_TRANSACTION_DETAILS: 'GetDuplicateTransactionDetails',
} as const;

type ReadCommand = ValueOf<typeof READ_COMMANDS>;
Expand Down Expand Up @@ -1248,6 +1249,7 @@ type ReadCommandParameters = {
[READ_COMMANDS.GET_DOMAIN_VALIDATE_CODE]: Parameters.DomainParams;
[READ_COMMANDS.OPEN_DOMAIN_INITIAL_PAGE]: Parameters.DomainParams;
[READ_COMMANDS.GET_SAML_SETTINGS]: Parameters.DomainParams;
[READ_COMMANDS.GET_DUPLICATE_TRANSACTION_DETAILS]: Parameters.GetDuplicateTransactionDetailsParams;
};

const SIDE_EFFECT_REQUEST_COMMANDS = {
Expand Down
22 changes: 21 additions & 1 deletion src/libs/actions/Transaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,14 @@
import type {OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
import Onyx from 'react-native-onyx';
import * as API from '@libs/API';
import type {ChangeTransactionsReportParams, DismissViolationParams, GetRouteParams, MarkAsCashParams, TransactionThreadInfo} from '@libs/API/parameters';
import type {
ChangeTransactionsReportParams,
DismissViolationParams,
GetDuplicateTransactionDetailsParams,
GetRouteParams,
MarkAsCashParams,
TransactionThreadInfo,
} from '@libs/API/parameters';
import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
import * as CollectionUtils from '@libs/CollectionUtils';
import DateUtils from '@libs/DateUtils';
Expand Down Expand Up @@ -53,7 +60,7 @@
import {getCurrentUserAccountID} from './Report';

const allTransactions: OnyxCollection<Transaction> = {};
Onyx.connect({

Check warning on line 63 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 @@ -65,7 +72,7 @@
});

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

Check warning on line 75 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 @@ -74,7 +81,7 @@
});

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

Check warning on line 84 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 @@ -86,7 +93,7 @@
});

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

Check warning on line 96 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 @@ -98,7 +105,7 @@
});

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

Check warning on line 108 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 @@ -1449,6 +1456,18 @@
return Object.values(draftTransactions ?? allTransactionDrafts ?? {}).filter((transaction): transaction is Transaction => !!transaction);
}

function getDuplicateTransactionDetails(transactionID?: string) {
if (!transactionID) {
return;
}

const parameters: GetDuplicateTransactionDetailsParams = {
transactionID,
};

API.read(READ_COMMANDS.GET_DUPLICATE_TRANSACTION_DETAILS, parameters);
}

export {
saveWaypoint,
removeWaypoint,
Expand All @@ -1467,4 +1486,5 @@
revert,
changeTransactionsReport,
setTransactionReport,
getDuplicateTransactionDetails,
};
9 changes: 8 additions & 1 deletion src/pages/TransactionDuplicate/Review.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import usePermissions from '@hooks/usePermissions';
import useThemeStyles from '@hooks/useThemeStyles';
import useTransactionViolations from '@hooks/useTransactionViolations';
import {openReport} from '@libs/actions/Report';
import {dismissDuplicateTransactionViolation} from '@libs/actions/Transaction';
import {dismissDuplicateTransactionViolation, getDuplicateTransactionDetails} from '@libs/actions/Transaction';
import {setActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation';
import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
Expand Down Expand Up @@ -110,6 +110,13 @@ function TransactionDuplicateReview() {
openReport(route.params.threadReportID);
}, [report?.reportID, route.params.threadReportID]);

useEffect(() => {
if (!transactionID) {
return;
}
getDuplicateTransactionDetails(transactionID);
}, [transactionID]);

const isLoadingPage = (!report?.reportID && reportMetadata?.isLoadingInitialReportActions !== false) || !reportAction?.reportActionID;

// eslint-disable-next-line rulesdir/no-negated-variables
Expand Down
Loading