diff --git a/src/libs/PersonalDetailsUtils.ts b/src/libs/PersonalDetailsUtils.ts index 83d3b2c142d0..e2024cabc617 100644 --- a/src/libs/PersonalDetailsUtils.ts +++ b/src/libs/PersonalDetailsUtils.ts @@ -9,8 +9,8 @@ import type {OnyxData} from '@src/types/onyx/Request'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; import * as LocalePhoneNumber from './LocalePhoneNumber'; import * as Localize from './Localize'; -import * as UserUtils from './UserUtils'; import Log from './Log'; +import * as UserUtils from './UserUtils'; type FirstAndLastName = { firstName: string; diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts index eee6049ce37f..d52543ead6ff 100644 --- a/src/libs/actions/Report.ts +++ b/src/libs/actions/Report.ts @@ -36,6 +36,7 @@ import type { SetNameValuePairParams, TogglePinnedChatParams, UpdateCommentParams, + UpdateGroupChatAvatarParams, UpdateGroupChatMemberRolesParams, UpdateGroupChatNameParams, UpdatePolicyRoomNameParams, @@ -833,7 +834,14 @@ function openReport( * @param userLogins list of user logins to start a chat report with. * @param shouldDismissModal a flag to determine if we should dismiss modal before navigate to report or navigate to report directly. */ -function navigateToAndOpenReport(userLogins: string[], shouldDismissModal = true, reportName?: string, avatarUri?: string, avatarFile?: File | CustomRNImageManipulatorResult | undefined, optimisticReportID?: string) { +function navigateToAndOpenReport( + userLogins: string[], + shouldDismissModal = true, + reportName?: string, + avatarUri?: string, + avatarFile?: File | CustomRNImageManipulatorResult | undefined, + optimisticReportID?: string, +) { let newChat: ReportUtils.OptimisticChatReport | EmptyObject = {}; let chat: OnyxEntry | EmptyObject = {}; const participantAccountIDs = PersonalDetailsUtils.getAccountIDsByLogins(userLogins); diff --git a/src/pages/NewChatConfirmPage.tsx b/src/pages/NewChatConfirmPage.tsx index c66748f46252..3ae2af28a84b 100644 --- a/src/pages/NewChatConfirmPage.tsx +++ b/src/pages/NewChatConfirmPage.tsx @@ -3,6 +3,7 @@ import {View} from 'react-native'; import {withOnyx} from 'react-native-onyx'; import type {OnyxEntry} from 'react-native-onyx'; import AvatarWithImagePicker from '@components/AvatarWithImagePicker'; +import Badge from '@components/Badge'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import * as Expensicons from '@components/Icon/Expensicons'; import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription'; @@ -12,6 +13,7 @@ import InviteMemberListItem from '@components/SelectionList/InviteMemberListItem import type {ListItem} from '@components/SelectionList/types'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useLocalize from '@hooks/useLocalize'; +import useStyleUtils from '@hooks/useStyleUtils'; import useThemeStyles from '@hooks/useThemeStyles'; import type {CustomRNImageManipulatorResult} from '@libs/cropOrRotateImage/types'; import Navigation from '@libs/Navigation/Navigation'; @@ -23,8 +25,6 @@ import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import type * as OnyxTypes from '@src/types/onyx'; import type {Participant} from '@src/types/onyx/IOU'; -import useStyleUtils from '@hooks/useStyleUtils'; -import Badge from '@components/Badge'; type NewChatConfirmPageOnyxProps = { /** New group chat draft data */ @@ -70,11 +70,13 @@ function NewChatConfirmPage({newGroupDraft, allPersonalDetails}: NewChatConfirmP accountID, icons: selectedOption?.icons, alternateText: selectedOption?.login ?? '', - rightElement: isAdmin ? () : undefined, + rightElement: isAdmin ? ( + + ) : undefined, }; return section; }) diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index aa44cccffefa..2bbcb2c2ed15 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -242,7 +242,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD /> ); - const reportName = useMemo(() => isGroupChat ? ReportUtils.getGroupChatName(undefined, true, report.reportID ?? '') : ReportUtils.getReportName(report), [report, isGroupChat]); + const reportName = useMemo(() => (isGroupChat ? ReportUtils.getGroupChatName(undefined, true, report.reportID ?? '') : ReportUtils.getReportName(report)), [report, isGroupChat]); return (