Merge pull request #33785 from Expensify/vit-fixMerchantRegression

[CP Staging] Fix merchant saving and copy for validation (cherry picked from commit 89ee303)
Expensify · Dec 30, 2023 · 065aff1 · 065aff1
1 parent d8305f2
commit 065aff1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -618,7 +618,7 @@ export default {
             genericSmartscanFailureMessage: 'Transaction is missing fields',
             atLeastTwoDifferentWaypoints: 'Please enter at least two different addresses',
             splitBillMultipleParticipantsErrorMessage: 'Split bill is only allowed between a single workspace or individual users. Please update your selection.',
-            invalidMerchant: 'Please enter a corrent merchant.',
+            invalidMerchant: 'Please enter a correct merchant.',
         },
         waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Started settling up, payment is held until ${submitterDisplayName} enables their Wallet`,
         enableWallet: 'Enable Wallet',

diff --git a/src/pages/EditRequestPage.js b/src/pages/EditRequestPage.js
@@ -195,17 +195,21 @@ function EditRequestPage({report, route, parentReport, policyCategories, policyT
                 defaultMerchant={transactionMerchant}
                 isPolicyExpenseChat={isPolicyExpenseChat}
                 onSubmit={(transactionChanges) => {
+                    const newTrimmedMerchant = transactionChanges.merchant.trim();
+
                     // In case the merchant hasn't been changed, do not make the API request.
-                    if (transactionChanges.merchant.trim() === transactionMerchant) {
+                    // In case the merchant has been set to empty string while current merchant is partial, do nothing too.
+                    if (newTrimmedMerchant === transactionMerchant || (newTrimmedMerchant === '' && transactionMerchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT)) {
                         Navigation.dismissModal();
                         return;
                     }
+
                     // This is possible only in case of IOU requests.
-                    if (transactionChanges.merchant.trim() === '') {
+                    if (newTrimmedMerchant === '') {
                         editMoneyRequest({merchant: CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT});
                         return;
                     }
-                    editMoneyRequest({merchant: transactionChanges.merchant.trim()});
+                    editMoneyRequest({merchant: newTrimmedMerchant});
                 }}
             />
         );