Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix]: Number of announce room members does not update when remove workspace members due to pendingAction #39796

Merged
merged 14 commits into from
Apr 15, 2024
Merged

[Fix]: Number of announce room members does not update when remove workspace members due to pendingAction #39796

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cb446af
Fix incorrect length of participants in report details
allgandalf Apr 6, 2024
535f351
fix null check
allgandalf Apr 6, 2024
1a251cf
Merge branch 'Expensify:main' into issue39446
allgandalf Apr 10, 2024
06c8711
use flatmap and change vairable name
allgandalf Apr 10, 2024
350b603
fix lint
allgandalf Apr 11, 2024
0b495ff
fix lint
allgandalf Apr 11, 2024
3112b76
Use particpants instead
allgandalf Apr 11, 2024
79d3ba6
Fix unintended delete
allgandalf Apr 11, 2024
7bdeca4
Revert back to participantsAccountIDs
allgandalf Apr 11, 2024
6e1d4b2
Implement latest suggestions
allgandalf Apr 12, 2024
76bc400
Update src/pages/ReportDetailsPage.tsx
allgandalf Apr 12, 2024
c106551
Update src/pages/ReportDetailsPage.tsx
allgandalf Apr 12, 2024
f343ab9
Resolve merge conflict
allgandalf Apr 15, 2024
f742baa
Resolve merge conflict
allgandalf Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/pages/ReportDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,12 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
return ReportUtils.getVisibleChatMemberAccountIDs(report.reportID ?? '');
}, [report, isGroupChat]);

// Get the active chat members by filtering out the pending members with delete action
const activeChatMembers = participants.flatMap((accountID) => {
const pendingMember = report?.pendingChatMembers?.findLast((member) => member.accountID === accountID.toString());
return !pendingMember || pendingMember.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? accountID : [];
});
Comment on lines +95 to +97
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do not filter out the accountID that is not available in the personalDetails object. This resulted in #46670


const isGroupDMChat = useMemo(() => ReportUtils.isDM(report) && participants.length > 1, [report, participants.length]);
const isPrivateNotesFetchTriggered = report?.isLoadingPrivateNotes !== undefined;

Expand Down Expand Up @@ -140,7 +146,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
key: CONST.REPORT_DETAILS_MENU_ITEM.MEMBERS,
translationKey: 'common.members',
icon: Expensicons.Users,
subtitle: participants.length,
subtitle: activeChatMembers.length,
isAnonymousAction: false,
action: () => {
if (isUserCreatedPolicyRoom || isChatThread) {
Expand Down Expand Up @@ -200,6 +206,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
session,
isSelfDM,
isDefaultRoom,
activeChatMembers.length,
isGroupChat,
]);

Expand Down
Loading