diff --git a/src/CONST/index.ts b/src/CONST/index.ts index 086acf144cdc..f77fa8b99094 100644 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -5050,6 +5050,7 @@ const CONST = { INFO: 'info', }, REPORT_DETAILS_MENU_ITEM: { + GO_TO_ROOM: 'goToRoom', MEMBERS: 'member', INVITE: 'invite', SETTINGS: 'settings', diff --git a/src/ROUTES.ts b/src/ROUTES.ts index 6a91800d36da..21171ca2bb76 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -705,7 +705,16 @@ const DYNAMIC_ROUTES = { }, REPORT_DETAILS: { path: 'details', - entryScreens: [SCREENS.RIGHT_MODAL.SEARCH_REPORT, SCREENS.RIGHT_MODAL.EXPENSE_REPORT, SCREENS.REPORT, SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT, SCREENS.SEARCH.ROOT], + entryScreens: [ + SCREENS.RIGHT_MODAL.SEARCH_REPORT, + SCREENS.RIGHT_MODAL.EXPENSE_REPORT, + SCREENS.REPORT, + SCREENS.RIGHT_MODAL.SEARCH_MONEY_REQUEST_REPORT, + SCREENS.SEARCH.ROOT, + SCREENS.WORKSPACE.ROOMS, + ], + getRoute: (reportID: string) => getUrlWithParams('details', {reportID}), + queryParams: ['reportID'], }, REPORT_DETAILS_SHARE_CODE: { path: 'share-code', diff --git a/src/components/Tables/WorkspaceRoomsTable/index.tsx b/src/components/Tables/WorkspaceRoomsTable/index.tsx index f47a5cf27534..b8466bc88907 100644 --- a/src/components/Tables/WorkspaceRoomsTable/index.tsx +++ b/src/components/Tables/WorkspaceRoomsTable/index.tsx @@ -2,6 +2,7 @@ import type {ListRenderItemInfo} from '@shopify/flash-list'; import React, {useEffect, useRef} from 'react'; import type {CompareItemsCallback, IsItemInSearchCallback, TableColumn, TableHandle} from '@components/Table'; import Table from '@components/Table'; +import useBottomSafeSafeAreaPaddingStyle from '@hooks/useBottomSafeSafeAreaPaddingStyle'; import useLocalize from '@hooks/useLocalize'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; @@ -26,6 +27,12 @@ function WorkspaceRoomsTable({rooms, highlightedReportID}: WorkspaceRoomsTablePr const shouldUseNarrowTableLayout = shouldUseNarrowLayout || isMediumScreenWidth; const tableRef = useRef>(null); + const tableBodyContentContainerStyle = useBottomSafeSafeAreaPaddingStyle({ + addBottomSafeAreaPadding: true, + addOfflineIndicatorBottomSafeAreaPadding: true, + style: styles.pb5, + }); + useEffect(() => { if (!highlightedReportID) { return; @@ -83,7 +90,7 @@ function WorkspaceRoomsTable({rooms, highlightedReportID}: WorkspaceRoomsTablePr > - + ); } diff --git a/src/languages/de.ts b/src/languages/de.ts index 32c68c42a5b1..74464d4055e3 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -2904,6 +2904,7 @@ ${amount} für ${merchant} – ${date}`, waitForPDF: 'Bitte warten, während wir das PDF erstellen.', errorPDF: 'Beim Versuch, Ihre PDF zu erstellen, ist ein Fehler aufgetreten', successPDF: 'Dein PDF wurde erstellt! Falls es nicht automatisch heruntergeladen wurde, verwende die Schaltfläche unten.', + goToRoom: 'Zum Raum gehen', }, reportDescriptionPage: { roomDescription: 'Zimmerbeschreibung', diff --git a/src/languages/en.ts b/src/languages/en.ts index 0790bc189b09..844189834ca5 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -2976,6 +2976,7 @@ const translations = { }, }, reportDetailsPage: { + goToRoom: 'Go to room', inWorkspace: (policyName: string) => `in ${policyName}`, generatingPDF: 'Generate PDF', waitForPDF: 'Please wait while we generate the PDF.', diff --git a/src/languages/es.ts b/src/languages/es.ts index a776b7479367..4f2b612baffd 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -2774,6 +2774,7 @@ ${amount} para ${merchant} - ${date}`, }, }, reportDetailsPage: { + goToRoom: 'Ir a la sala', inWorkspace: (policyName) => `en ${policyName}`, generatingPDF: 'Generar PDF', waitForPDF: 'Por favor, espera mientras creamos el PDF.', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 7ba2b143d6e2..e6205c781e82 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -2912,6 +2912,7 @@ ${amount} pour ${merchant} - ${date}`, waitForPDF: 'Veuillez patienter pendant que nous générons le PDF.', errorPDF: 'Une erreur s’est produite lors de la tentative de génération de votre PDF', successPDF: 'Votre PDF a été généré ! S’il ne s’est pas téléchargé automatiquement, utilisez le bouton ci-dessous.', + goToRoom: 'Aller à la salle', }, reportDescriptionPage: { roomDescription: 'Description de la salle', diff --git a/src/languages/it.ts b/src/languages/it.ts index 16c336b978b3..cfb10b505db6 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -2900,6 +2900,7 @@ ${amount} per ${merchant} - ${date}`, waitForPDF: 'Attendi mentre generiamo il PDF.', errorPDF: 'Si è verificato un errore durante il tentativo di generare il tuo PDF', successPDF: 'Il tuo PDF è stato generato! Se non è stato scaricato automaticamente, usa il pulsante qui sotto.', + goToRoom: 'Vai alla stanza', }, reportDescriptionPage: { roomDescription: 'Descrizione stanza', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 2b1a926f2547..c04c371fbc2f 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -2872,6 +2872,7 @@ ${date} の ${merchant} への ${amount}`, waitForPDF: 'PDF を作成しています。しばらくお待ちください。', errorPDF: 'PDF の生成中にエラーが発生しました', successPDF: 'PDFが作成されました!自動的にダウンロードされない場合は、下のボタンを使用してください。', + goToRoom: 'ルームに移動', }, reportDescriptionPage: { roomDescription: '部屋の説明', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 58c0c33708d9..14e09c88894f 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -2897,6 +2897,7 @@ ${amount} voor ${merchant} - ${date}`, waitForPDF: 'Even geduld terwijl we de pdf genereren.', errorPDF: 'Er is een fout opgetreden bij het genereren van je PDF', successPDF: 'Je PDF is gegenereerd! Als het niet automatisch is gedownload, gebruik dan de knop hieronder.', + goToRoom: 'Ga naar kamer', }, reportDescriptionPage: { roomDescription: 'Kamerbeschrijving', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index ae2c2b5fa0a2..2d575ff4aef3 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -2891,6 +2891,7 @@ ${amount} dla ${merchant} - ${date}`, waitForPDF: 'Poczekaj, aż wygenerujemy plik PDF.', errorPDF: 'Wystąpił błąd podczas próby wygenerowania Twojego pliku PDF', successPDF: 'Twój plik PDF został wygenerowany! Jeśli nie pobrał się automatycznie, użyj przycisku poniżej.', + goToRoom: 'Przejdź do pokoju', }, reportDescriptionPage: { roomDescription: 'Opis pokoju', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index de0e271772de..6a2cab247bbd 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -2891,6 +2891,7 @@ ${amount} para ${merchant} - ${date}`, waitForPDF: 'Aguarde enquanto geramos o PDF.', errorPDF: 'Ocorreu um erro ao tentar gerar seu PDF', successPDF: 'Seu PDF foi gerado! Se ele não foi baixado automaticamente, use o botão abaixo.', + goToRoom: 'Ir para a sala', }, reportDescriptionPage: { roomDescription: 'Descrição do quarto', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 1df8087de864..77d7de13b4ad 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -2815,6 +2815,7 @@ ${amount},商户:${merchant} - 日期:${date}`, waitForPDF: '正在生成 PDF,请稍候。', errorPDF: '尝试生成您的 PDF 时出错', successPDF: '您的 PDF 已生成!如果没有自动下载,请使用下面的按钮。', + goToRoom: '进入房间', }, reportDescriptionPage: { roomDescription: '房间描述', diff --git a/src/pages/DynamicReportDetailsPage.tsx b/src/pages/DynamicReportDetailsPage.tsx index f2704f94a301..012fc32ec6b0 100644 --- a/src/pages/DynamicReportDetailsPage.tsx +++ b/src/pages/DynamicReportDetailsPage.tsx @@ -47,6 +47,7 @@ import useThemeStyles from '@hooks/useThemeStyles'; import getBase62ReportID from '@libs/getBase62ReportID'; import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID'; import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute'; +import isReportTopmostSplitNavigator from '@libs/Navigation/helpers/isReportTopmostSplitNavigator'; import Navigation, {navigationRef} from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {ReportDetailsNavigatorParamList, RightModalNavigatorParamList} from '@libs/Navigation/types'; @@ -179,6 +180,7 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report 'Camera', 'Trashcan', 'ArrowSplit', + 'Hashtag', ]); const navigateBackFromReportDetailsPath = useDynamicBackPath(DYNAMIC_ROUTES.REPORT_DETAILS.path); @@ -379,7 +381,11 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report }, [showConfirmModal, translate, leaveChat]); const shouldShowLeaveButton = canLeaveChat(report, policy, currentUserPersonalDetails?.accountID, !!reportNameValuePairs?.private_isArchived); - const shouldShowGoToWorkspace = shouldShowPolicy(policy, false, currentUserPersonalDetails?.email) && !policy?.isJoinRequestPending; + + // Only show the "Go to room" row when the Details page was opened from a screen other than the room report itself (e.g. the Workspace rooms list). + const isRoomCurrentlyOpen = isReportTopmostSplitNavigator() && Navigation.getTopmostReportId() === report?.reportID; + const shouldShowGoToRoom = (isChatRoom || isPolicyExpenseChat) && !isRoomCurrentlyOpen; + const shouldShowGoToWorkspace = shouldShowPolicy(policy, false, currentUserPersonalDetails?.email) && !policy?.isJoinRequestPending && !shouldShowGoToRoom; const reportForHeader = useMemo(() => getReportForHeader(report), [report]); const shouldParseFullTitle = parentReportAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT && !isGroupChat; @@ -411,6 +417,19 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report return items; } + if (shouldShowGoToRoom) { + items.push({ + key: CONST.REPORT_DETAILS_MENU_ITEM.GO_TO_ROOM, + translationKey: 'reportDetailsPage.goToRoom', + icon: expensifyIcons.Hashtag, + isAnonymousAction: false, + shouldShowRightIcon: true, + action: () => { + Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report?.reportID)); + }, + }); + } + // The Members page is only shown when: // - The report is a thread in a chat report // - The report is not a user created room with participants to show i.e. DM, Group Chat, etc @@ -630,6 +649,7 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report }, [ isSelfDM, isArchivedRoom, + shouldShowGoToRoom, isGroupChat, isDefaultRoom, isChatThread, @@ -660,6 +680,7 @@ function DynamicReportDetailsPage({policy, report, route, reportMetadata, report expensifyIcons.Building, expensifyIcons.Exit, expensifyIcons.Bug, + expensifyIcons.Hashtag, styles.ph2, shouldOpenRoomMembersPage, navigateBackFromReportDetailsPath, diff --git a/src/pages/workspace/rooms/WorkspaceRoomsPage.tsx b/src/pages/workspace/rooms/WorkspaceRoomsPage.tsx index b4b1b912f814..f00f31a7580f 100644 --- a/src/pages/workspace/rooms/WorkspaceRoomsPage.tsx +++ b/src/pages/workspace/rooms/WorkspaceRoomsPage.tsx @@ -19,16 +19,18 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; import useWorkspaceDocumentTitle from '@hooks/useWorkspaceDocumentTitle'; import {openPolicyRoomsPage} from '@libs/actions/Policy/Room'; +import createDynamicRoute from '@libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import {getDisplayNameOrDefault} from '@libs/PersonalDetailsUtils'; +import {isPolicyAdmin} from '@libs/PolicyUtils'; import {getReportName} from '@libs/ReportNameUtils'; import {getParticipantsAccountIDsForDisplay} from '@libs/ReportUtils'; import type {WorkspaceSplitNavigatorParamList} from '@navigation/types'; import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; -import ROUTES from '@src/ROUTES'; +import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; type WorkspaceRoomsPageProps = PlatformStackScreenProps; @@ -42,6 +44,7 @@ function WorkspaceRoomsPage({route}: WorkspaceRoomsPageProps) { const illustrations = useMemoizedLazyIllustrations(['Hashtag']); const policyID = route.params.policyID; const policy = usePolicy(policyID); + const isAdmin = isPolicyAdmin(policy); useWorkspaceDocumentTitle(policy?.name, 'workspace.common.rooms'); const reportAttributes = useReportAttributes(); @@ -70,7 +73,10 @@ function WorkspaceRoomsPage({route}: WorkspaceRoomsPageProps) { ownerAvatar: ownerDetails?.avatar, ownerDisplayName: ownerDetails ? getDisplayNameOrDefault(ownerDetails) : '', memberCount: getParticipantsAccountIDsForDisplay(report, true, false, false, undefined, personalDetails).length, - action: () => Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report.reportID)), + action: () => { + const targetRoute = isAdmin ? createDynamicRoute(DYNAMIC_ROUTES.REPORT_DETAILS.getRoute(report.reportID)) : ROUTES.REPORT_WITH_ID.getRoute(report.reportID); + Navigation.navigate(targetRoute); + }, }; });