Skip to content

Commit eafbcff

Browse files
authored
Merge pull request #79299 from parasharrajat/fix/whisper
Call the invite whisper for only workspace chats
2 parents 94c4ef9 + e3b7d89 commit eafbcff

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

src/pages/RoomInvitePage.tsx

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import useLocalize from '@hooks/useLocalize';
2020
import useOnyx from '@hooks/useOnyx';
2121
import useReportIsArchived from '@hooks/useReportIsArchived';
2222
import useThemeStyles from '@hooks/useThemeStyles';
23-
import {inviteToRoomAction, searchInServer} from '@libs/actions/Report';
23+
import {inviteToRoom, inviteToRoomAction, searchInServer} from '@libs/actions/Report';
2424
import {clearUserSearchPhrase, updateUserSearchPhrase} from '@libs/actions/RoomMembersUserSearchPhrase';
2525
import {READ_COMMANDS} from '@libs/API/types';
2626
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
@@ -38,7 +38,7 @@ import type {MemberEmailsToAccountIDs} from '@libs/PolicyUtils';
3838
import {isPolicyEmployee as isPolicyEmployeeUtil} from '@libs/PolicyUtils';
3939
import {getReportAction} from '@libs/ReportActionsUtils';
4040
import type {OptionData} from '@libs/ReportUtils';
41-
import {getReportName, isHiddenForCurrentUser} from '@libs/ReportUtils';
41+
import {getReportName, isHiddenForCurrentUser, isPolicyExpenseChat} from '@libs/ReportUtils';
4242
import CONST from '@src/CONST';
4343
import type {TranslationPaths} from '@src/languages/types';
4444
import ONYXKEYS from '@src/ONYXKEYS';
@@ -60,7 +60,7 @@ function RoomInvitePage({
6060
},
6161
}: RoomInvitePageProps) {
6262
const styles = useThemeStyles();
63-
const {translate} = useLocalize();
63+
const {translate, formatPhoneNumber} = useLocalize();
6464
const [userSearchPhrase] = useOnyx(ONYXKEYS.ROOM_MEMBERS_USER_SEARCH_PHRASE, {canBeMissing: true});
6565
const [countryCode = CONST.DEFAULT_COUNTRY_CODE] = useOnyx(ONYXKEYS.COUNTRY_CODE, {canBeMissing: false});
6666
const [loginList] = useOnyx(ONYXKEYS.LOGIN_LIST, {canBeMissing: true});
@@ -206,7 +206,7 @@ function RoomInvitePage({
206206

207207
const ancestors = useAncestors(report);
208208

209-
const inviteUsers = useCallback(() => {
209+
const inviteUsers = () => {
210210
HttpUtils.cancelPendingRequests(READ_COMMANDS.SEARCH_FOR_REPORTS);
211211

212212
if (!validate()) {
@@ -222,15 +222,19 @@ function RoomInvitePage({
222222
invitedEmailsToAccountIDs[login] = Number(accountID);
223223
}
224224
if (report?.reportID) {
225-
inviteToRoomAction(report, ancestors, invitedEmailsToAccountIDs, currentUserPersonalDetails.timezone ?? CONST.DEFAULT_TIME_ZONE);
225+
if (isPolicyExpenseChat(report)) {
226+
inviteToRoomAction(report, ancestors, invitedEmailsToAccountIDs, currentUserPersonalDetails.timezone ?? CONST.DEFAULT_TIME_ZONE);
227+
} else {
228+
inviteToRoom(reportID, invitedEmailsToAccountIDs, formatPhoneNumber);
229+
}
226230
clearUserSearchPhrase();
227231
if (backTo) {
228232
Navigation.goBack(backTo);
229233
} else {
230234
Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(report.reportID));
231235
}
232236
}
233-
}, [validate, selectedOptions, ancestors, report, currentUserPersonalDetails.timezone, backTo]);
237+
};
234238

235239
const goBack = useCallback(() => {
236240
Navigation.goBack(backRoute);

0 commit comments

Comments
 (0)