fix: User is prompted for account validation to pay manually

Author: paulnjs

src/components/MoneyReportHeader.tsx

@@ -1577,21 +1577,25 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
     const hasApproveAction = primaryAction === CONST.REPORT.PRIMARY_ACTIONS.APPROVE || secondaryActions.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE);
     const hasPayAction = primaryAction === CONST.REPORT.PRIMARY_ACTIONS.PAY || secondaryActions.includes(CONST.REPORT.SECONDARY_ACTIONS.PAY);
 
-    const checkForNecessaryAction = useCallback(() => {
-        if (isDelegateAccessRestricted) {
-            showDelegateNoAccessModal();
-            return true;
-        }
-        if (isAccountLocked) {
-            showLockedAccountModal();
-            return true;
-        }
-        if (!isUserValidated) {
-            handleUnvalidatedAccount(moneyRequestReport);
-            return true;
-        }
-        return false;
-    }, [isDelegateAccessRestricted, showDelegateNoAccessModal, isAccountLocked, showLockedAccountModal, isUserValidated, moneyRequestReport]);
+    const checkForNecessaryAction = useCallback(
+        (paymentMethodType?: PaymentMethodType) => {
+            if (isDelegateAccessRestricted) {
+                showDelegateNoAccessModal();
+                return true;
+            }
+            if (isAccountLocked) {
+                showLockedAccountModal();
+                return true;
+            }
+            if (!isUserValidated && paymentMethodType !== CONST.IOU.PAYMENT_TYPE.ELSEWHERE) {
+                handleUnvalidatedAccount(moneyRequestReport);
+                return true;
+            }
+
+            return false;
+        },
+        [isDelegateAccessRestricted, showDelegateNoAccessModal, isAccountLocked, showLockedAccountModal, isUserValidated, moneyRequestReport],
+    );
 
     const selectionModeReportLevelActions = useMemo(() => {
         if (isProduction) {
@@ -2333,7 +2337,7 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
         (fromSelectionMode: boolean) => (event: KYCFlowEvent, iouPaymentType: PaymentMethodType, triggerKYCFlow: TriggerKYCFlow) => {
             if (fromSelectionMode) {
                 isSelectionModePaymentRef.current = true;
-                if (checkForNecessaryAction()) {
+                if (checkForNecessaryAction(iouPaymentType)) {
                     return;
                 }
             }

src/components/SettlementButton/index.tsx

@@ -183,73 +183,76 @@ function SettlementButton({
         return formattedPaymentMethods.filter((ba) => (ba.accountData as AccountData)?.type === CONST.BANK_ACCOUNT.TYPE.PERSONAL);
     }
 
-    const checkForNecessaryAction = useCallback(() => {
-        if (isDelegateAccessRestricted) {
-            showDelegateNoAccessModal();
-            return true;
-        }
+    const checkForNecessaryAction = useCallback(
+        (paymentMethodType?: PaymentMethodType) => {
+            if (isDelegateAccessRestricted) {
+                showDelegateNoAccessModal();
+                return true;
+            }
 
-        if (isAccountLocked) {
-            showLockedAccountModal();
-            return true;
-        }
+            if (isAccountLocked) {
+                showLockedAccountModal();
+                return true;
+            }
 
-        if (!isUserValidated) {
-            handleUnvalidatedUserNavigation(chatReportID, reportID);
-            return true;
-        }
+            if (!isUserValidated && paymentMethodType !== CONST.IOU.PAYMENT_TYPE.ELSEWHERE) {
+                handleUnvalidatedUserNavigation(chatReportID, reportID);
+                return true;
+            }
 
-        if (isBankAccountLocked) {
-            showConfirmModal({
-                title: translate('bankAccount.lockedBankAccount'),
-                prompt: (
-                    <View style={[styles.renderHTML, styles.flexRow]}>
-                        <RenderHTML html={translate('bankAccount.youCantPayThis')} />
-                    </View>
-                ),
-                confirmText: translate('bankAccount.unlockBankAccount'),
-                cancelText: translate('common.cancel'),
-            }).then(({action}) => {
-                if (action !== ModalActions.CONFIRM) {
-                    return;
-                }
-                if (policy?.achAccount?.bankAccountID === undefined) {
-                    return;
-                }
-                pressLockedBankAccount(policy?.achAccount?.bankAccountID, translate, conciergeReportID);
-                navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas);
-            });
-            return true;
-        }
+            if (isBankAccountLocked) {
+                showConfirmModal({
+                    title: translate('bankAccount.lockedBankAccount'),
+                    prompt: (
+                        <View style={[styles.renderHTML, styles.flexRow]}>
+                            <RenderHTML html={translate('bankAccount.youCantPayThis')} />
+                        </View>
+                    ),
+                    confirmText: translate('bankAccount.unlockBankAccount'),
+                    cancelText: translate('common.cancel'),
+                }).then(({action}) => {
+                    if (action !== ModalActions.CONFIRM) {
+                        return;
+                    }
+                    if (policy?.achAccount?.bankAccountID === undefined) {
+                        return;
+                    }
+                    pressLockedBankAccount(policy?.achAccount?.bankAccountID, translate, conciergeReportID);
+                    navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas);
+                });
+                return true;
+            }
 
-        if (policy && shouldRestrictUserBillableActions(policy.id, ownerBillingGraceEndPeriod, userBillingGraceEndPeriods)) {
-            Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policy.id));
-            return true;
-        }
+            if (policy && shouldRestrictUserBillableActions(policy.id, ownerBillingGraceEndPeriod, userBillingGraceEndPeriods)) {
+                Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policy.id));
+                return true;
+            }
 
-        return false;
-    }, [
-        isDelegateAccessRestricted,
-        isAccountLocked,
-        isUserValidated,
-        isBankAccountLocked,
-        policy,
-        userBillingGraceEndPeriods,
-        ownerBillingGraceEndPeriod,
-        showDelegateNoAccessModal,
-        showLockedAccountModal,
-        chatReportID,
-        reportID,
-        showConfirmModal,
-        translate,
-        styles.renderHTML,
-        styles.flexRow,
-        conciergeReportID,
-        introSelected,
-        currentUserAccountID,
-        isSelfTourViewed,
-        betas,
-    ]);
+            return false;
+        },
+        [
+            isDelegateAccessRestricted,
+            isAccountLocked,
+            isUserValidated,
+            isBankAccountLocked,
+            policy,
+            userBillingGraceEndPeriods,
+            ownerBillingGraceEndPeriod,
+            showDelegateNoAccessModal,
+            showLockedAccountModal,
+            chatReportID,
+            reportID,
+            showConfirmModal,
+            translate,
+            styles.renderHTML,
+            styles.flexRow,
+            conciergeReportID,
+            introSelected,
+            currentUserAccountID,
+            isSelfTourViewed,
+            betas,
+        ],
+    );
 
     const shortFormPayElsewhereButton = {
         text: translate('iou.pay'),
@@ -320,7 +323,7 @@ function SettlementButton({
                         value: CONST.PAYMENT_METHODS.BUSINESS_BANK_ACCOUNT,
                         description: account.description,
                         onSelected: () => {
-                            if (checkForNecessaryAction()) {
+                            if (checkForNecessaryAction(CONST.IOU.PAYMENT_TYPE.VBBA)) {
                                 return;
                             }
                             onPress({
@@ -383,7 +386,7 @@ function SettlementButton({
                         icon: formattedPaymentMethod?.icon,
                         shouldUpdateSelectedIndex: true,
                         onSelected: () => {
-                            if (checkForNecessaryAction()) {
+                            if (checkForNecessaryAction(CONST.IOU.PAYMENT_TYPE.EXPENSIFY)) {
                                 return;
                             }
                             onPress({
@@ -442,7 +445,7 @@ function SettlementButton({
                         value: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
                         shouldUpdateSelectedIndex: true,
                         onSelected: () => {
-                            if (checkForNecessaryAction()) {
+                            if (checkForNecessaryAction(CONST.IOU.PAYMENT_TYPE.ELSEWHERE)) {
                                 return;
                             }
                             onPress({paymentType: CONST.IOU.PAYMENT_TYPE.ELSEWHERE, payAsBusiness});
@@ -551,16 +554,16 @@ function SettlementButton({
     };
 
     const handlePaymentSelection = (event: GestureResponderEvent | KeyboardEvent | undefined, selectedOption: string, triggerKYCFlow: (params: ContinueActionParams) => void) => {
-        if (checkForNecessaryAction()) {
-            return;
-        }
-
         const {paymentType, policyFromPaymentMethod, policyFromContext, shouldSelectPaymentMethod} = getActivePaymentType(
             selectedOption,
             activeAdminPolicies,
             businessBankAccountOptions,
             policyIDKey,
         );
+
+        if (checkForNecessaryAction(paymentType)) {
+            return;
+        }
         const isPayingWithMethod = paymentType !== CONST.IOU.PAYMENT_TYPE.ELSEWHERE;
 
         if ((!!policyFromPaymentMethod || shouldSelectPaymentMethod) && (isPayingWithMethod || !!policyFromPaymentMethod)) {