diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js index ad9a14fc67bd..57898fbfa1fa 100755 --- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js +++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js @@ -718,6 +718,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({ interactive={!isReadOnly} brickRoadIndicator={merchantError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''} error={merchantError ? translate('common.error.fieldRequired') : ''} + rightLabel={isMerchantRequired ? translate('common.required') : ''} /> ), shouldShow: shouldShowMerchant, diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 3f49890d1d0b..a902a4320f5f 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -673,8 +673,8 @@ function buildOnyxDataForMoneyRequest( }, ]; - // Policy won't be set for P2P cases for which we don't need to compute violations - if (!policy?.id) { + // We don't need to compute violations unless we're on a paid policy + if (!policy || !PolicyUtils.isPaidGroupPolicy(policy)) { return [optimisticData, successData, failureData]; } @@ -1225,7 +1225,7 @@ function getUpdateMoneyRequestParams( }); } - if (policy?.id && updatedTransaction) { + if (policy && PolicyUtils.isPaidGroupPolicy(policy) && updatedTransaction) { const currentTransactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`] ?? []; optimisticData.push( ViolationsUtils.getViolationsOnyxData( @@ -2671,8 +2671,8 @@ function editRegularMoneyRequest( }, ]; - // Add transaction violations if there is a policy and updated transaaction - if (policy?.id && updatedTransaction) { + // Add transaction violations if we have a paid policy and an updated transaction + if (policy && PolicyUtils.isPaidGroupPolicy(policy) && updatedTransaction) { const currentTransactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`] ?? []; const updatedViolationsOnyxData = ViolationsUtils.getViolationsOnyxData( updatedTransaction,