Merge pull request Expensify#73227 from Expensify/revert-73186-72485-fixes

inimaga · web-flow · commit 4560ae0610ea · 2025-10-22T16:32:15.000+01:00
Revert "Update create report logic while moving expenses" &amp; "Allow admin and report managers to move expenses"
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
@@ -21,8 +21,8 @@ import useSearchHighlightAndScroll from '@hooks/useSearchHighlightAndScroll';
 import useSearchShouldCalculateTotals from '@hooks/useSearchShouldCalculateTotals';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {turnOffMobileSelectionMode, turnOnMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
-import type {TransactionPreviewData} from '@libs/actions/Search';
 import {openSearch, setOptimisticDataForTransactionThreadPreview} from '@libs/actions/Search';
+import type {TransactionPreviewData} from '@libs/actions/Search';
 import Timing from '@libs/actions/Timing';
 import {canUseTouchScreen} from '@libs/DeviceCapabilities';
 import Log from '@libs/Log';
@@ -115,7 +115,6 @@ function mapTransactionItemToSelectedEntry(
             isFromOneTransactionReport: item.isFromOneTransactionReport,
             convertedCurrency: item.convertedCurrency,
             currency: item.currency,
-            ownerAccountID: item.report?.ownerAccountID ?? item.accountID,
         },
     ];
 }
@@ -198,7 +197,6 @@ function prepareTransactionsList(
             convertedCurrency: item.convertedCurrency,
             currency: item.currency,
             isFromOneTransactionReport: item.isFromOneTransactionReport,
-            ownerAccountID: item.report?.ownerAccountID ?? item.accountID,
         },
     };
 }
diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
@@ -49,9 +49,6 @@ type SelectedTransactionInfo = {
 
     /** Whether it is the only expense of the parent expense report */
     isFromOneTransactionReport?: boolean;
-
-    /** Account ID of the report owner */
-    ownerAccountID?: number;
 };
 
 /** Model of selected transactions */
diff --git a/src/hooks/useSelectedTransactionsActions.ts b/src/hooks/useSelectedTransactionsActions.ts
@@ -15,7 +15,6 @@ import {
     canEditFieldOfMoneyRequest,
     canHoldUnholdReportAction,
     canUserPerformWriteAction as canUserPerformWriteActionReportUtils,
-    getReportOrDraftReport,
     isArchivedReport,
     isInvoiceReport,
     isMoneyRequestReport as isMoneyRequestReportUtils,
@@ -59,7 +58,7 @@ function useSelectedTransactionsActions({
     beginExportWithTemplate: (templateName: string, templateType: string, transactionIDList: string[], policyID?: string) => void;
 }) {
     const {isOffline} = useNetworkWithOfflineStatus();
-    const {selectedTransactionIDs, clearSelectedTransactions, selectedTransactions: selectedTransactionsMeta} = useSearchContext();
+    const {selectedTransactionIDs, clearSelectedTransactions} = useSearchContext();
     const [allTransactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {canBeMissing: false});
     const [outstandingReportsByPolicyID] = useOnyx(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID, {canBeMissing: true});
     const [lastVisitedPath] = useOnyx(ONYXKEYS.LAST_VISITED_PATH, {canBeMissing: true});
@@ -70,7 +69,7 @@ function useSelectedTransactionsActions({
 
     const {duplicateTransactions, duplicateTransactionViolations} = useDuplicateTransactionsAndViolations(selectedTransactionIDs);
     const isReportArchived = useReportIsArchived(report?.reportID);
-    const selectedTransactionsList = useMemo(
+    const selectedTransactions = useMemo(
         () =>
             selectedTransactionIDs.reduce((acc, transactionID) => {
                 const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
@@ -81,48 +80,6 @@ function useSelectedTransactionsActions({
             }, [] as Transaction[]),
         [allTransactions, selectedTransactionIDs],
     );
-    const hasTransactionsFromMultipleOwners = useMemo(() => {
-        const knownOwnerIDs = new Set<number>();
-        let hasUnknownOwner = false;
-
-        for (const selectedTransactionInfo of Object.values(selectedTransactionsMeta ?? {})) {
-            const ownerAccountID = selectedTransactionInfo?.ownerAccountID;
-            if (typeof ownerAccountID === 'number') {
-                knownOwnerIDs.add(ownerAccountID);
-                if (knownOwnerIDs.size > 1) {
-                    return true;
-                }
-            } else {
-                hasUnknownOwner = true;
-            }
-        }
-
-        for (const selectedTransaction of selectedTransactionsList) {
-            const reportID = selectedTransaction?.reportID;
-            if (!reportID || reportID === CONST.REPORT.UNREPORTED_REPORT_ID) {
-                hasUnknownOwner = true;
-                continue;
-            }
-
-            const parentReport = getReportOrDraftReport(reportID);
-            const ownerAccountID = parentReport?.ownerAccountID;
-
-            if (typeof ownerAccountID === 'number') {
-                knownOwnerIDs.add(ownerAccountID);
-                if (knownOwnerIDs.size > 1) {
-                    return true;
-                }
-            } else {
-                hasUnknownOwner = true;
-            }
-        }
-
-        if (hasUnknownOwner) {
-            return knownOwnerIDs.size > 0 || selectedTransactionIDs.length > 1;
-        }
-
-        return false;
-    }, [selectedTransactionsList, selectedTransactionsMeta, selectedTransactionIDs]);
 
     const {translate} = useLocalize();
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
@@ -214,10 +171,10 @@ function useSelectedTransactionsActions({
         const options = [];
         const isMoneyRequestReport = isMoneyRequestReportUtils(report);
         const isReportReimbursed = report?.stateNum === CONST.REPORT.STATE_NUM.APPROVED && report?.statusNum === CONST.REPORT.STATUS_NUM.REIMBURSED;
-        let canHoldTransactions = selectedTransactionsList.length > 0 && isMoneyRequestReport && !isReportReimbursed;
-        let canUnholdTransactions = selectedTransactionsList.length > 0 && isMoneyRequestReport;
+        let canHoldTransactions = selectedTransactions.length > 0 && isMoneyRequestReport && !isReportReimbursed;
+        let canUnholdTransactions = selectedTransactions.length > 0 && isMoneyRequestReport;
 
-        selectedTransactionsList.forEach((selectedTransaction) => {
+        selectedTransactions.forEach((selectedTransaction) => {
             if (!canHoldTransactions && !canUnholdTransactions) {
                 return;
             }
@@ -314,7 +271,7 @@ function useSelectedTransactionsActions({
             subMenuItems: getExportOptions(),
         });
 
-        const canSelectedExpensesBeMoved = selectedTransactionsList.every((transaction) => {
+        const canSelectedExpensesBeMoved = selectedTransactions.every((transaction) => {
             if (!transaction) {
                 return false;
             }
@@ -325,7 +282,7 @@ function useSelectedTransactionsActions({
         });
 
         const canUserPerformWriteAction = canUserPerformWriteActionReportUtils(report, isReportArchived);
-        if (canSelectedExpensesBeMoved && canUserPerformWriteAction && !hasTransactionsFromMultipleOwners) {
+        if (canSelectedExpensesBeMoved && canUserPerformWriteAction) {
             options.push({
                 text: translate('iou.moveExpenses', {count: selectedTransactionIDs.length}),
                 icon: Expensicons.DocumentMerge,
@@ -339,14 +296,14 @@ function useSelectedTransactionsActions({
         }
 
         // In phase 1, we only show merge action if report is eligible for merge and only one transaction is selected
-        const canMergeTransaction = selectedTransactionsList.length === 1 && report && isMergeAction(report, selectedTransactionsList, policy);
+        const canMergeTransaction = selectedTransactions.length === 1 && report && isMergeAction(report, selectedTransactions, policy);
         if (canMergeTransaction) {
             options.push({
                 text: translate('common.merge'),
                 icon: Expensicons.ArrowCollapse,
                 value: MERGE,
                 onSelected: () => {
-                    const targetTransaction = selectedTransactionsList.at(0);
+                    const targetTransaction = selectedTransactions.at(0);
 
                     if (!report || !targetTransaction) {
                         return;
@@ -358,7 +315,7 @@ function useSelectedTransactionsActions({
             });
         }
 
-        const canAllSelectedTransactionsBeRemoved = selectedTransactionsList.every((transaction) => {
+        const canAllSelectedTransactionsBeRemoved = Object.values(selectedTransactions).every((transaction) => {
             const canRemoveTransaction = canDeleteCardTransactionByLiabilityType(transaction);
             const action = getIOUActionForTransactionID(reportActions, transaction.transactionID);
             const isActionDeleted = isDeletedAction(action);
@@ -381,7 +338,7 @@ function useSelectedTransactionsActions({
     }, [
         selectedTransactionIDs,
         report,
-        selectedTransactionsList,
+        selectedTransactions,
         translate,
         isReportArchived,
         policy,
@@ -399,7 +356,6 @@ function useSelectedTransactionsActions({
         lastVisitedPath,
         session?.accountID,
         showDeleteModal,
-        hasTransactionsFromMultipleOwners,
     ]);
 
     return {
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -4594,7 +4594,7 @@ function canEditFieldOfMoneyRequest(
             Object.values(allPolicies ?? {}).flatMap((currentPolicy) =>
                 getOutstandingReportsForUser(currentPolicy?.id, moneyRequestReport?.ownerAccountID, outstandingReportsByPolicyID?.[currentPolicy?.id ?? CONST.DEFAULT_NUMBER_ID] ?? {}),
             ).length > 1 ||
-            ((isOwner || isAdmin || isManager) && isReportOutstanding(moneyRequestReport, moneyRequestReport.policyID))
+            (isOwner && isReportOutstanding(moneyRequestReport, moneyRequestReport.policyID))
         );
     }
 
diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx
@@ -57,7 +57,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {SearchFullscreenNavigatorParamList} from '@libs/Navigation/types';
 import {getActiveAdminWorkspaces, hasVBBA, isPaidGroupPolicy} from '@libs/PolicyUtils';
-import {generateReportID, getPolicyExpenseChat, getReportOrDraftReport, isExpenseReport as isExpenseReportUtil, isIOUReport as isIOUReportUtil} from '@libs/ReportUtils';
+import {generateReportID, getPolicyExpenseChat, isExpenseReport as isExpenseReportUtil, isIOUReport as isIOUReportUtil} from '@libs/ReportUtils';
 import {buildCannedSearchQuery, buildSearchQueryJSON} from '@libs/SearchQueryUtils';
 import {shouldRestrictUserBillableActions} from '@libs/SubscriptionUtils';
 import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
@@ -452,28 +452,9 @@ function SearchPage({route}: SearchPageProps) {
             });
         }
 
-        const ownerAccountIDs = new Set<number>();
-        let hasUnknownOwner = false;
-        for (const id of selectedTransactionsKeys) {
-            const transactionEntry = selectedTransactions[id];
-            if (!transactionEntry) {
-                continue;
-            }
-            const ownerAccountID = transactionEntry.ownerAccountID ?? getReportOrDraftReport(transactionEntry.reportID)?.ownerAccountID;
-            if (typeof ownerAccountID === 'number') {
-                ownerAccountIDs.add(ownerAccountID);
-                if (ownerAccountIDs.size > 1) {
-                    break;
-                }
-            } else {
-                hasUnknownOwner = true;
-            }
-        }
-        const hasMultipleOwners = ownerAccountIDs.size > 1 || (hasUnknownOwner && (ownerAccountIDs.size > 0 || selectedTransactionsKeys.length > 1));
-
         const canAllTransactionsBeMoved = selectedTransactionsKeys.every((id) => selectedTransactions[id].canChangeReport);
 
-        if (canAllTransactionsBeMoved && !hasMultipleOwners) {
+        if (canAllTransactionsBeMoved) {
             options.push({
                 text: translate('iou.moveExpenses', {count: selectedTransactionsKeys.length}),
                 icon: Expensicons.DocumentMerge,
diff --git a/src/pages/Search/SearchTransactionsChangeReport.tsx b/src/pages/Search/SearchTransactionsChangeReport.tsx
@@ -10,7 +10,7 @@ import {createNewReport} from '@libs/actions/Report';
 import {changeTransactionsReport} from '@libs/actions/Transaction';
 import Navigation from '@libs/Navigation/Navigation';
 import Permissions from '@libs/Permissions';
-import {getReportOrDraftReport, hasViolations as hasViolationsReportUtils} from '@libs/ReportUtils';
+import {hasViolations as hasViolationsReportUtils} from '@libs/ReportUtils';
 import {shouldRestrictUserBillableActions} from '@libs/SubscriptionUtils';
 import IOURequestEditReportCommon from '@pages/iou/request/step/IOURequestEditReportCommon';
 import CONST from '@src/CONST';
@@ -42,30 +42,6 @@ function SearchTransactionsChangeReport() {
         Object.values(selectedTransactions).every((transaction) => transaction.reportID === firstTransactionReportID) && firstTransactionReportID !== CONST.REPORT.UNREPORTED_REPORT_ID
             ? firstTransactionReportID
             : undefined;
-    const areAllTransactionsUnreported =
-        selectedTransactionsKeys.length > 0 && selectedTransactionsKeys.every((transactionKey) => selectedTransactions[transactionKey]?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID);
-    const targetOwnerAccountID = useMemo(() => {
-        if (selectedTransactionsKeys.length === 0) {
-            return undefined;
-        }
-
-        // Prefer owner metadata attached to each selection (handles unreported expenses)
-        const ownerFromSelection = selectedTransactionsKeys.map((transactionKey) => selectedTransactions[transactionKey]?.ownerAccountID).find((ownerID) => typeof ownerID === 'number');
-        if (ownerFromSelection !== undefined) {
-            return ownerFromSelection;
-        }
-
-        const reportIDWithOwner = selectedTransactionsKeys
-            .map((transactionKey) => selectedTransactions[transactionKey]?.reportID)
-            .find((reportID) => reportID && reportID !== CONST.REPORT.UNREPORTED_REPORT_ID);
-
-        if (!reportIDWithOwner) {
-            return undefined;
-        }
-
-        const report = getReportOrDraftReport(reportIDWithOwner);
-        return report?.ownerAccountID;
-    }, [selectedTransactions, selectedTransactionsKeys]);
 
     const createReport = () => {
         if (shouldSelectPolicy) {
@@ -133,8 +109,6 @@ function SearchTransactionsChangeReport() {
             removeFromReport={removeFromReport}
             createReport={createReport}
             isEditing
-            isUnreported={areAllTransactionsUnreported}
-            targetOwnerAccountID={targetOwnerAccountID}
         />
     );
 }
diff --git a/src/pages/iou/request/step/IOURequestEditReportCommon.tsx b/src/pages/iou/request/step/IOURequestEditReportCommon.tsx

Original file line number	Diff line number	Diff line change
`@@ -4594,7 +4594,7 @@ function canEditFieldOfMoneyRequest(`
`4594`	`4594`	`Object.values(allPolicies ?? {}).flatMap((currentPolicy) =>`
`4595`	`4595`	`getOutstandingReportsForUser(currentPolicy?.id, moneyRequestReport?.ownerAccountID, outstandingReportsByPolicyID?.[currentPolicy?.id ?? CONST.DEFAULT_NUMBER_ID] ?? {}),`
`4596`	`4596`	`).length > 1 \|\|`
`4597`		`- ((isOwner \|\| isAdmin \|\| isManager) && isReportOutstanding(moneyRequestReport, moneyRequestReport.policyID))`
	`4597`	`+ (isOwner && isReportOutstanding(moneyRequestReport, moneyRequestReport.policyID))`
`4598`	`4598`	`);`
`4599`	`4599`	`}`
`4600`	`4600`