Merge pull request #39231 from bernhardoj/fix/38821-missing-strikethr…

…ough-on-pending-delete-room-members
Expensify · Apr 1, 2024 · b3987f0 · b3987f0
2 parents 99cc0b6 + 3ca25ee
commit b3987f0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/src/components/OptionRow.tsx b/src/components/OptionRow.tsx
@@ -154,14 +154,14 @@ function OptionRow({
     }
 
     return (
-        <OfflineWithFeedback
-            pendingAction={option.pendingAction}
-            errors={option.allReportErrors}
-            shouldShowErrorMessages={false}
-            needsOffscreenAlphaCompositing
-        >
-            <Hoverable>
-                {(hovered) => (
+        <Hoverable>
+            {(hovered) => (
+                <OfflineWithFeedback
+                    pendingAction={option.pendingAction}
+                    errors={option.allReportErrors}
+                    shouldShowErrorMessages={false}
+                    needsOffscreenAlphaCompositing
+                >
                     <PressableWithFeedback
                         nativeID={keyForList}
                         ref={pressableRef}
@@ -314,9 +314,9 @@ function OptionRow({
                             </View>
                         )}
                     </PressableWithFeedback>
-                )}
-            </Hoverable>
-        </OfflineWithFeedback>
+                </OfflineWithFeedback>
+            )}
+        </Hoverable>
     );
 }
 

diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
@@ -780,15 +780,12 @@ function removeOptimisticAnnounceRoomMembers(policyID: string, accountIDs: numbe
     }
 
     if (announceReport?.participantAccountIDs) {
-        const remainUsers = announceReport.participantAccountIDs.filter((e) => !accountIDs.includes(e));
         const pendingChatMembers = ReportUtils.getPendingChatMembers(accountIDs, announceReport?.pendingChatMembers ?? [], CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
 
         announceRoomMembers.onyxOptimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${announceReport.reportID}`,
             value: {
-                participantAccountIDs: [...remainUsers],
-                visibleChatMemberAccountIDs: [...remainUsers],
                 pendingChatMembers,
             },
         });
@@ -797,8 +794,6 @@ function removeOptimisticAnnounceRoomMembers(policyID: string, accountIDs: numbe
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${announceReport.reportID}`,
             value: {
-                participantAccountIDs: announceReport.participantAccountIDs,
-                visibleChatMemberAccountIDs: announceReport.visibleChatMemberAccountIDs,
                 pendingChatMembers: announceReport?.pendingChatMembers ?? null,
             },
         });

diff --git a/src/pages/ReportParticipantsPage.tsx b/src/pages/ReportParticipantsPage.tsx
@@ -50,7 +50,7 @@ const getAllParticipants = (
                 !!userPersonalDetail?.login && !CONST.RESTRICTED_ACCOUNT_IDS.includes(accountID) ? LocalePhoneNumber.formatPhoneNumber(userPersonalDetail.login) : translate('common.hidden');
             const displayName = PersonalDetailsUtils.getDisplayNameOrDefault(userPersonalDetail);
 
-            const pendingChatMember = report?.pendingChatMembers?.find((member) => member.accountID === accountID.toString());
+            const pendingChatMember = report?.pendingChatMembers?.findLast((member) => member.accountID === accountID.toString());
             return {
                 alternateText: userLogin,
                 pendingAction: pendingChatMember?.pendingAction,

diff --git a/src/pages/RoomMembersPage.tsx b/src/pages/RoomMembersPage.tsx
@@ -198,7 +198,7 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) {
                     return;
                 }
             }
-            const pendingChatMember = report?.pendingChatMembers?.find((member) => member.accountID === accountID.toString());
+            const pendingChatMember = report?.pendingChatMembers?.findLast((member) => member.accountID === accountID.toString());
 
             result.push({
                 keyForList: String(accountID),