Skip to content

Revert "[CP Staging] Revert "Merge pull request #79299 from parasharrajat/fix/whisper"" #80121

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
carlosmiceli merged 1 commit into from
Jan 23, 2026
Merged

Revert "[CP Staging] Revert "Merge pull request #79299 from parasharrajat/fix/whisper"" #80121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions src/pages/RoomInvitePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useReportIsArchived from '@hooks/useReportIsArchived';
import useThemeStyles from '@hooks/useThemeStyles';
import {inviteToRoomAction, searchInServer} from '@libs/actions/Report';
import {inviteToRoom, inviteToRoomAction, searchInServer} from '@libs/actions/Report';
import {clearUserSearchPhrase, updateUserSearchPhrase} from '@libs/actions/RoomMembersUserSearchPhrase';
import {READ_COMMANDS} from '@libs/API/types';
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
Expand All @@ -38,7 +38,7 @@ import type {MemberEmailsToAccountIDs} from '@libs/PolicyUtils';
import {isPolicyEmployee as isPolicyEmployeeUtil} from '@libs/PolicyUtils';
import {getReportAction} from '@libs/ReportActionsUtils';
import type {OptionData} from '@libs/ReportUtils';
import {getReportName, isHiddenForCurrentUser} from '@libs/ReportUtils';
import {getReportName, isHiddenForCurrentUser, isPolicyExpenseChat} from '@libs/ReportUtils';
import CONST from '@src/CONST';
import type {TranslationPaths} from '@src/languages/types';
import ONYXKEYS from '@src/ONYXKEYS';
Expand All @@ -60,7 +60,7 @@ function RoomInvitePage({
},
}: RoomInvitePageProps) {
const styles = useThemeStyles();
const {translate} = useLocalize();
const {translate, formatPhoneNumber} = useLocalize();
const [userSearchPhrase] = useOnyx(ONYXKEYS.ROOM_MEMBERS_USER_SEARCH_PHRASE, {canBeMissing: true});
const [countryCode = CONST.DEFAULT_COUNTRY_CODE] = useOnyx(ONYXKEYS.COUNTRY_CODE, {canBeMissing: false});
const [loginList] = useOnyx(ONYXKEYS.LOGIN_LIST, {canBeMissing: true});
Expand Down Expand Up @@ -206,7 +206,7 @@ function RoomInvitePage({

const ancestors = useAncestors(report);

const inviteUsers = useCallback(() => {
const inviteUsers = () => {
HttpUtils.cancelPendingRequests(READ_COMMANDS.SEARCH_FOR_REPORTS);

if (!validate()) {
Expand All @@ -222,15 +222,19 @@ function RoomInvitePage({
invitedEmailsToAccountIDs[login] = Number(accountID);
}
if (report?.reportID) {
inviteToRoomAction(report, ancestors, invitedEmailsToAccountIDs, currentUserPersonalDetails.timezone ?? CONST.DEFAULT_TIME_ZONE);
if (isPolicyExpenseChat(report)) {
inviteToRoomAction(report, ancestors, invitedEmailsToAccountIDs, currentUserPersonalDetails.timezone ?? CONST.DEFAULT_TIME_ZONE);
} else {
inviteToRoom(reportID, invitedEmailsToAccountIDs, formatPhoneNumber);
Comment on lines +225 to +228

@chatgpt-codex-connector chatgpt-codex-connector Bot Jan 21, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Preserve invite whisper for non-expense rooms

This change routes all non‑isPolicyExpenseChat invites through inviteToRoom, which only updates participants/metadata and does not create a report action. inviteToRoomAction is the only path that posts the concierge whisper (addComment in src/libs/actions/Report.ts), so workspace rooms like policyAdmins/policyAnnounce will no longer show the invite whisper when adding a non‑member. If the UI/tests expect that whisper to appear in workspace chats, this is a regression; consider keeping inviteToRoomAction for those room types or explicitly creating the whisper action alongside the API invite.

Useful? React with 👍 / 👎.

}
clearUserSearchPhrase();
if (backTo) {
Navigation.goBack(backTo);
} else {
Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(report.reportID));
}
}
}, [validate, selectedOptions, ancestors, report, currentUserPersonalDetails.timezone, backTo]);
};

const goBack = useCallback(() => {
Navigation.goBack(backRoute);
Expand Down
Loading