Skip to content

fix: keep private room name when leaving #57193

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

Merged
aldo-expensify merged 5 commits into from
Feb 25, 2025
Merged

fix: keep private room name when leaving #57193

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec29676
fix: keep private room name when leaving
daledah Feb 20, 2025
3d464b1
Merge branch 'main' into fix/55676
daledah Feb 24, 2025
2063de8
fix: use Onyx.set method to clear all report data
daledah Feb 24, 2025
f9376d1
refactor: add explaination comment
daledah Feb 25, 2025
d20e5da
Update src/libs/actions/Report.ts
daledah Feb 25, 2025
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
37 changes: 20 additions & 17 deletions src/libs/actions/Report.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3117,25 +3117,28 @@ function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = fal
},
];

const successData: OnyxUpdate[] = [
{
const successData: OnyxUpdate[] = [];
if (isWorkspaceMemberLeavingWorkspaceRoom || isChatThread) {
successData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
value:
isWorkspaceMemberLeavingWorkspaceRoom || isChatThread
? {
participants: {
[currentUserAccountID]: {
notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
},
},
}
: Object.keys(report).reduce<Record<string, null>>((acc, key) => {
acc[key] = null;
return acc;
}, {}),
},
];
value: {
participants: {
[currentUserAccountID]: {
notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
},
},
},
});
} else {
// Use the Onyx.set method to remove all other key values except reportName to prevent showing the room name as random numbers after leaving it.
// See https://github.com/Expensify/App/issues/55676 for more information.
successData.push({
onyxMethod: Onyx.METHOD.SET,
key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
value: {reportName: report.reportName},
});
}

const failureData: OnyxUpdate[] = [
{
Expand Down