🍒 Cherry pick PR #77787 to staging 🍒

android/app/build.gradle

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009027807
-        versionName "9.2.78-7"
+        versionCode 1009027808
+        versionName "9.2.78-8"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

ios/NewExpensify/Info.plist

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.2.78.7</string>
+	<string>9.2.78.8</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.2.78</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.78.7</string>
+	<string>9.2.78.8</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/ShareViewController/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.2.78</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.78.7</string>
+	<string>9.2.78.8</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.2.78-7",
+  "version": "9.2.78-8",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/components/Search/index.tsx

@@ -106,6 +106,7 @@ function mapTransactionItemToSelectedEntry(
         item.keyForList,
         {
             isSelected: true,
+            canDelete: item.canDelete,
             canReject: canRejectRequest,
             canHold: canHoldRequest,
             isHeld: isOnHold(item),
@@ -198,6 +199,7 @@ function prepareTransactionsList(
         ...selectedTransactions,
         [item.keyForList]: {
             isSelected: true,
+            canDelete: item.canDelete,
             canReject: canRejectRequest,
             canHold: canHoldRequest,
             isHeld: isOnHold(item),
@@ -541,6 +543,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,
@@ -592,6 +595,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

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

src/pages/Search/SearchPage.tsx

@@ -59,10 +59,8 @@ import {navigateToParticipantPage} from '@libs/IOUUtils';
 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, hasVBBA, isPaidGroupPolicy} from '@libs/PolicyUtils';
-import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils';
+import {getActiveAdminWorkspaces, hasDynamicExternalWorkflow, hasOnlyPersonalPolicies as hasOnlyPersonalPoliciesUtil, isPaidGroupPolicy} from '@libs/PolicyUtils';
 import {
-    canDeleteMoneyRequestReport,
     generateReportID,
     getPolicyExpenseChat,
     getReportOrDraftReport,
@@ -671,24 +669,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({
@@ -735,16 +716,15 @@ function SearchPage({route}: SearchPageProps) {
         status,
         hash,
         selectedTransactions,
-        expensifyIcons,
         translate,
         areAllMatchingItemsSelected,
         isOffline,
         selectedReports,
-        queryJSON,
+        selectedTransactionReportIDs,
         lastPaymentMethods,
         selectedReportIDs,
         allTransactions,
-        selectedTransactionReportIDs,
+        queryJSON,
         selectedPolicyIDs,
         policies,
         integrationsExportTemplates,
@@ -754,14 +734,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

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