Merge pull request #37112 from Expensify/vit-updateSelfApprovalProp

[NoQA] Use preventSelfApprovalEnabled policy prop to match db format

Author: lakchote

src/libs/NextStepUtils.ts

@@ -73,7 +73,7 @@ function buildNextStep(
 
     const {policyID = '', ownerAccountID = -1, managerID = -1} = report;
     const policy = ReportUtils.getPolicy(policyID);
-    const {submitsTo, harvesting, isPreventSelfApprovalEnabled, autoReportingFrequency, autoReportingOffset} = policy;
+    const {submitsTo, harvesting, isPreventSelfApprovalEnabled, preventSelfApprovalEnabled, autoReportingFrequency, autoReportingOffset} = policy;
     const isOwner = currentUserAccountID === ownerAccountID;
     const isManager = currentUserAccountID === managerID;
     const isSelfApproval = currentUserAccountID === submitsTo;
@@ -164,7 +164,7 @@ function buildNextStep(
             }
 
             // Prevented self submitting
-            if (isPreventSelfApprovalEnabled && isSelfApproval) {
+            if ((isPreventSelfApprovalEnabled ?? preventSelfApprovalEnabled) && isSelfApproval) {
                 optimisticNextStep.message = [
                     {
                         text: "Oops! Looks like you're submitting to ",

src/types/onyx/Policy.ts

@@ -105,9 +105,12 @@ type Policy = {
         enabled: boolean;
     };
 
-    /** Whether the self approval or submitting is enabled */
+    /** @deprecated Whether the self approval or submitting is enabled */
     isPreventSelfApprovalEnabled?: boolean;
 
+    /** Whether the self approval or submitting is enabled */
+    preventSelfApprovalEnabled?: boolean;
+
     /** When the monthly scheduled submit should happen */
     autoReportingOffset?: AutoReportingOffset;
 

tests/unit/NextStepUtilsTest.ts

@@ -340,7 +340,7 @@ describe('libs/NextStepUtils', () => {
 
                 return Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
                     submitsTo: currentUserAccountID,
-                    isPreventSelfApprovalEnabled: true,
+                    preventSelfApprovalEnabled: true,
                 }).then(() => {
                     const result = NextStepUtils.buildNextStep(report, CONST.REPORT.STATUS_NUM.OPEN);
 

tests/utils/LHNTestUtils.js

@@ -259,7 +259,7 @@ function getFakePolicy(id = 1, name = 'Workspace-Test-001') {
             enabled: true,
         },
         autoReportingOffset: 1,
-        isPreventSelfApprovalEnabled: true,
+        preventSelfApprovalEnabled: true,
         submitsTo: 123456,
         defaultBillable: false,
         disabledFields: {defaultBillable: true, reimbursable: false},

tests/utils/collections/policies.ts

@@ -14,7 +14,7 @@ export default function createRandomPolicy(index: number): Policy {
             enabled: randBoolean(),
         },
         autoReportingOffset: 1,
-        isPreventSelfApprovalEnabled: randBoolean(),
+        preventSelfApprovalEnabled: randBoolean(),
         submitsTo: index,
         outputCurrency: randCurrencyCode(),
         role: rand(Object.values(CONST.POLICY.ROLE)),