From 142d424d3da2f2120d86e47dd4e3bdf26ff81069 Mon Sep 17 00:00:00 2001 From: Issa Nimaga Date: Tue, 9 Dec 2025 13:39:41 +0000 Subject: [PATCH 1/2] Revert "iOS - Thread - A white screen appears briefly after tapping Leave thread" --- src/pages/ReportDetailsPage.tsx | 43 ++++++++++++--------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index f99ba81a3dd3..a3ac01ddfcec 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -10,6 +10,7 @@ import ConfirmModal from '@components/ConfirmModal'; import DisplayNames from '@components/DisplayNames'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import MentionReportContext from '@components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/MentionReportContext'; +import * as Expensicons from '@components/Icon/Expensicons'; import MenuItem from '@components/MenuItem'; import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription'; import OfflineWithFeedback from '@components/OfflineWithFeedback'; @@ -28,7 +29,6 @@ import useDeleteTransactions from '@hooks/useDeleteTransactions'; import useDuplicateTransactionsAndViolations from '@hooks/useDuplicateTransactionsAndViolations'; import useGetIOUReportFromReportAction from '@hooks/useGetIOUReportFromReportAction'; import useHasOutstandingChildTask from '@hooks/useHasOutstandingChildTask'; -import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; import useOnyx from '@hooks/useOnyx'; @@ -173,7 +173,6 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail const transactionThreadReportID = useMemo(() => getOneTransactionThreadReportID(report, chatReport, reportActions ?? [], isOffline), [reportActions, isOffline, report, chatReport]); // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth const {isSmallScreenWidth} = useResponsiveLayout(); - const expensifyIcons = useMemoizedLazyExpensifyIcons(['Users', 'Gear', 'Send', 'Folder', 'UserPlus', 'Pencil', 'Checkmark', 'Building', 'Exit', 'Bug', 'Camera', 'Trashcan'] as const); /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */ const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`, {canBeMissing: true}); @@ -324,15 +323,6 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail }, [report?.reportID, isOffline, isPrivateNotesFetchTriggered, isSelfDM]); const leaveChat = useCallback(() => { - if (isChatThread && report.parentReportID) { - Navigation.dismissModalWithReport({reportID: report.parentReportID}); - Navigation.isNavigationReady().then(() => { - const isWorkspaceMemberLeavingWorkspaceRoom = isWorkspaceMemberLeavingWorkspaceRoomUtil(report, isPolicyEmployee, isPolicyAdmin); - leaveRoom(report.reportID, isWorkspaceMemberLeavingWorkspaceRoom); - }); - return; - } - Navigation.dismissModal(); Navigation.isNavigationReady().then(() => { if (isRootGroupChat) { @@ -342,12 +332,11 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail const isWorkspaceMemberLeavingWorkspaceRoom = isWorkspaceMemberLeavingWorkspaceRoomUtil(report, isPolicyEmployee, isPolicyAdmin); leaveRoom(report.reportID, isWorkspaceMemberLeavingWorkspaceRoom); }); - }, [isRootGroupChat, isPolicyEmployee, isChatThread, isPolicyAdmin, quickAction?.chatReportID, report]); + }, [isRootGroupChat, isPolicyEmployee, isPolicyAdmin, quickAction?.chatReportID, report]); const shouldShowLeaveButton = canLeaveChat(report, policy, !!reportNameValuePairs?.private_isArchived); const shouldShowGoToWorkspace = shouldShowPolicy(policy, false, currentUserPersonalDetails?.email) && !policy?.isJoinRequestPending; - // eslint-disable-next-line @typescript-eslint/no-deprecated const reportName = Parser.htmlToText(getReportName(report, undefined, undefined, undefined, undefined, reportAttributes)); const additionalRoomDetails = (isPolicyExpenseChat && !!report?.isOwnPolicyExpenseChat) || isExpenseReportUtil(report) || isPolicyExpenseChat || isInvoiceRoom @@ -394,7 +383,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.MEMBERS, translationKey: 'common.members', - icon: expensifyIcons.Users, + icon: Expensicons.Users, subtitle: activeChatMembers.length, isAnonymousAction: false, shouldShowRightIcon: true, @@ -410,7 +399,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.INVITE, translationKey: 'common.invite', - icon: expensifyIcons.Users, + icon: Expensicons.Users, isAnonymousAction: false, shouldShowRightIcon: true, action: () => { @@ -423,7 +412,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.SETTINGS, translationKey: 'common.settings', - icon: expensifyIcons.Gear, + icon: Expensicons.Gear, isAnonymousAction: false, shouldShowRightIcon: true, action: () => { @@ -439,7 +428,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.TRACK.SUBMIT, translationKey: 'actionableMentionTrackExpense.submit', - icon: expensifyIcons.Send, + icon: Expensicons.Send, isAnonymousAction: false, shouldShowRightIcon: true, action: () => { @@ -458,7 +447,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.TRACK.CATEGORIZE, translationKey: 'actionableMentionTrackExpense.categorize', - icon: expensifyIcons.Folder, + icon: Expensicons.Folder, isAnonymousAction: false, shouldShowRightIcon: true, action: () => { @@ -468,7 +457,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.TRACK.SHARE, translationKey: 'actionableMentionTrackExpense.share', - icon: expensifyIcons.UserPlus, + icon: Expensicons.UserPlus, isAnonymousAction: false, shouldShowRightIcon: true, action: () => { @@ -483,7 +472,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.PRIVATE_NOTES, translationKey: 'privateNotes.title', - icon: expensifyIcons.Pencil, + icon: Expensicons.Pencil, isAnonymousAction: false, shouldShowRightIcon: true, action: () => navigateToPrivateNotes(report, currentUserPersonalDetails.accountID, backTo), @@ -496,7 +485,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail if (isCompletedTaskReport(report) && isTaskActionable) { items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.MARK_AS_INCOMPLETE, - icon: expensifyIcons.Checkmark, + icon: Expensicons.Checkmark, translationKey: 'task.markAsIncomplete', isAnonymousAction: false, action: callFunctionIfActionIsAllowed(() => { @@ -511,7 +500,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.GO_TO_WORKSPACE, translationKey: 'workspace.common.goToWorkspace', - icon: expensifyIcons.Building, + icon: Expensicons.Building, action: () => { if (!report?.policyID) { return; @@ -531,7 +520,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.LEAVE_ROOM, translationKey: 'common.leave', - icon: expensifyIcons.Exit, + icon: Expensicons.Exit, isAnonymousAction: true, action: () => { if (getParticipantsAccountIDsForDisplay(report, false, true).length === 1 && isRootGroupChat) { @@ -548,7 +537,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.DEBUG, translationKey: 'debug.debug', - icon: expensifyIcons.Bug, + icon: Expensicons.Bug, action: () => Navigation.navigate(ROUTES.DEBUG_REPORT.getRoute(report.reportID)), isAnonymousAction: true, shouldShowRightIcon: true, @@ -560,7 +549,6 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail isSelfDM, isArchivedRoom, isGroupChat, - expensifyIcons, isDefaultRoom, isChatThread, isPolicyEmployee, @@ -653,7 +641,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail updateGroupChatAvatar(report.reportID); }} onImageSelected={(file) => updateGroupChatAvatar(report.reportID, file)} - editIcon={expensifyIcons.Camera} + editIcon={Expensicons.Camera} editIconStyle={styles.smallEditIconAccount} pendingAction={report.pendingFields?.avatar ?? undefined} errors={report.errorFields?.avatar ?? null} @@ -666,7 +654,6 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail isChatRoom, isThread, isGroupChat, - expensifyIcons, icons, report, styles.avatarXLarge, @@ -1017,7 +1004,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail {shouldShowDeleteButton && ( setIsDeleteModalVisible(true)} /> From 9f6fb2447740ba07bf2220d1806a7f6c3082b610 Mon Sep 17 00:00:00 2001 From: Issa Nimaga Date: Tue, 9 Dec 2025 18:14:11 +0000 Subject: [PATCH 2/2] Fix lint --- src/pages/ReportDetailsPage.tsx | 37 +++++++++++++++++---------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index a3ac01ddfcec..8c67e7d911a9 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -10,7 +10,6 @@ import ConfirmModal from '@components/ConfirmModal'; import DisplayNames from '@components/DisplayNames'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import MentionReportContext from '@components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/MentionReportContext'; -import * as Expensicons from '@components/Icon/Expensicons'; import MenuItem from '@components/MenuItem'; import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription'; import OfflineWithFeedback from '@components/OfflineWithFeedback'; @@ -29,6 +28,7 @@ import useDeleteTransactions from '@hooks/useDeleteTransactions'; import useDuplicateTransactionsAndViolations from '@hooks/useDuplicateTransactionsAndViolations'; import useGetIOUReportFromReportAction from '@hooks/useGetIOUReportFromReportAction'; import useHasOutstandingChildTask from '@hooks/useHasOutstandingChildTask'; +import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; import useOnyx from '@hooks/useOnyx'; @@ -47,6 +47,7 @@ import Parser from '@libs/Parser'; import Permissions from '@libs/Permissions'; import {isPolicyAdmin as isPolicyAdminUtil, isPolicyEmployee as isPolicyEmployeeUtil, shouldShowPolicy} from '@libs/PolicyUtils'; import {getOneTransactionThreadReportID, getOriginalMessage, getTrackExpenseActionableWhisper, isDeletedAction, isMoneyRequestAction, isTrackExpenseAction} from '@libs/ReportActionsUtils'; +import {getReportName as getReportNameFromReportNameUtils} from '@libs/ReportNameUtils'; import { canAddOrDeleteTransactions, canDeleteCardTransactionByLiabilityType, @@ -65,7 +66,6 @@ import { getParticipantsList, getReportDescription, getReportFieldKey, - getReportName, isAdminOwnerApproverOrReportOwner, isArchivedNonExpenseReport, isCanceledTaskReport as isCanceledTaskReportUtil, @@ -155,6 +155,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail const {isOffline} = useNetwork(); const {isRestrictedToPreferredPolicy, preferredPolicyID} = usePreferredPolicy(); const styles = useThemeStyles(); + const expensifyIcons = useMemoizedLazyExpensifyIcons(['Users', 'Gear', 'Send', 'Folder', 'UserPlus', 'Pencil', 'Checkmark', 'Building', 'Exit', 'Bug', 'Camera', 'Trashcan'] as const); const backTo = route.params.backTo; const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`, {canBeMissing: true}); @@ -337,7 +338,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail const shouldShowLeaveButton = canLeaveChat(report, policy, !!reportNameValuePairs?.private_isArchived); const shouldShowGoToWorkspace = shouldShowPolicy(policy, false, currentUserPersonalDetails?.email) && !policy?.isJoinRequestPending; - const reportName = Parser.htmlToText(getReportName(report, undefined, undefined, undefined, undefined, reportAttributes)); + const reportName = Parser.htmlToText(getReportNameFromReportNameUtils(report, reportAttributes)); const additionalRoomDetails = (isPolicyExpenseChat && !!report?.isOwnPolicyExpenseChat) || isExpenseReportUtil(report) || isPolicyExpenseChat || isInvoiceRoom ? chatRoomSubtitle @@ -383,7 +384,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.MEMBERS, translationKey: 'common.members', - icon: Expensicons.Users, + icon: expensifyIcons.Users, subtitle: activeChatMembers.length, isAnonymousAction: false, shouldShowRightIcon: true, @@ -399,7 +400,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.INVITE, translationKey: 'common.invite', - icon: Expensicons.Users, + icon: expensifyIcons.Users, isAnonymousAction: false, shouldShowRightIcon: true, action: () => { @@ -412,7 +413,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.SETTINGS, translationKey: 'common.settings', - icon: Expensicons.Gear, + icon: expensifyIcons.Gear, isAnonymousAction: false, shouldShowRightIcon: true, action: () => { @@ -428,7 +429,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.TRACK.SUBMIT, translationKey: 'actionableMentionTrackExpense.submit', - icon: Expensicons.Send, + icon: expensifyIcons.Send, isAnonymousAction: false, shouldShowRightIcon: true, action: () => { @@ -447,7 +448,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.TRACK.CATEGORIZE, translationKey: 'actionableMentionTrackExpense.categorize', - icon: Expensicons.Folder, + icon: expensifyIcons.Folder, isAnonymousAction: false, shouldShowRightIcon: true, action: () => { @@ -457,7 +458,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.TRACK.SHARE, translationKey: 'actionableMentionTrackExpense.share', - icon: Expensicons.UserPlus, + icon: expensifyIcons.UserPlus, isAnonymousAction: false, shouldShowRightIcon: true, action: () => { @@ -472,7 +473,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.PRIVATE_NOTES, translationKey: 'privateNotes.title', - icon: Expensicons.Pencil, + icon: expensifyIcons.Pencil, isAnonymousAction: false, shouldShowRightIcon: true, action: () => navigateToPrivateNotes(report, currentUserPersonalDetails.accountID, backTo), @@ -485,7 +486,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail if (isCompletedTaskReport(report) && isTaskActionable) { items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.MARK_AS_INCOMPLETE, - icon: Expensicons.Checkmark, + icon: expensifyIcons.Checkmark, translationKey: 'task.markAsIncomplete', isAnonymousAction: false, action: callFunctionIfActionIsAllowed(() => { @@ -500,7 +501,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.GO_TO_WORKSPACE, translationKey: 'workspace.common.goToWorkspace', - icon: Expensicons.Building, + icon: expensifyIcons.Building, action: () => { if (!report?.policyID) { return; @@ -520,7 +521,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.LEAVE_ROOM, translationKey: 'common.leave', - icon: Expensicons.Exit, + icon: expensifyIcons.Exit, isAnonymousAction: true, action: () => { if (getParticipantsAccountIDsForDisplay(report, false, true).length === 1 && isRootGroupChat) { @@ -537,7 +538,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail items.push({ key: CONST.REPORT_DETAILS_MENU_ITEM.DEBUG, translationKey: 'debug.debug', - icon: Expensicons.Bug, + icon: expensifyIcons.Bug, action: () => Navigation.navigate(ROUTES.DEBUG_REPORT.getRoute(report.reportID)), isAnonymousAction: true, shouldShowRightIcon: true, @@ -641,7 +642,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail updateGroupChatAvatar(report.reportID); }} onImageSelected={(file) => updateGroupChatAvatar(report.reportID, file)} - editIcon={Expensicons.Camera} + editIcon={expensifyIcons.Camera} editIconStyle={styles.smallEditIconAccount} pendingAction={report.pendingFields?.avatar ?? undefined} errors={report.errorFields?.avatar ?? null} @@ -743,7 +744,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail const nameSectionGroupWorkspace = ( clearPolicyRoomNameErrors(report?.reportID)} > @@ -790,7 +791,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail const nameSectionTitleField = !!titleField && ( clearPolicyRoomNameErrors(report.reportID)} @@ -1004,7 +1005,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail {shouldShowDeleteButton && ( setIsDeleteModalVisible(true)} />