diff --git a/src/components/CollapsibleSection/index.tsx b/src/components/CollapsibleSection/index.tsx index e6e3e9db19da8..8ac641a09eb4f 100644 --- a/src/components/CollapsibleSection/index.tsx +++ b/src/components/CollapsibleSection/index.tsx @@ -50,12 +50,14 @@ function CollapsibleSection({title, children, titleStyle, textStyle, wrapperStyl style={[styles.pb4, styles.flexRow]} role={CONST.ROLE.BUTTON} accessibilityLabel={title} + sentryLabel="CollapsibleSection-Toggle" hoverDimmingValue={1} pressDimmingValue={0.2} > {title} diff --git a/src/components/EmptyStateComponent/index.tsx b/src/components/EmptyStateComponent/index.tsx index ced3a2025f0ec..493a232250921 100644 --- a/src/components/EmptyStateComponent/index.tsx +++ b/src/components/EmptyStateComponent/index.tsx @@ -100,7 +100,12 @@ function EmptyStateComponent({ {HeaderComponent} - {title} + + {title} + {subtitleText ?? (doesSubtitleContainCustomEmojiAndMore ? ( {title} diff --git a/src/components/Section/index.tsx b/src/components/Section/index.tsx index 9b1fa58eb3ab8..5dd4b79d3d9ce 100644 --- a/src/components/Section/index.tsx +++ b/src/components/Section/index.tsx @@ -186,7 +186,16 @@ function Section({ /> )} - {renderTitle ? renderTitle() : !!title && {title}} + {renderTitle + ? renderTitle() + : !!title && ( + + {title} + + )} {cardLayout === CARD_LAYOUT.ICON_ON_RIGHT && ( ({ // we need to know the heights of all list items up-front in order to synchronously compute the layout of any given list item. // So be aware that if you adjust the content of the section header (for example, change the font size), you may need to adjust this explicit height as well. - {section.title} + + {section.title} + ); }; @@ -627,6 +632,7 @@ function BaseSelectionListWithSections({ style={[styles.userSelectNone, styles.flexRow, styles.alignItemsCenter]} onPress={selectAllRow} accessibilityLabel={translate('workspace.people.selectAll')} + sentryLabel="SelectionList-SelectAll" role="button" accessibilityState={{checked: flattenedSections.allSelected}} disabled={flattenedSections.allOptions.length === flattenedSections.disabledOptionsIndexes.length} diff --git a/src/components/WorkspaceEmptyStateSection.tsx b/src/components/WorkspaceEmptyStateSection.tsx index 51b99ad0c4668..6b091c17b2b1b 100644 --- a/src/components/WorkspaceEmptyStateSection.tsx +++ b/src/components/WorkspaceEmptyStateSection.tsx @@ -50,7 +50,12 @@ function WorkspaceEmptyStateSection({icon, subtitle, title, containerStyle, shou - {title} + + {title} + {(!!subtitle || !!subtitleComponent) && ( diff --git a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx index a83bb9c737a26..ac337bd3b8f2a 100644 --- a/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx +++ b/src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx @@ -199,6 +199,7 @@ function BaseOnboardingAccounting({shouldUseNativeStyles, route}: BaseOnboarding key={item.keyForList ?? ''} onPress={() => handleIntegrationSelect(item.keyForList)} accessibilityLabel={item.text} + sentryLabel="OnboardingAccounting-SelectIntegration" accessible={false} hoverStyle={!item.isSelected ? styles.hoveredComponentBG : undefined} style={[styles.onboardingAccountingItem, isSmallScreenWidth && styles.flexBasis100, item.isSelected && styles.activeComponentBG]} @@ -246,7 +247,12 @@ function BaseOnboardingAccounting({shouldUseNativeStyles, route}: BaseOnboarding shouldDisplayHelpButton={false} /> - {translate('onboarding.accounting.title')} + + {translate('onboarding.accounting.title')} + {accountingOptions.map(renderOption)} diff --git a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx index 0bfec76ad176a..d2b3a671f6489 100644 --- a/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx +++ b/src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx @@ -85,7 +85,10 @@ function BaseOnboardingEmployees({shouldUseNativeStyles, route}: BaseOnboardingE }} shouldDisplayHelpButton={false} /> - + {translate('onboarding.employees.title')} - {translate('onboarding.interestedFeatures.title')} + + {translate('onboarding.interestedFeatures.title')} + - {translate('onboarding.whatsYourName')} + + {translate('onboarding.whatsYourName')} + - {translate('onboarding.peopleYouMayKnow')} + + {translate('onboarding.peopleYouMayKnow')} + {translate('onboarding.workspaceYouMayJoin', {domain, email})} - {translate('onboarding.purpose.title')} + + {translate('onboarding.purpose.title')} + - {translate('onboarding.workEmail.title')} + + {translate('onboarding.workEmail.title')} + {translate('onboarding.workEmail.subtitle')} diff --git a/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx b/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx index c96e566fdbce2..cc84c0dbc4f75 100644 --- a/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx +++ b/src/pages/OnboardingWorkEmailValidation/BaseOnboardingWorkEmailValidation.tsx @@ -102,7 +102,12 @@ function BaseOnboardingWorkEmailValidation({shouldUseNativeStyles}: BaseOnboardi ) : ( - {translate('onboarding.workEmailValidation.title')} + + {translate('onboarding.workEmailValidation.title')} + {translate('onboarding.workEmailValidation.magicCodeSent', {workEmail})} - {translate('onboarding.confirmWorkspace.title')} + + {translate('onboarding.confirmWorkspace.title')} + {translate('onboarding.confirmWorkspace.subtitle')} diff --git a/src/pages/OnboardingWorkspaceCurrency/BaseOnboardingWorkspaceCurrency.tsx b/src/pages/OnboardingWorkspaceCurrency/BaseOnboardingWorkspaceCurrency.tsx index 171f89151d44f..937ba35f68620 100644 --- a/src/pages/OnboardingWorkspaceCurrency/BaseOnboardingWorkspaceCurrency.tsx +++ b/src/pages/OnboardingWorkspaceCurrency/BaseOnboardingWorkspaceCurrency.tsx @@ -58,7 +58,12 @@ function BaseOnboardingWorkspaceCurrency({route, shouldUseNativeStyles}: BaseOnb shouldDisplayHelpButton={false} /> - {translate('common.currency')} + + {translate('common.currency')} + - {translate('onboarding.inviteMembers.title')} + + {translate('onboarding.inviteMembers.title')} + {translate('onboarding.inviteMembers.subtitle')} diff --git a/src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx b/src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx index 41e8bc5901186..f431a5d7e65fc 100644 --- a/src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx +++ b/src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx @@ -126,7 +126,12 @@ function BaseOnboardingWorkspaceOptional({shouldUseNativeStyles}: BaseOnboarding /> - {translate('onboarding.workspace.title')} + + {translate('onboarding.workspace.title')} + {translate('onboarding.workspace.subtitle')} diff --git a/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx b/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx index cd0e3970b7c6f..93c472cadee0e 100644 --- a/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx +++ b/src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx @@ -174,7 +174,12 @@ function BaseOnboardingWorkspaces({route, shouldUseNativeStyles}: BaseOnboarding showScrollIndicator customListHeader={ - {translate('onboarding.joinAWorkspace')} + + {translate('onboarding.joinAWorkspace')} + {translate('onboarding.listOfWorkspaces')} } diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx index 6cca7b48f2dd2..de3a3c6176ac7 100644 --- a/src/pages/Search/AdvancedSearchFilters.tsx +++ b/src/pages/Search/AdvancedSearchFilters.tsx @@ -14,7 +14,6 @@ import type {SearchAmountFilterKeys, SearchDateFilterKeys, SearchDatePreset, Sea import SpacerView from '@components/SpacerView'; import Text from '@components/Text'; import useAdvancedSearchFilters from '@hooks/useAdvancedSearchFilters'; -import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useSingleExecution from '@hooks/useSingleExecution'; @@ -29,7 +28,7 @@ import {convertToDisplayStringWithoutCurrency} from '@libs/CurrencyUtils'; import Navigation from '@libs/Navigation/Navigation'; import {createDisplayName} from '@libs/PersonalDetailsUtils'; import {getAllTaxRates, getCleanedTagName} from '@libs/PolicyUtils'; -import {computeReportName} from '@libs/ReportNameUtils'; +import {getReportName} from '@libs/ReportNameUtils'; import { buildCannedSearchQuery, buildQueryStringFromFilterFormValues, @@ -554,9 +553,9 @@ function getFilterExpenseDisplayTitle(filters: Partial, _: LocaleContextProps['translate'], reports: OnyxCollection | undefined, currentUserAccountID: number) { +function getFilterInDisplayTitle(filters: Partial, _: LocaleContextProps['translate'], reports: OnyxCollection | undefined) { return filters.in - ?.map((id) => computeReportName(reports?.[`${ONYXKEYS.COLLECTION.REPORT}${id}`], reports, undefined, undefined, undefined, undefined, undefined, currentUserAccountID)) + ?.map((id) => getReportName(reports?.[`${ONYXKEYS.COLLECTION.REPORT}${id}`])) ?.filter(Boolean) ?.join(', '); } @@ -574,7 +573,6 @@ function AdvancedSearchFilters() { const [policies = getEmptyObject>>()] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: false}); const [currentUserLogin] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false, selector: emailSelector}); - const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails(); const taxRates = getAllTaxRates(policies); @@ -641,7 +639,7 @@ function AdvancedSearchFilters() { ) { filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters[key] ?? [], personalDetails, formatPhoneNumber); } else if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.IN) { - filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, translate, reports, currentUserAccountID); + filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, translate, reports); } else if (key === CONST.SEARCH.SYNTAX_FILTER_KEYS.POLICY_ID) { const workspacesData = workspaces.flatMap((value) => value.data); filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, workspacesData); @@ -709,7 +707,12 @@ function AdvancedSearchFilters() { style={[styles.reportHorizontalRule]} /> )} - {translate(section.titleTranslationKey)} + + {translate(section.titleTranslationKey)} + {section.items.map((item) => { return ( - {title} + + {title} + {subtitle} {note} {description} diff --git a/src/pages/settings/Subscription/SubscriptionPlan/index.tsx b/src/pages/settings/Subscription/SubscriptionPlan/index.tsx index ee558d9784dc1..b5e728085f8ba 100644 --- a/src/pages/settings/Subscription/SubscriptionPlan/index.tsx +++ b/src/pages/settings/Subscription/SubscriptionPlan/index.tsx @@ -23,7 +23,12 @@ function SubscriptionPlan() { const renderTitle = () => { return ( - {translate('subscription.yourPlan.title')} + + {translate('subscription.yourPlan.title')} +