Merge pull request #43223 from ishpaul777/revert-42450-fix/41336

[CP Staging] Revert "fix: Error message only changes after clicking Split expense button for the second time"
Expensify · Jun 6, 2024 · c03bdc6 · c03bdc6
2 parents 60ca2ff + 33521cb
commit c03bdc6
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx
@@ -344,15 +344,14 @@ function MoneyRequestConfirmationList({
     const isCategoryRequired = !!policy?.requiresCategory;
 
     useEffect(() => {
-        if (shouldDisplayFieldError && didConfirmSplit) {
-            setFormError('iou.error.genericSmartscanFailureMessage');
-            return;
-        }
-
         if (shouldDisplayFieldError && hasSmartScanFailed) {
             setFormError('iou.receiptScanningFailed');
             return;
         }
+        if (shouldDisplayFieldError && didConfirmSplit) {
+            setFormError('iou.error.genericSmartscanFailureMessage');
+            return;
+        }
         // reset the form error whenever the screen gains or loses focus
         setFormError('');
 
@@ -714,7 +713,21 @@ function MoneyRequestConfirmationList({
                 setFormError('iou.error.invalidCategoryLength');
                 return;
             }
-            if (iouType !== CONST.IOU.TYPE.PAY) {
+
+            if (formError) {
+                return;
+            }
+
+            if (iouType === CONST.IOU.TYPE.PAY) {
+                if (!paymentMethod) {
+                    return;
+                }
+
+                setDidConfirm(true);
+
+                Log.info(`[IOU] Sending money via: ${paymentMethod}`);
+                onSendMoney?.(paymentMethod);
+            } else {
                 // validate the amount for distance expenses
                 const decimals = CurrencyUtils.getCurrencyDecimals(iouCurrencyCode);
                 if (isDistanceRequest && !isDistanceRequestWithPendingRoute && !MoneyRequestUtils.validateAmount(String(iouAmount), decimals)) {
@@ -731,18 +744,6 @@ function MoneyRequestConfirmationList({
                 playSound(SOUNDS.DONE);
                 setDidConfirm(true);
                 onConfirm?.(selectedParticipants);
-            } else {
-                if (formError) {
-                    return;
-                }
-                if (!paymentMethod) {
-                    return;
-                }
-
-                setDidConfirm(true);
-
-                Log.info(`[IOU] Sending money via: ${paymentMethod}`);
-                onSendMoney?.(paymentMethod);
             }
         },
         [