From 1cf2e1e9d332caedbe6d0869a22563c24e75be22 Mon Sep 17 00:00:00 2001
From: cretadn22 <cretadn22@gmail.com>
Date: Mon, 19 Aug 2024 23:21:56 +0700
Subject: [PATCH 1/2] reset errors

---
 .../workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx | 1 +
 src/types/onyx/ApprovalWorkflow.ts                              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
index 25f288690c5dc..41a8d5c6a4eeb 100644
--- a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
+++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
@@ -87,6 +87,7 @@ function WorkspaceWorkflowsApprovalsEditPage({policy, isLoadingReportData = true
             availableMembers: [...currentApprovalWorkflow.members, ...(workflows.at(0)?.members ?? [])],
             action: CONST.APPROVAL_WORKFLOW.ACTION.EDIT,
             isLoading: false,
+            errors: null,
         });
         setInitialApprovalWorkflow(currentApprovalWorkflow);
     }, [initialApprovalWorkflow, personalDetails, policy, route.params.firstApproverEmail, route.params.policyID]);
diff --git a/src/types/onyx/ApprovalWorkflow.ts b/src/types/onyx/ApprovalWorkflow.ts
index 44a8932341fc4..8fef76e19d403 100644
--- a/src/types/onyx/ApprovalWorkflow.ts
+++ b/src/types/onyx/ApprovalWorkflow.ts
@@ -112,7 +112,7 @@ type ApprovalWorkflowOnyx = Omit<ApprovalWorkflow, 'approvers'> & {
     /**
      * Errors for the workflow
      */
-    errors?: Record<string, TranslationPaths>;
+    errors?: Record<string, TranslationPaths> | null;
 };
 
 export default ApprovalWorkflow;

From 5cfaf085de2d2bed5d1db6e585d3d73802649782 Mon Sep 17 00:00:00 2001
From: cretadn22 <cretadn22@gmail.com>
Date: Tue, 20 Aug 2024 20:19:54 +0700
Subject: [PATCH 2/2] remove null type

---
 src/libs/actions/Workflow.ts       | 4 ++--
 src/types/onyx/ApprovalWorkflow.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/actions/Workflow.ts b/src/libs/actions/Workflow.ts
index 0b6c29c9890aa..ec1b9c08025e8 100644
--- a/src/libs/actions/Workflow.ts
+++ b/src/libs/actions/Workflow.ts
@@ -1,6 +1,6 @@
 import lodashDropRightWhile from 'lodash/dropRightWhile';
 import lodashMapKeys from 'lodash/mapKeys';
-import type {OnyxCollection, OnyxUpdate} from 'react-native-onyx';
+import type {OnyxCollection, OnyxMergeInput, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import * as API from '@libs/API';
 import type {CreateWorkspaceApprovalParams, RemoveWorkspaceApprovalParams, UpdateWorkspaceApprovalParams} from '@libs/API/parameters';
@@ -327,7 +327,7 @@ function clearApprovalWorkflowApprovers() {
     Onyx.merge(ONYXKEYS.APPROVAL_WORKFLOW, {approvers: []});
 }
 
-function setApprovalWorkflow(approvalWorkflow: ApprovalWorkflowOnyx) {
+function setApprovalWorkflow(approvalWorkflow: OnyxMergeInput<typeof ONYXKEYS.APPROVAL_WORKFLOW>) {
     Onyx.merge(ONYXKEYS.APPROVAL_WORKFLOW, approvalWorkflow);
 }
 
diff --git a/src/types/onyx/ApprovalWorkflow.ts b/src/types/onyx/ApprovalWorkflow.ts
index 8fef76e19d403..44a8932341fc4 100644
--- a/src/types/onyx/ApprovalWorkflow.ts
+++ b/src/types/onyx/ApprovalWorkflow.ts
@@ -112,7 +112,7 @@ type ApprovalWorkflowOnyx = Omit<ApprovalWorkflow, 'approvers'> & {
     /**
      * Errors for the workflow
      */
-    errors?: Record<string, TranslationPaths> | null;
+    errors?: Record<string, TranslationPaths>;
 };
 
 export default ApprovalWorkflow;