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: 8 additions & 0 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2058,6 +2058,14 @@ export default {
lineItemLevel: 'Line-item level',
reportLevel: 'Report level',
appliedOnExport: 'Not imported into Expensify, applied on export',
shareNote: {
header: 'Easily share your workspace with other members.',
content: {
firstPart:
'Share this QR code or copy the link below to make it easy for members to request access to your workspace. All requests to join the workspace will show up in the',
secondPart: 'room for your review.',
},
},
createNewConnection: 'Create new connection',
reuseExistingConnection: 'Reuse existing connection',
existingConnections: 'Existing connections',
Expand Down
8 changes: 8 additions & 0 deletions src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2092,6 +2092,14 @@ export default {
lineItemLevel: 'Nivel de partida',
reportLevel: 'Nivel de informe',
appliedOnExport: 'No se importa en Expensify, se aplica en la exportación',
shareNote: {
header: 'Comparte fácilmente tu espacio de trabajo con otros miembros.',
content: {
firstPart:
'Comparte este código QR o copia el enlace de abajo para facilitar que los miembros soliciten acceso a tu espacio de trabajo. Todas las solicitudes para unirse al espacio de trabajo aparecerán en la sala',
secondPart: 'para tu revisión.',
},
},
createNewConnection: 'Crear una nueva conexión',
reuseExistingConnection: 'Reutilizar la conexión existente',
existingConnections: 'Conexiones existentes',
Expand Down
34 changes: 32 additions & 2 deletions src/pages/workspace/WorkspaceProfileSharePage.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, {useRef} from 'react';
import React, {useMemo, useRef} from 'react';
import {View} from 'react-native';
import type {ImageSourcePropType} from 'react-native';
import ContextMenuItem from '@components/ContextMenuItem';
Expand All @@ -9,6 +9,8 @@ import QRShare from '@components/QRShare';
import type {QRShareHandle} from '@components/QRShare/types';
import ScreenWrapper from '@components/ScreenWrapper';
import ScrollView from '@components/ScrollView';
import Text from '@components/Text';
import TextLink from '@components/TextLink';
import useEnvironment from '@hooks/useEnvironment';
import useLocalize from '@hooks/useLocalize';
import useStyleUtils from '@hooks/useStyleUtils';
Expand Down Expand Up @@ -50,6 +52,13 @@ function WorkspaceProfileSharePage({policy}: WithPolicyProps) {
const logoBackgroundColor = !hasAvatar ? defaultWorkspaceAvatarColors.backgroundColor?.toString() : undefined;
const svgLogoFillColor = !hasAvatar ? defaultWorkspaceAvatarColors.fill : undefined;

const adminRoom = useMemo(() => {
if (!policy?.id) {
return undefined;
}
return ReportUtils.getRoom(CONST.REPORT.CHAT_TYPE.POLICY_ADMINS, policy?.id);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{BZ CHECKLIST} there was a regression that if there is heavy account all reports are not fetched on sign in admin report can be missing in onyx and hence it links to nothng, we used policy?.chatReportIDAdmins as fallback here to fix it

}, [policy?.id]);

return (
<AccessOrNotFoundWrapper
policyID={policyID}
Expand All @@ -63,8 +72,29 @@ function WorkspaceProfileSharePage({policy}: WithPolicyProps) {
title={translate('common.share')}
onBackButtonPress={Navigation.goBack}
/>
<ScrollView style={[themeStyles.flex1, themeStyles.pt2]}>
<ScrollView style={[themeStyles.flex1, themeStyles.pt3]}>
<View style={[themeStyles.flex1, isSmallScreenWidth ? themeStyles.workspaceSectionMobile : themeStyles.workspaceSection]}>
<View style={[themeStyles.mh5]}>
<Text style={[themeStyles.textHeadlineH1, themeStyles.mb2]}>{translate('workspace.common.shareNote.header')}</Text>
</View>
<View style={[themeStyles.mh5, themeStyles.mb9]}>
<Text style={[themeStyles.textNormal]}>
{translate('workspace.common.shareNote.content.firstPart')}{' '}
<TextLink
style={themeStyles.link}
onPress={() => {
if (!adminRoom?.reportID) {
return;
}
Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(adminRoom.reportID));

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The navigation logic from this line led to the following issue:

because the RHP modal was not being closed before navigating. We fixed the issue by using Navigation.dismissModal() like so:

Navigation.dismissModal(adminRoom.reportID);

which does both, dismiss the modal and then navigate to the room.

}}
>
{CONST.REPORT.WORKSPACE_CHAT_ROOMS.ADMINS}
</TextLink>{' '}
{translate('workspace.common.shareNote.content.secondPart')}
</Text>
</View>

<View style={[themeStyles.workspaceSectionMobile, themeStyles.ph9]}>
{/*
Right now QR code download button is not shown anymore
Expand Down