fix: validation member

Author: annaweber830

src/libs/actions/Policy/Member.ts

@@ -400,11 +400,9 @@ function removeMembers(policy: OnyxEntry<Policy>, selectedMemberEmails: string[]
         const employee = policy?.employeeList?.[employeeEmail];
         optimisticMembersState[employeeEmail] = optimisticMembersState[employeeEmail] ?? {};
         failureMembersState[employeeEmail] = failureMembersState[employeeEmail] ?? {};
-
-        if (selectedMemberEmailsWithDuplicates.includes(employeeEmail)) {
+        if (employee?.email && selectedMemberEmails.includes(employee.email)) {
             continue;
         }
-
         if (employee?.submitsTo && selectedMemberEmails.includes(employee?.submitsTo)) {
             optimisticMembersState[employeeEmail] = {
                 ...optimisticMembersState[employeeEmail],

src/libs/actions/Workflow.ts

@@ -80,12 +80,7 @@ function createApprovalWorkflow({approvalWorkflow, policy, addExpenseApprovalsTa
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policy.id}`,
             value: {
-                employeeList: Object.fromEntries(
-                    Object.keys(updatedEmployees).map((key) => [
-                        key,
-                        previousEmployeeList[key]?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? {pendingFields: null} : {pendingAction: null, pendingFields: null},
-                    ]),
-                ),
+                employeeList: Object.fromEntries(Object.keys(updatedEmployees).map((key) => [key, {pendingAction: null, pendingFields: null}])),
             },
         },
     ];
@@ -156,12 +151,7 @@ function updateApprovalWorkflow(approvalWorkflow: ApprovalWorkflow, membersToRem
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policy.id}`,
             value: {
-                employeeList: Object.fromEntries(
-                    Object.keys(updatedEmployees).map((key) => [
-                        key,
-                        previousEmployeeList[key]?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? {pendingFields: null} : {pendingAction: null, pendingFields: null},
-                    ]),
-                ),
+                employeeList: Object.fromEntries(Object.keys(updatedEmployees).map((key) => [key, {pendingAction: null, pendingFields: null}])),
             },
         },
     ];
@@ -219,12 +209,7 @@ function removeApprovalWorkflow(approvalWorkflow: ApprovalWorkflow, policy: Onyx
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policy.id}`,
             value: {
-                employeeList: Object.fromEntries(
-                    Object.keys(updatedEmployees).map((key) => [
-                        key,
-                        previousEmployeeList[key]?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? {pendingFields: null} : {pendingAction: null, pendingFields: null},
-                    ]),
-                ),
+                employeeList: Object.fromEntries(Object.keys(updatedEmployees).map((key) => [key, {pendingAction: null}])),
             },
         },
     ];

src/pages/workspace/WorkspaceMembersPage.tsx

@@ -228,22 +228,12 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
      * Please see https://github.com/Expensify/App/blob/main/README.md#Security for more details
      */
     const removeUsers = () => {
-        const selectedEmployeesToRemove = [...selectedEmployees];
-
-        // eslint-disable-next-line @typescript-eslint/no-deprecated
-        InteractionManager.runAfterInteractions(() => {
-            setSelectedEmployees([]);
-            removeMembers(policy, selectedEmployeesToRemove, policyMemberEmailsToAccountIDs);
-
-            // Check if any of the members are approvers
-            const hasApprovers = selectedEmployeesToRemove.some((email) => isApprover(policy, email));
-
-            if (!hasApprovers) {
-                return;
-            }
+        // Check if any of the members are approvers
+        const hasApprovers = selectedEmployees.some((email) => isApprover(policy, email));
 
+        if (hasApprovers) {
             const ownerEmail = ownerDetails.login;
-            for (const login of selectedEmployeesToRemove) {
+            for (const login of selectedEmployees) {
                 if (!isApprover(policy, login)) {
                     continue;
                 }
@@ -267,6 +257,12 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
                     }
                 }
             }
+        }
+
+        // eslint-disable-next-line @typescript-eslint/no-deprecated
+        InteractionManager.runAfterInteractions(() => {
+            setSelectedEmployees([]);
+            removeMembers(policy, selectedEmployees, policyMemberEmailsToAccountIDs);
         });
     };
 

src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx

@@ -1,6 +1,6 @@
 import {Str} from 'expensify-common';
 import React, {useEffect} from 'react';
-import {InteractionManager, View} from 'react-native';
+import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import Avatar from '@components/Avatar';
@@ -178,28 +178,25 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
             return;
         }
 
-        // Remove the member and close the modal
-        removeMemberAndCloseModal();
-
         // Update approval workflows after approver removal
         const updatedWorkflows = updateWorkflowDataOnApproverRemoval({
             approvalWorkflows,
             removedApprover,
             ownerDetails,
         });
 
-        // eslint-disable-next-line @typescript-eslint/no-deprecated
-        InteractionManager.runAfterInteractions(() => {
-            for (const workflow of updatedWorkflows) {
-                if (workflow?.removeApprovalWorkflow) {
-                    const {removeApprovalWorkflow, ...updatedWorkflow} = workflow;
+        for (const workflow of updatedWorkflows) {
+            if (workflow?.removeApprovalWorkflow) {
+                const {removeApprovalWorkflow, ...updatedWorkflow} = workflow;
 
-                    removeApprovalWorkflowAction(updatedWorkflow, policy);
-                } else {
-                    updateApprovalWorkflow(workflow, [], [], policy);
-                }
+                removeApprovalWorkflowAction(updatedWorkflow, policy);
+            } else {
+                updateApprovalWorkflow(workflow, [], [], policy);
             }
-        });
+        }
+
+        // Remove the member and close the modal
+        removeMemberAndCloseModal();
     };
 
     const showRemoveMemberModal = async () => {