Skip to content

fix : combine intro lines into one line #61592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 8, 2025
Merged

fix : combine intro lines into one line #61592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99af144
fix : combine intro lines into one line
samranahm May 7, 2025
9622156
remove redundant conditions from shouldShowUsePlusButtonText
samranahm May 7, 2025
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
15 changes: 7 additions & 8 deletions src/components/ReportWelcomeText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,10 @@ function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) {
.join(', ');
const reportName = getReportName(report);
const shouldShowUsePlusButtonText =
(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 &&
!isAdminRoom;
moneyRequestOptions.includes(CONST.IOU.TYPE.PAY) ||
moneyRequestOptions.includes(CONST.IOU.TYPE.SUBMIT) ||
moneyRequestOptions.includes(CONST.IOU.TYPE.TRACK) ||
moneyRequestOptions.includes(CONST.IOU.TYPE.SPLIT);

const navigateToReport = () => {
if (!report?.reportID) {
Expand Down Expand Up @@ -191,6 +189,7 @@ function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) {
{isSelfDM && (
<Text>
<Text>{welcomeMessage.phrase1}</Text>
{shouldShowUsePlusButtonText && <Text>{translate('reportActionsView.usePlusButton', {additionalText})}</Text>}
</Text>
)}
{isSystemChat && (
Expand Down Expand Up @@ -222,10 +221,10 @@ function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) {
{index < displayNamesWithTooltips.length - 2 && <Text>, </Text>}
</Text>
))}
{shouldShowUsePlusButtonText && <Text>{translate('reportActionsView.usePlusButton', {additionalText})}</Text>}
{isConciergeChatReport(report) && <Text>{translate('reportActionsView.askConcierge')}</Text>}
</Text>
)}
{shouldShowUsePlusButtonText && <Text>{translate('reportActionsView.usePlusButton', {additionalText})}</Text>}
{isConciergeChatReport(report) && <Text>{translate('reportActionsView.askConcierge')}</Text>}
</View>
</>
);
Expand Down
4 changes: 2 additions & 2 deletions src/languages/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,8 +759,8 @@ const translations = {
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.',
usePlusButton: ({additionalText}: UsePlusButtonParams) => ` Use the + button to ${additionalText} an expense.`,
askConcierge: ' Ask questions and get 24/7 realtime support.',
conciergeSupport: '24/7 support',
create: 'create',
iouTypes: {
Expand Down
4 changes: 2 additions & 2 deletions src/languages/es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,8 +753,8 @@ const translations = {
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.',
usePlusButton: ({additionalText}: UsePlusButtonParams) => ` Usa el botón + para ${additionalText} un gasto`,
askConcierge: ' Haz preguntas y obtén soporte en tiempo real las 24/7.',
conciergeSupport: 'Soporte 24/7',
create: 'crear',
iouTypes: {
Expand Down
Loading