[CP Staging] Revert "Merge pull request #77207 from DylanDylann/remove-candelete"

src/components/Search/index.tsx

@@ -107,6 +107,7 @@ function mapTransactionItemToSelectedEntry(
         item.keyForList,
         {
             isSelected: true,
+            canDelete: item.canDelete,
             canReject: canRejectRequest,
             canHold: canHoldRequest,
             isHeld: isOnHold(item),
@@ -199,6 +200,7 @@ function prepareTransactionsList(
         ...selectedTransactions,
         [item.keyForList]: {
             isSelected: true,
+            canDelete: item.canDelete,
             canReject: canRejectRequest,
             canHold: canHoldRequest,
             isHeld: isOnHold(item),
@@ -544,6 +546,7 @@ function Search({
                         ),
                         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                         isSelected: areAllMatchingItemsSelected || selectedTransactions[transactionItem.transactionID]?.isSelected || isExpenseReportType,
+                        canDelete: transactionItem.canDelete,
                         canReject: canRejectRequest,
                         reportID: transactionItem.reportID,
                         policyID: transactionItem.report?.policyID,
@@ -595,6 +598,7 @@ function Search({
                     ),
                     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                     isSelected: areAllMatchingItemsSelected || selectedTransactions[transactionItem.transactionID].isSelected,
+                    canDelete: transactionItem.canDelete,
                     canReject: canRejectRequest,
                     reportID: transactionItem.reportID,
                     policyID: transactionItem.report?.policyID,

src/components/Search/types.ts

@@ -11,6 +11,9 @@ type SelectedTransactionInfo = {
     /** Whether the transaction is selected */
     isSelected: boolean;
 
+    /** If the transaction can be deleted */
+    canDelete: boolean;
+
     /** If the transaction can be rejected */
     canReject: boolean;
 

src/libs/SearchUIUtils.ts

@@ -2839,6 +2839,7 @@ function getTransactionFromTransactionListItem(item: TransactionListItemType): O
         isTaxAmountColumnWide,
         violations,
         hash,
+        canDelete,
         accountID,
         policyID,
         ...transaction

src/pages/Search/SearchPage.tsx

@@ -60,9 +60,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SearchFullscreenNavigatorParamList} from '@libs/Navigation/types';
 import {getActiveAdminWorkspaces, hasDynamicExternalWorkflow, hasOnlyPersonalPolicies as hasOnlyPersonalPoliciesUtil, isPaidGroupPolicy} from '@libs/PolicyUtils';
-import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils';
 import {
-    canDeleteMoneyRequestReport,
     generateReportID,
     getPolicyExpenseChat,
     getReportOrDraftReport,
@@ -677,24 +675,7 @@ function SearchPage({route}: SearchPageProps) {
             });
         }
 
-        const shouldShowDeleteOption =
-            !isOffline &&
-            selectedTransactionsKeys.every((id) => {
-                const transaction = currentSearchResults?.data?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${id}`];
-                if (!transaction) {
-                    return false;
-                }
-                const parentReportID = transaction.reportID;
-                const parentReport = currentSearchResults?.data?.[`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`];
-                if (!parentReport) {
-                    return false;
-                }
-                const reportActions = currentSearchResults?.data?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`];
-                const parentReportAction = Object.values(reportActions ?? {}).find(
-                    (action) => (isMoneyRequestAction(action) ? getOriginalMessage(action)?.IOUTransactionID : undefined) === transaction.transactionID,
-                );
-                return canDeleteMoneyRequestReport(parentReport, [transaction], parentReportAction ? [parentReportAction] : []);
-            });
+        const shouldShowDeleteOption = !isOffline && selectedTransactionsKeys.every((id) => selectedTransactions[id].canDelete);
 
         if (shouldShowDeleteOption) {
             options.push({
@@ -741,16 +722,15 @@ function SearchPage({route}: SearchPageProps) {
         status,
         hash,
         selectedTransactions,
-        expensifyIcons,
         translate,
         areAllMatchingItemsSelected,
         isOffline,
         selectedReports,
-        queryJSON,
+        selectedTransactionReportIDs,
         lastPaymentMethods,
         selectedReportIDs,
         allTransactions,
-        selectedTransactionReportIDs,
+        queryJSON,
         selectedPolicyIDs,
         policies,
         integrationsExportTemplates,
@@ -760,14 +740,14 @@ function SearchPage({route}: SearchPageProps) {
         dismissedRejectUseExplanation,
         bulkPayButtonOptions,
         onBulkPaySelected,
-        areAllTransactionsFromSubmitter,
-        dismissedHoldUseExplanation,
         allReports,
-        currentSearchResults?.data,
         theme.icon,
         styles.colorMuted,
         styles.fontWeightNormal,
         styles.textWrap,
+        expensifyIcons,
+        dismissedHoldUseExplanation,
+        areAllTransactionsFromSubmitter,
     ]);
 
     const handleDeleteExpenses = () => {

src/types/onyx/SearchResults.ts

@@ -86,6 +86,9 @@ type SearchTransaction = {
     /** The transaction amount */
     amount: number;
 
+    /** If the transaction can be deleted */
+    canDelete: boolean;
+
     /** The edited transaction amount */
     modifiedAmount: number;
 

tests/unit/MoneyRequestReportUtilsTest.ts

@@ -57,6 +57,7 @@ const transactionItemBaseMock: TransactionListItemType = {
     policy: policyBaseMock,
     reportAction: reportActionBaseMock,
     holdReportAction: undefined,
+    canDelete: true,
     cardID: undefined,
     cardName: undefined,
     category: '',

tests/unit/Search/SearchUIUtilsTest.ts

@@ -390,6 +390,7 @@ const searchResults: OnyxTypes.SearchResults = {
         [`report_${reportID5}`]: report5,
         [`transactions_${transactionID}`]: {
             amount: -5000,
+            canDelete: true,
             cardID: undefined,
             cardName: undefined,
             category: '',
@@ -419,6 +420,7 @@ const searchResults: OnyxTypes.SearchResults = {
         },
         [`transactions_${transactionID2}`]: {
             amount: -5000,
+            canDelete: true,
             cardID: undefined,
             cardName: undefined,
             category: '',
@@ -449,6 +451,7 @@ const searchResults: OnyxTypes.SearchResults = {
         ...allViolations,
         [`transactions_${transactionID3}`]: {
             amount: 1200,
+            canDelete: true,
             cardID: undefined,
             cardName: undefined,
             category: '',
@@ -478,6 +481,7 @@ const searchResults: OnyxTypes.SearchResults = {
         },
         [`transactions_${transactionID4}`]: {
             amount: 3200,
+            canDelete: true,
             cardID: undefined,
             cardName: undefined,
             category: '',
@@ -763,6 +767,7 @@ const transactionsListItems = [
         policy,
         reportAction: reportAction1,
         holdReportAction: undefined,
+        canDelete: true,
         cardID: undefined,
         cardName: undefined,
         category: '',
@@ -818,6 +823,7 @@ const transactionsListItems = [
         policy,
         reportAction: reportAction2,
         holdReportAction: undefined,
+        canDelete: true,
         cardID: undefined,
         cardName: undefined,
         category: '',
@@ -883,6 +889,7 @@ const transactionsListItems = [
         policy,
         reportAction: reportAction3,
         holdReportAction: undefined,
+        canDelete: true,
         cardID: undefined,
         cardName: undefined,
         category: '',
@@ -943,6 +950,7 @@ const transactionsListItems = [
         policy,
         reportAction: reportAction4,
         holdReportAction: undefined,
+        canDelete: true,
         cardID: undefined,
         cardName: undefined,
         category: '',
@@ -1042,6 +1050,7 @@ const transactionReportGroupListItems = [
                 reportAction: reportAction1,
                 holdReportAction: undefined,
                 amount: -5000,
+                canDelete: true,
                 cardID: undefined,
                 cardName: undefined,
                 category: '',
@@ -1142,6 +1151,7 @@ const transactionReportGroupListItems = [
                 reportAction: reportAction2,
                 holdReportAction: undefined,
                 amount: -5000,
+                canDelete: true,
                 cardID: undefined,
                 cardName: undefined,
                 category: '',
@@ -1258,6 +1268,7 @@ const transactionReportGroupListItems = [
                 policy,
                 reportAction: reportAction3,
                 holdReportAction: undefined,
+                canDelete: true,
                 cardID: undefined,
                 cardName: undefined,
                 category: '',
@@ -1316,6 +1327,7 @@ const transactionReportGroupListItems = [
                 policy,
                 reportAction: reportAction4,
                 holdReportAction: undefined,
+                canDelete: true,
                 cardID: undefined,
                 cardName: undefined,
                 category: '',
@@ -1849,7 +1861,7 @@ describe('SearchUIUtils', () => {
             expect(distanceTransaction).toBeDefined();
             expect(distanceTransaction?.iouRequestType).toBe(CONST.IOU.REQUEST_TYPE.DISTANCE);
 
-            const expectedPropertyCount = 49;
+            const expectedPropertyCount = 50;
             expect(Object.keys(distanceTransaction ?? {}).length).toBe(expectedPropertyCount);
         });
 
@@ -1882,7 +1894,7 @@ describe('SearchUIUtils', () => {
             expect(distanceTransaction).toBeDefined();
             expect(distanceTransaction?.iouRequestType).toBe(CONST.IOU.REQUEST_TYPE.DISTANCE);
 
-            const expectedPropertyCount = 47;
+            const expectedPropertyCount = 48;
             expect(Object.keys(distanceTransaction ?? {}).length).toBe(expectedPropertyCount);
         });
 
@@ -2474,6 +2486,7 @@ describe('SearchUIUtils', () => {
                     // eslint-disable-next-line @typescript-eslint/naming-convention
                     transactions_1805965960759424086: {
                         amount: 0,
+                        canDelete: false,
                         category: 'Employee Meals Remote (Fringe Benefit)',
                         comment: {
                             comment: '',
@@ -2596,6 +2609,7 @@ describe('SearchUIUtils', () => {
                 // eslint-disable-next-line @typescript-eslint/naming-convention
                 transactions_1805965960759424086: {
                     amount: 0,
+                    canDelete: false,
                     cardID: undefined,
                     cardName: undefined,
                     category: 'Employee Meals Remote (Fringe Benefit)',

tests/unit/Search/handleActionButtonPressTest.ts

@@ -96,6 +96,7 @@ const mockReportItemWithHold = {
             action: 'view',
             allActions: ['view'],
             amount: -1200,
+            canDelete: true,
             category: '',
             comment: {
                 comment: '',
@@ -188,6 +189,7 @@ const mockReportItemWithHold = {
             action: 'view',
             allActions: ['view'],
             amount: -12300,
+            canDelete: true,
             category: '',
             comment: {
                 comment: '',

tests/unit/TransactionGroupListItemTest.tsx

@@ -26,6 +26,7 @@ jest.mock('@libs/SearchUIUtils', () => ({
 const mockTransaction: TransactionListItemType = {
     accountID: 1,
     amount: 0,
+    canDelete: true,
     category: '',
     groupAmount: 1284,
     groupCurrency: 'USD',