Merge pull request #82147 from ZhenjaHorbach/revert-pr-79099

[CP Staging] Revert Handle the Distance and Rate fields for splits

(cherry picked from commit e0a6b4e)

(cherry-picked to staging by lakchote)

Author: lakchote

src/CONST/index.ts

@@ -1858,7 +1858,6 @@ const CONST = {
         STATE: {
             CURRENT: 'current',
             DRAFT: 'draft',
-            SPLIT_DRAFT: 'splitDraft',
             BACKUP: 'backup',
         },
         LIABILITY_TYPE: {
@@ -2970,8 +2969,6 @@ const CONST = {
         QUANTITY_MAX_LENGTH: 12,
         // This is the transactionID used when going through the create expense flow so that it mimics a real transaction (like the edit flow)
         OPTIMISTIC_TRANSACTION_ID: '1',
-        // This is the transactionID used when going through the distance split expense flow so that it mimics a draft transaction
-        OPTIMISTIC_DISTANCE_SPLIT_TRANSACTION_ID: '2',
         // Note: These payment types are used when building IOU reportAction message values in the server and should
         // not be changed.
         LOCATION_PERMISSION_PROMPT_THRESHOLD_DAYS: 7,

src/components/MoneyReportHeader.tsx

@@ -1377,7 +1377,7 @@ function MoneyReportHeader({
                     return;
                 }
 
-                initSplitExpense(allTransactions, allReports, currentTransaction, policy);
+                initSplitExpense(allTransactions, allReports, currentTransaction);
             },
         },
         [CONST.REPORT.SECONDARY_ACTIONS.MERGE]: {

src/components/MoneyRequestHeader.tsx

@@ -432,7 +432,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
             icon: expensifyIcons.ArrowSplit,
             value: CONST.REPORT.SECONDARY_ACTIONS.SPLIT,
             onSelected: () => {
-                initSplitExpense(allTransactions, allReports, transaction, policy);
+                initSplitExpense(allTransactions, allReports, transaction);
             },
         },
         [CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.MERGE]: {

src/components/ReportActionItem/MoneyRequestView.tsx

@@ -604,6 +604,11 @@ function MoneyRequestView({
                             return;
                         }
 
+                        if (isExpenseSplit && isSplitAvailable) {
+                            initSplitExpense(allTransactions, allReports, transaction);
+                            return;
+                        }
+
                         if (isOdometerDistanceRequest) {
                             Navigation.navigate(
                                 ROUTES.MONEY_REQUEST_STEP_DISTANCE_ODOMETER.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction.transactionID, transactionThreadReport.reportID),
@@ -652,6 +657,11 @@ function MoneyRequestView({
                             return;
                         }
 
+                        if (isExpenseSplit && isSplitAvailable) {
+                            initSplitExpense(allTransactions, allReports, transaction);
+                            return;
+                        }
+
                         Navigation.navigate(
                             ROUTES.MONEY_REQUEST_STEP_DISTANCE_RATE.getRoute(
                                 CONST.IOU.ACTION.EDIT,
@@ -840,7 +850,7 @@ function MoneyRequestView({
                             }
 
                             if (isExpenseSplit && isSplitAvailable) {
-                                initSplitExpense(allTransactions, allReports, transaction, policy);
+                                initSplitExpense(allTransactions, allReports, transaction);
                                 return;
                             }
 

src/hooks/useSelectedTransactionsActions.ts

@@ -370,7 +370,7 @@ function useSelectedTransactionsActions({
                 icon: expensifyIcons.ArrowSplit,
                 value: SPLIT,
                 onSelected: () => {
-                    initSplitExpense(allTransactions, allReports, firstTransaction, policy);
+                    initSplitExpense(allTransactions, allReports, firstTransaction);
                 },
             });
         }

src/libs/API/parameters/SplitTransactionParams.ts

@@ -1,4 +1,4 @@
-import type {Comment, WaypointCollection} from '@src/types/onyx/Transaction';
+import type {Comment} from '@src/types/onyx/Transaction';
 
 type SplitTransactionSplitParam = {
     transactionID: string;
@@ -14,11 +14,6 @@ type SplitTransactionSplitParam = {
     reimbursable?: boolean;
     billable?: boolean;
     reportID?: string;
-    quantity?: number;
-    customUnitRateID?: string;
-    odometerStart?: number;
-    odometerEnd?: number;
-    waypoints?: WaypointCollection;
 };
 
 type SplitTransactionSplitsParam = SplitTransactionSplitParam[];

src/libs/API/types.ts

@@ -1157,7 +1157,6 @@ const READ_COMMANDS = {
     GRAPHITE: 'Graphite',
     GET_ROUTE: 'GetRoute',
     GET_ROUTE_FOR_DRAFT: 'GetRouteForDraft',
-    GET_ROUTE_FOR_SPLIT_DRAFT: 'GetRouteForSplitDraft',
     GET_ROUTE_FOR_BACKUP: 'GetRouteForBackup',
     GET_STATEMENT_PDF: 'GetStatementPDF',
     OPEN_ONFIDO_FLOW: 'OpenOnfidoFlow',
@@ -1242,7 +1241,6 @@ type ReadCommandParameters = {
     [READ_COMMANDS.GRAPHITE]: Parameters.GraphiteParams;
     [READ_COMMANDS.GET_ROUTE]: Parameters.GetRouteParams;
     [READ_COMMANDS.GET_ROUTE_FOR_DRAFT]: Parameters.GetRouteParams;
-    [READ_COMMANDS.GET_ROUTE_FOR_SPLIT_DRAFT]: Parameters.GetRouteParams;
     [READ_COMMANDS.GET_ROUTE_FOR_BACKUP]: Parameters.GetRouteParams;
     [READ_COMMANDS.GET_STATEMENT_PDF]: Parameters.GetStatementPDFParams;
     [READ_COMMANDS.OPEN_ONFIDO_FLOW]: null;

src/libs/TransactionUtils/index.ts

@@ -75,7 +75,6 @@ import type {OnyxData} from '@src/types/onyx/Request';
 import type {
     Comment,
     Receipt,
-    Routes,
     TransactionChanges,
     TransactionCustomUnit,
     TransactionPendingFieldsKey,
@@ -114,17 +113,13 @@ type TransactionParams = {
     splitsStartDate?: string;
     splitsEndDate?: string;
     distance?: number;
-    customUnitRateID?: string;
-    waypoints?: WaypointCollection;
     odometerStart?: number;
     odometerEnd?: number;
-    routes?: Routes;
     gpsCoordinates?: string;
     type?: ValueOf<typeof CONST.TRANSACTION.TYPE>;
     count?: number;
     rate?: number;
     unit?: ValueOf<typeof CONST.TIME_TRACKING.UNIT>;
-    commentType?: ValueOf<typeof CONST.TRANSACTION.TYPE>;
 };
 
 type BuildOptimisticTransactionParams = {
@@ -474,16 +469,12 @@ function buildOptimisticTransaction(params: BuildOptimisticTransactionParams): T
         splitExpensesTotal,
         participants,
         pendingAction = CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-        customUnitRateID,
-        waypoints,
         odometerStart,
         odometerEnd,
-        routes,
         type,
         count,
         rate,
         unit,
-        commentType,
     } = transactionParams;
     // transactionIDs are random, positive, 64-bit numeric strings.
     // Because JS can only handle 53-bit numbers, transactionIDs are strings in the front-end (just like reportActionID)
@@ -517,28 +508,14 @@ function buildOptimisticTransaction(params: BuildOptimisticTransactionParams): T
     if (splitExpensesTotal) {
         commentJSON.splitExpensesTotal = splitExpensesTotal;
     }
-    if (waypoints) {
-        commentJSON.waypoints = waypoints;
-    }
-    if (commentType) {
-        commentJSON.type = commentType;
-    }
 
-    const isMapDistanceTransaction = !!pendingFields?.waypoints || existingTransaction?.comment?.waypoints?.waypoint0;
+    const isMapDistanceTransaction = !!pendingFields?.waypoints;
     const isManualDistanceTransaction = isManualDistanceRequest(existingTransaction);
     const isOdometerDistanceTransaction = isOdometerDistanceRequest(existingTransaction);
     if (isMapDistanceTransaction || isManualDistanceTransaction || isOdometerDistanceTransaction) {
-        // If customUnit is provided (e.g., for split expenses), use it directly
-        // Otherwise, build customUnit from distance parameter
-        if (customUnit) {
-            lodashSet(commentJSON, 'customUnit', customUnit);
-        } else {
-            // Set the distance unit, which comes from the policy distance unit or the P2P rate data
-            lodashSet(commentJSON, 'customUnit.distanceUnit', DistanceRequestUtils.getUpdatedDistanceUnit({transaction: existingTransaction, policy}));
-            lodashSet(commentJSON, 'customUnit.quantity', distance);
-            lodashSet(commentJSON, 'customUnit.customUnitRateID', customUnitRateID);
-            lodashSet(commentJSON, 'customUnit.name', existingTransaction?.comment?.customUnit?.name ?? CONST.CUSTOM_UNITS.NAME_DISTANCE);
-        }
+        // Set the distance unit, which comes from the policy distance unit or the P2P rate data
+        lodashSet(commentJSON, 'customUnit.distanceUnit', DistanceRequestUtils.getUpdatedDistanceUnit({transaction: existingTransaction, policy}));
+        lodashSet(commentJSON, 'customUnit.quantity', distance);
     }
 
     const isPerDiemTransaction = !!pendingFields?.subRates;
@@ -583,9 +560,6 @@ function buildOptimisticTransaction(params: BuildOptimisticTransactionParams): T
         cardID: existingTransaction?.cardID,
         cardName: existingTransaction?.cardName,
         cardNumber: existingTransaction?.cardNumber,
-        // Use conditional spread to avoid creating the key if it's undefined, which would break lodashHas checks.
-        ...(existingTransaction?.iouRequestType ? {iouRequestType: existingTransaction.iouRequestType} : {}),
-        routes,
     };
 }
 
@@ -692,14 +666,12 @@ function getUpdatedTransaction({
     isFromExpenseReport,
     shouldUpdateReceiptState = true,
     policy = undefined,
-    isDraftSplitTransaction = false,
 }: {
     transaction: Transaction;
     transactionChanges: TransactionChanges;
     isFromExpenseReport: boolean;
     shouldUpdateReceiptState?: boolean;
     policy?: OnyxEntry<Policy>;
-    isDraftSplitTransaction?: boolean;
 }): Transaction {
     const isUnReportedExpense = transaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID;
 
@@ -734,10 +706,7 @@ function getUpdatedTransaction({
 
     if (Object.hasOwn(transactionChanges, 'waypoints')) {
         updatedTransaction.modifiedWaypoints = transactionChanges.waypoints;
-        // For draft split transactions, we don't want to set isLoading to true as all the split transactions are in draft state
-        if (!isDraftSplitTransaction) {
-            updatedTransaction.isLoading = true;
-        }
+        updatedTransaction.isLoading = true;
         shouldStopSmartscan = true;
 
         if (!transactionChanges.routes?.route0?.geometry?.coordinates) {
@@ -772,10 +741,6 @@ function getUpdatedTransaction({
         }
     }
 
-    if (Object.hasOwn(transactionChanges, 'routes')) {
-        updatedTransaction.routes = transactionChanges.routes;
-    }
-
     if (Object.hasOwn(transactionChanges, 'customUnitRateID')) {
         lodashSet(updatedTransaction, 'comment.customUnit.customUnitRateID', transactionChanges.customUnitRateID);
         lodashSet(updatedTransaction, 'comment.customUnit.defaultP2PRate', null);