add null value as a fallback

Expensify · Mar 13, 2024 · 750ca3f · 750ca3f
1 parent 3eebe66
commit 750ca3f
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
@@ -457,9 +457,11 @@ function setWorkspaceAutoReporting(policyID: string, enabled: boolean, frequency
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
-                autoReporting: policy.autoReporting,
-                harvesting: policy.harvesting,
-                autoReportingFrequency: policy.autoReportingFrequency,
+                autoReporting: policy.autoReporting ?? null,
+                harvesting: {
+                    enabled: policy?.harvesting?.enabled ?? null,
+                },
+                autoReportingFrequency: policy.autoReportingFrequency ?? null,
                 pendingFields: {isAutoApprovalEnabled: null, harvesting: null},
             },
         },
@@ -499,7 +501,7 @@ function setWorkspaceAutoReportingFrequency(policyID: string, frequency: ValueOf
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
-                autoReportingFrequency: policy.autoReportingFrequency,
+                autoReportingFrequency: policy.autoReportingFrequency ?? null,
                 pendingFields: {autoReportingFrequency: null},
             },
         },
@@ -539,7 +541,7 @@ function setWorkspaceAutoReportingMonthlyOffset(policyID: string, autoReportingO
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
-                autoReportingOffset: policy.autoReportingOffset,
+                autoReportingOffset: policy.autoReportingOffset ?? null,
                 pendingFields: {autoReportingOffset: null},
             },
         },
@@ -585,9 +587,9 @@ function setWorkspaceApprovalMode(policyID: string, approver: string, approvalMo
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
-                approver: policy.approver,
-                approvalMode: policy.approvalMode,
-                isAutoApprovalEnabled: policy.isAutoApprovalEnabled,
+                approver: policy.approver ?? null,
+                approvalMode: policy.approvalMode ?? null,
+                isAutoApprovalEnabled: policy.isAutoApprovalEnabled ?? null,
                 pendingFields: {approvalMode: null},
             },
         },
@@ -639,8 +641,8 @@ function setWorkspacePayer(policyID: string, reimburserEmail: string, reimburser
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
-                reimburserEmail: policy.reimburserEmail,
-                reimburserAccountID: policy.reimburserAccountID,
+                reimburserEmail: policy.reimburserEmail ?? null,
+                reimburserAccountID: policy.reimburserAccountID ?? null,
                 errorFields: {reimburserEmail: ErrorUtils.getMicroSecondOnyxError('workflowsPayerPage.genericErrorMessage')},
                 pendingFields: {reimburserEmail: null},
             },
@@ -689,9 +691,9 @@ function setWorkspaceReimbursement(policyID: string, reimbursementChoice: ValueO
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
-                reimbursementChoice: policy.reimbursementChoice,
-                reimburserAccountID: policy.reimburserAccountID,
-                reimburserEmail: policy.reimburserEmail,
+                reimbursementChoice: policy.reimbursementChoice ?? null,
+                reimburserAccountID: policy.reimburserAccountID ?? null,
+                reimburserEmail: policy.reimburserEmail ?? null,
                 errorFields: {reimbursementChoice: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage')},
                 pendingFields: {reimbursementChoice: null},
             },