Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions src/libs/actions/Report.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3876,13 +3876,6 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: InvitedEmails
API.write(WRITE_COMMANDS.INVITE_TO_ROOM, parameters, {optimisticData, successData, failureData});
}

/** Invites people to a room via concierge whisper */
function inviteToRoomAction(reportID: string, inviteeEmailsToAccountIDs: InvitedEmailsToAccountIDs, timezoneParam: Timezone) {
const inviteeEmails = Object.keys(inviteeEmailsToAccountIDs);

addComment(reportID, inviteeEmails.map((login) => `@${login}`).join(' '), timezoneParam, false);
}

function clearAddRoomMemberError(reportID: string, invitedAccountID: string) {
const reportMetadata = getReportMetadata(reportID);
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {
Expand Down Expand Up @@ -6125,7 +6118,6 @@ export {
inviteToGroupChat,
buildInviteToRoomOnyxData,
inviteToRoom,
inviteToRoomAction,
joinRoom,
leaveGroupChat,
leaveRoom,
Expand Down
14 changes: 6 additions & 8 deletions src/pages/RoomInvitePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ import InviteMemberListItem from '@components/SelectionList/InviteMemberListItem
import type {Section} from '@components/SelectionList/types';
import withNavigationTransitionEnd from '@components/withNavigationTransitionEnd';
import type {WithNavigationTransitionEndProps} from '@components/withNavigationTransitionEnd';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useDebouncedState from '@hooks/useDebouncedState';
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, 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 Down Expand Up @@ -56,14 +55,13 @@ 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] = useOnyx(ONYXKEYS.COUNTRY_CODE, {canBeMissing: false});
const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState(userSearchPhrase ?? '');
const [selectedOptions, setSelectedOptions] = useState<OptionData[]>([]);
const [isSearchingForReports] = useOnyx(ONYXKEYS.IS_SEARCHING_FOR_REPORTS, {initWithStoredValues: false, canBeMissing: true});
const isReportArchived = useReportIsArchived(report.reportID);
const currentUserPersonalDetails = useCurrentUserPersonalDetails();

const {options, areOptionsInitialized} = useOptionsList();

Expand Down Expand Up @@ -209,11 +207,11 @@ function RoomInvitePage({
invitedEmailsToAccountIDs[login] = Number(accountID);
});
if (reportID) {
inviteToRoomAction(reportID, invitedEmailsToAccountIDs, currentUserPersonalDetails.timezone ?? CONST.DEFAULT_TIME_ZONE);
clearUserSearchPhrase();
Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(reportID, backTo));
inviteToRoom(reportID, invitedEmailsToAccountIDs, formatPhoneNumber);
}
}, [validate, selectedOptions, reportID, currentUserPersonalDetails.timezone, backTo]);
clearUserSearchPhrase();
Navigation.goBack(backRoute);
}, [selectedOptions, backRoute, reportID, validate, formatPhoneNumber]);

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