Merge pull request Expensify#88531 from Expensify/revert-87994-fix/workspace-member-role-error

[cp staging] Revert "fix: show inline member row error when workspace role update fails"

Author: amyevans

src/libs/actions/Policy/Member.ts

@@ -638,17 +638,8 @@ function buildUpdateWorkspaceMembersRoleOnyxData(policy: OnyxEntry<Policy>, sele
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
-                employeeList: {
-                    ...memberRoles.reduce((member: Record<string, PolicyEmployee>, current) => {
-                        // eslint-disable-next-line no-param-reassign
-                        member[current.email] = {
-                            ...(previousEmployeeList[current.email] ?? {}),
-                            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                            errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.editor.genericFailureMessage'),
-                        };
-                        return member;
-                    }, {}),
-                },
+                employeeList: previousEmployeeList,
+                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.editor.genericFailureMessage'),
             },
         },
     ];
@@ -1154,20 +1145,6 @@ function clearAddMemberError(policyID: string, login: string, accountID: number)
     });
 }
 
-/**
- * Removes an error after trying to update a member role
- */
-function clearUpdateMemberRoleError(policyID: string, login: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
-        employeeList: {
-            [login]: {
-                pendingAction: null,
-                errors: null,
-            },
-        },
-    });
-}
-
 function openWorkspaceMembersPage(policyID: string, clientMemberEmails: string[]) {
     if (!policyID || !clientMemberEmails) {
         Log.warn('openWorkspaceMembersPage invalid params', {policyID, clientMemberEmails});
@@ -1379,7 +1356,6 @@ export {
     addMembersToWorkspace,
     clearDeleteMemberError,
     clearAddMemberError,
-    clearUpdateMemberRoleError,
     openWorkspaceMembersPage,
     setWorkspaceInviteMembersDraft,
     inviteMemberToWorkspace,

src/pages/workspace/WorkspaceMembersPage.tsx

@@ -36,7 +36,6 @@ import {
     clearAddMemberError,
     clearDeleteMemberError,
     clearInviteDraft,
-    clearUpdateMemberRoleError,
     clearWorkspaceOwnerChangeFlow,
     downloadMembersCSV,
     openWorkspaceMembersPage,
@@ -374,15 +373,9 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
         (item: MemberOption) => {
             if (item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
                 clearDeleteMemberError(route.params.policyID, item.login);
-                return;
-            }
-
-            if (item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE) {
-                clearUpdateMemberRoleError(route.params.policyID, item.login);
-                return;
+            } else {
+                clearAddMemberError(route.params.policyID, item.login, item.accountID);
             }
-
-            clearAddMemberError(route.params.policyID, item.login, item.accountID);
         },
         [route.params.policyID],
     );