Repository navigation
update beginningOfChatHistory translation #49919
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,59 +1,65 @@ | ||||||
| import React, {useMemo} from 'react'; | ||||||
|
Contributor
There was a problem hiding this comment. Archived Workspace Invoice Chat
This is a Staging vs PR before / after of an archived workspace invoice chat, the way you get an archived workspace invoice chat is by:
Observe the discrepancies between Staging and PR screenshots, missing (archived) and the addition of WS name. |
||||||
| import {View} from 'react-native'; | ||||||
| import type {OnyxEntry} from 'react-native-onyx'; | ||||||
| import {useOnyx} from 'react-native-onyx'; | ||||||
| import useLocalize from '@hooks/useLocalize'; | ||||||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||||||
| import Navigation from '@libs/Navigation/Navigation'; | ||||||
| import * as OptionsListUtils from '@libs/OptionsListUtils'; | ||||||
| import {getPolicy} from '@libs/PolicyUtils'; | ||||||
| import * as ReportUtils from '@libs/ReportUtils'; | ||||||
| import SidebarUtils from '@libs/SidebarUtils'; | ||||||
| import CONST from '@src/CONST'; | ||||||
| import type {IOUType} from '@src/CONST'; | ||||||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||||||
| import ROUTES from '@src/ROUTES'; | ||||||
| import type {Policy, Report} from '@src/types/onyx'; | ||||||
| import {PressableWithoutFeedback} from './Pressable'; | ||||||
| import RenderHTML from './RenderHTML'; | ||||||
| import Text from './Text'; | ||||||
| import UserDetailsTooltip from './UserDetailsTooltip'; | ||||||
|
|
||||||
| type ReportWelcomeTextProps = { | ||||||
| /** The report currently being looked at */ | ||||||
| report: OnyxEntry<Report>; | ||||||
|
|
||||||
| /** The policy for the current route */ | ||||||
| policy: OnyxEntry<Policy>; | ||||||
| }; | ||||||
|
|
||||||
| function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) { | ||||||
| const {translate} = useLocalize(); | ||||||
| const styles = useThemeStyles(); | ||||||
| const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST); | ||||||
| const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report); | ||||||
| // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing | ||||||
| const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID || -1}`); | ||||||
| const isArchivedRoom = ReportUtils.isArchivedRoom(report, reportNameValuePairs); | ||||||
| const isChatRoom = ReportUtils.isChatRoom(report); | ||||||
| const isSelfDM = ReportUtils.isSelfDM(report); | ||||||
| const isInvoiceRoom = ReportUtils.isInvoiceRoom(report); | ||||||
| const isSystemChat = ReportUtils.isSystemChat(report); | ||||||
| const isDefault = !(isChatRoom || isPolicyExpenseChat || isSelfDM || isInvoiceRoom || isSystemChat); | ||||||
| const participantAccountIDs = ReportUtils.getParticipantsAccountIDsForDisplay(report, undefined, undefined, true); | ||||||
|
Contributor
There was a problem hiding this comment. When deleting user from group in offline, the welcome text is not getting updated immediately. Second argument which is |
||||||
| const isMultipleParticipant = participantAccountIDs.length > 1; | ||||||
| const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(OptionsListUtils.getPersonalDetailsForAccountIDs(participantAccountIDs, personalDetails), isMultipleParticipant); | ||||||
| const welcomeMessage = SidebarUtils.getWelcomeMessage(report, policy); | ||||||
| const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, policy, participantAccountIDs); | ||||||
| const filteredOptions = moneyRequestOptions.filter( | ||||||
| (item): item is Exclude<IOUType, typeof CONST.IOU.TYPE.REQUEST | typeof CONST.IOU.TYPE.SEND | typeof CONST.IOU.TYPE.CREATE | typeof CONST.IOU.TYPE.INVOICE> => | ||||||
| item !== CONST.IOU.TYPE.INVOICE, | ||||||
| ); | ||||||
| const additionalText = filteredOptions | ||||||
| .map((item, index) => `${index === filteredOptions.length - 1 ? `${translate('common.or')} ` : ''}${translate(`reportActionsView.iouTypes.${item}`)}`) | ||||||
| .join(', '); | ||||||
| const canEditPolicyDescription = ReportUtils.canEditPolicyDescription(policy); | ||||||
| const reportName = ReportUtils.getReportName(report); | ||||||
| const shouldShowUsePlusButtonText = | ||||||
|
Contributor
There was a problem hiding this comment. This text shouldn't be shown in admin room. #56715 |
||||||
| (moneyRequestOptions.includes(CONST.IOU.TYPE.PAY) || | ||||||
| moneyRequestOptions.includes(CONST.IOU.TYPE.SUBMIT) || | ||||||
| moneyRequestOptions.includes(CONST.IOU.TYPE.TRACK) || | ||||||
| moneyRequestOptions.includes(CONST.IOU.TYPE.SPLIT)) && | ||||||
| !isPolicyExpenseChat; | ||||||
|
Comment on lines
+57
to
+62
Member
There was a problem hiding this comment. @nkdengineer Is there a reason for adding this |
||||||
|
|
||||||
| const navigateToReport = () => { | ||||||
| if (!report?.reportID) { | ||||||
|
|
@@ -112,7 +118,38 @@ function ReportWelcomeText({report, policy, personalDetails}: ReportWelcomeTextP | |||||
| <Text>{welcomeMessage.phrase3}</Text> | ||||||
| </Text> | ||||||
| ))} | ||||||
| {isInvoiceRoom && | ||||||
| !isArchivedRoom && | ||||||
| (welcomeMessage?.messageHtml ? ( | ||||||
| <PressableWithoutFeedback | ||||||
| onPress={() => { | ||||||
| if (!canEditPolicyDescription) { | ||||||
| return; | ||||||
| } | ||||||
| Navigation.navigate(ROUTES.WORKSPACE_PROFILE_DESCRIPTION.getRoute(policy?.id ?? '-1')); | ||||||
|
Contributor
There was a problem hiding this comment. Clicking description is navigating to workspace description, even though this is description of invoice room. #51976 |
||||||
| }} | ||||||
| style={[styles.renderHTML, canEditPolicyDescription ? styles.cursorPointer : styles.cursorText]} | ||||||
| accessibilityLabel={translate('reportDescriptionPage.roomDescription')} | ||||||
| > | ||||||
| <RenderHTML html={welcomeMessage.messageHtml} /> | ||||||
| </PressableWithoutFeedback> | ||||||
| ) : ( | ||||||
| <Text> | ||||||
| <Text>{welcomeMessage.phrase1}</Text> | ||||||
| <Text> | ||||||
| {report?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL ? ( | ||||||
| <Text style={[styles.textStrong]}>{ReportUtils.getDisplayNameForParticipant(report?.invoiceReceiver?.accountID)}</Text> | ||||||
| ) : ( | ||||||
| <Text style={[styles.textStrong]}>{getPolicy(report?.invoiceReceiver?.policyID)?.name}</Text> | ||||||
| )} | ||||||
| </Text> | ||||||
| <Text>{` ${translate('common.and')} `}</Text> | ||||||
| <Text style={[styles.textStrong]}>{ReportUtils.getPolicyName(report)}</Text> | ||||||
| <Text>{welcomeMessage.phrase2}</Text> | ||||||
| </Text> | ||||||
| ))} | ||||||
| {isChatRoom && | ||||||
| (!isInvoiceRoom || isArchivedRoom) && | ||||||
| (welcomeMessage?.messageHtml ? ( | ||||||
| <PressableWithoutFeedback | ||||||
| onPress={() => { | ||||||
|
|
@@ -179,18 +216,13 @@ function ReportWelcomeText({report, policy, personalDetails}: ReportWelcomeTextP | |||||
| ))} | ||||||
| </Text> | ||||||
| )} | ||||||
| {shouldShowUsePlusButtonText && <Text>{translate('reportActionsView.usePlusButton', {additionalText})}</Text>} | ||||||
| {ReportUtils.isConciergeChatReport(report) && <Text>{translate('reportActionsView.askConcierge')}</Text>} | ||||||
| </View> | ||||||
| </> | ||||||
| ); | ||||||
| } | ||||||
|
|
||||||
| ReportWelcomeText.displayName = 'ReportWelcomeText'; | ||||||
|
|
||||||
| export default ReportWelcomeText; | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,7 +19,6 @@ import type { | |
| BadgeFreeTrialParams, | ||
| BeginningOfChatHistoryAdminRoomPartOneParams, | ||
| BeginningOfChatHistoryAnnounceRoomPartOneParams, | ||
| BeginningOfChatHistoryDomainRoomPartOneParams, | ||
| BillingBannerCardAuthenticationRequiredParams, | ||
| BillingBannerCardExpiredParams, | ||
|
|
@@ -265,6 +264,7 @@ const translations = { | |
| phoneNumberPlaceholder: '(xxx) xxx-xxxx', | ||
| email: 'Email', | ||
| and: 'and', | ||
| or: 'or', | ||
| details: 'Details', | ||
| privacy: 'Privacy', | ||
| privacyPolicy: 'Privacy Policy', | ||
|
|
@@ -658,33 +658,34 @@ const translations = { | |
| reportActionsView: { | ||
| beginningOfArchivedRoomPartOne: 'You missed the party in ', | ||
| beginningOfArchivedRoomPartTwo: ", there's nothing to see here.", | ||
| beginningOfChatHistoryDomainRoomPartOne: ({domainRoom}: BeginningOfChatHistoryDomainRoomPartOneParams) => `This chat is with all Expensify members on the ${domainRoom} domain.`, | ||
| beginningOfChatHistoryDomainRoomPartTwo: ' Use it to chat with colleagues, share tips, and ask questions.', | ||
| beginningOfChatHistoryAdminRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAdminRoomPartOneParams) => `This chat is with ${workspaceName} admins.`, | ||
| beginningOfChatHistoryAdminRoomPartTwo: ' Use it to chat about workspace setup and more.', | ||
| beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartOneParams) => `This chat is with everyone in ${workspaceName} workspace.`, | ||
| beginningOfChatHistoryAnnounceRoomPartTwo: ` Use it for the most important announcements.`, | ||
| beginningOfChatHistoryUserRoomPartOne: 'This chat room is for anything ', | ||
| beginningOfChatHistoryUserRoomPartTwo: ' related.', | ||
| beginningOfChatHistoryInvoiceRoomPartOne: `This chat is for invoices between `, | ||
| beginningOfChatHistoryInvoiceRoomPartTwo: `. Use the + button to send an invoice.`, | ||
| beginningOfChatHistory: 'This chat is with ', | ||
| beginningOfChatHistoryPolicyExpenseChatPartOne: 'This is where ', | ||
| beginningOfChatHistoryPolicyExpenseChatPartTwo: ' will submit expenses to ', | ||
| beginningOfChatHistoryPolicyExpenseChatPartThree: ' workspace. Just use the + button.', | ||
|
Contributor
Author
There was a problem hiding this comment. @s77rt The reason is we already have |
||
| beginningOfChatHistorySelfDM: 'This is your personal space. Use it for notes, tasks, drafts, and reminders.', | ||
| beginningOfChatHistorySystemDM: "Welcome! Let's get you set up.", | ||
| chatWithAccountManager: 'Chat with your account manager here', | ||
| sayHello: 'Say hello!', | ||
| yourSpace: 'Your space', | ||
| welcomeToRoom: ({roomName}: WelcomeToRoomParams) => `Welcome to ${roomName}!`, | ||
| usePlusButton: ({additionalText}: UsePlusButtonParams) => `\nUse the + button to ${additionalText} an expense.`, | ||
| askConcierge: '\nAsk questions and get 24/7 realtime support.', | ||
| iouTypes: { | ||
| pay: 'pay', | ||
| split: 'split', | ||
| submit: 'submit', | ||
| track: 'track', | ||
| invoice: 'invoice', | ||
| }, | ||
| }, | ||
| adminOnlyCanPost: 'Only admins can send messages in this room.', | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,7 +17,6 @@ import type { | |
| BadgeFreeTrialParams, | ||
| BeginningOfChatHistoryAdminRoomPartOneParams, | ||
| BeginningOfChatHistoryAnnounceRoomPartOneParams, | ||
| BeginningOfChatHistoryDomainRoomPartOneParams, | ||
| BillingBannerCardAuthenticationRequiredParams, | ||
| BillingBannerCardExpiredParams, | ||
|
|
@@ -256,6 +255,7 @@ const translations = { | |
| phoneNumberPlaceholder: '(xxx) xxx-xxxx', | ||
| email: 'Email', | ||
| and: 'y', | ||
| or: 'o', | ||
| details: 'Detalles', | ||
| privacy: 'Privacidad', | ||
| hidden: 'Oculto', | ||
|
|
@@ -650,34 +650,36 @@ const translations = { | |
| reportActionsView: { | ||
| beginningOfArchivedRoomPartOne: 'Te perdiste la fiesta en ', | ||
| beginningOfArchivedRoomPartTwo: ', no hay nada que ver aquí.', | ||
| beginningOfChatHistoryDomainRoomPartOne: ({domainRoom}: BeginningOfChatHistoryDomainRoomPartOneParams) => | ||
| `Este chat es con todos los miembros de Expensify en el dominio ${domainRoom}.`, | ||
| beginningOfChatHistoryDomainRoomPartTwo: ' Úsalo para chatear con colegas, compartir consejos y hacer preguntas.', | ||
| beginningOfChatHistoryAdminRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAdminRoomPartOneParams) => | ||
| `Este chat es con los administradores del espacio de trabajo ${workspaceName}.`, | ||
| beginningOfChatHistoryAdminRoomPartTwo: ' Use it to chat about workspace setup and more.', | ||
|
Member
There was a problem hiding this comment. Hello we missed this! This should have been in spanish. |
||
| beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartOneParams) => `Este chat es con todos en el espacio de trabajo ${workspaceName}.`, | ||
| beginningOfChatHistoryAnnounceRoomPartTwo: ` Úsalo para hablar sobre la configuración del espacio de trabajo y más.`, | ||
| beginningOfChatHistoryUserRoomPartOne: 'ste chat es para todo lo relacionado con ', | ||
| beginningOfChatHistoryUserRoomPartTwo: ' Fue creado por.', | ||
| beginningOfChatHistoryInvoiceRoomPartOne: `Este chat es para facturas entre `, | ||
| beginningOfChatHistoryInvoiceRoomPartTwo: `. Usa el botón + para enviar una factura.`, | ||
| beginningOfChatHistory: 'Este chat es con', | ||
| beginningOfChatHistoryPolicyExpenseChatPartOne: 'Aquí es donde ', | ||
| beginningOfChatHistoryPolicyExpenseChatPartTwo: ' enviará los gastos al espacio de trabajo ', | ||
| beginningOfChatHistoryPolicyExpenseChatPartThree: '. Solo usa el botón +.', | ||
| beginningOfChatHistorySelfDM: 'Este es tu espacio personal. Úsalo para notas, tareas, borradores y recordatorios.', | ||
| beginningOfChatHistorySystemDM: '¡Bienvenido! Vamos a configurar tu cuenta.', | ||
| chatWithAccountManager: 'Chatea con tu gestor de cuenta aquí', | ||
| sayHello: '¡Saluda!', | ||
| yourSpace: 'Tu espacio', | ||
| welcomeToRoom: ({roomName}: WelcomeToRoomParams) => `¡Bienvenido a ${roomName}!`, | ||
| usePlusButton: ({additionalText}: UsePlusButtonParams) => `\nUsa el botón + para ${additionalText} un gasto`, | ||
| askConcierge: 'Haz preguntas y obtén soporte en tiempo real las 24/7.', | ||
| iouTypes: { | ||
| pay: 'pagar', | ||
| split: 'dividir', | ||
| submit: 'presentar', | ||
| track: 'rastrear', | ||
| invoice: 'facturar', | ||
| }, | ||
| }, | ||
| adminOnlyCanPost: 'Solo los administradores pueden enviar mensajes en esta sala.', | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Copy:
Workspace chat renders additional text at the bottom:
Use the + button to split, submit, or track an expense.