fix: reimplement merchant clearing logic using wasMerchantCleared Expensify#63587

Author: ganzz4

src/libs/TransactionUtils/index.ts

@@ -420,6 +420,10 @@ function getUpdatedTransaction({
         shouldStopSmartscan = true;
     }
 
+    if (Object.hasOwn(transactionChanges, 'wasMerchantCleared')) {
+        updatedTransaction.wasMerchantCleared = transactionChanges.wasMerchantCleared;
+    }
+
     if (Object.hasOwn(transactionChanges, 'waypoints')) {
         updatedTransaction.modifiedWaypoints = transactionChanges.waypoints;
         updatedTransaction.isLoading = true;
@@ -665,8 +669,12 @@ function isFetchingWaypointsFromServer(transaction: OnyxInputOrEntry<Transaction
  * Return the merchant field from the transaction, return the modifiedMerchant if present.
  */
 function getMerchant(transaction: OnyxInputOrEntry<Transaction>, policyParam: OnyxEntry<Policy> = undefined): string {
-    if (transaction && isDistanceRequest(transaction)) {
-        const report = getReportOrDraftReport(transaction.reportID);
+    if (!transaction) {
+        return '';
+    }
+
+    const report = getReportOrDraftReport(transaction.reportID);
+    if (isDistanceRequest(transaction)) {
         // This will be fixed as part of https://github.com/Expensify/Expensify/issues/507850
         // eslint-disable-next-line deprecation/deprecation
         const policy = policyParam ?? getPolicy(report?.policyID);
@@ -678,15 +686,11 @@ function getMerchant(transaction: OnyxInputOrEntry<Transaction>, policyParam: On
         );
     }
 
-    // Check if this is a workspace expense transaction
-    const report = getReportOrDraftReport(transaction?.reportID);
-    const isWorkspaceExpense = report?.type === CONST.REPORT.TYPE.EXPENSE;
-
-    // Allow empty merchant only for personal expenses, not workspace ones
-    if (transaction?.modifiedMerchant === '' && !isWorkspaceExpense) {
+    // Check if merchant was intentionally cleared by user (only for personal expenses)
+    if (transaction.wasMerchantCleared) {
         return '';
     }
-    return transaction?.modifiedMerchant ? transaction.modifiedMerchant : (transaction?.merchant ?? '');
+    return transaction.modifiedMerchant ? transaction.modifiedMerchant : (transaction.merchant ?? '');
 }
 
 function getMerchantOrDescription(transaction: OnyxEntry<Transaction>) {

src/libs/actions/IOU.ts

@@ -4592,10 +4592,16 @@ function updateMoneyRequestMerchant(
     policy: OnyxEntry<OnyxTypes.Policy>,
     policyTagList: OnyxEntry<OnyxTypes.PolicyTagLists>,
     policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
+    wasMerchantCleared?: boolean,
 ) {
     const transactionChanges: TransactionChanges = {
         merchant: value,
     };
+
+    if (wasMerchantCleared !== undefined) {
+        transactionChanges.wasMerchantCleared = wasMerchantCleared;
+    }
+
     const transactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
     const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
     let data: UpdateMoneyRequestData;

src/pages/iou/request/step/IOURequestStepMerchant.tsx

@@ -101,12 +101,25 @@ function IOURequestStepMerchant({
             return;
         }
 
-        // Fallback to PARTIAL_TRANSACTION_MERCHANT only if merchant is null or undefined
-        const merchantValue = newMerchant ?? CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;
+        // Check if merchant was intentionally cleared by user
+        const existingMerchantValue = merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT ? '' : merchant;
+        const wasMerchantCleared = newMerchant === '' && existingMerchantValue !== '';
+
+        // Determine the merchant value to save
+        let merchantValue: string;
+        if (wasMerchantCleared) {
+            if (isMerchantRequired) {
+                return;
+            }
+            merchantValue = '';
+        } else {
+            // Fallback to PARTIAL_TRANSACTION_MERCHANT only if merchant is null or undefined
+            merchantValue = newMerchant ?? CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;
+        }
 
         setMoneyRequestMerchant(transactionID, merchantValue, !isEditing);
         if (isEditing) {
-            updateMoneyRequestMerchant(transactionID, reportID, merchantValue, policy, policyTags, policyCategories);
+            updateMoneyRequestMerchant(transactionID, reportID, merchantValue, policy, policyTags, policyCategories, wasMerchantCleared && !isMerchantRequired);
         }
         navigateBack();
     };

src/types/onyx/Transaction.ts

@@ -548,6 +548,9 @@ type Transaction = OnyxCommon.OnyxValueWithOfflineFeedback<
 
         /** The inserted time of the transaction */
         inserted?: string;
+
+        /** Whether the merchant field was intentionally cleared by the user */
+        wasMerchantCleared?: boolean;
     },
     keyof Comment | keyof TransactionCustomUnit | 'attendees'
 >;