From a2fd4f81dc00e37922f36146a4e52f09abd2019e Mon Sep 17 00:00:00 2001 From: Yauheni Date: Fri, 22 Dec 2023 22:30:17 +0300 Subject: [PATCH 1/6] Fix bug with Send money text displayed in workspace chat --- src/components/ReportWelcomeText.js | 6 ++---- src/languages/en.ts | 8 +++++++- src/languages/es.ts | 8 +++++++- src/languages/types.ts | 5 +++++ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/components/ReportWelcomeText.js b/src/components/ReportWelcomeText.js index a204d0c59aa..868dde4693d 100644 --- a/src/components/ReportWelcomeText.js +++ b/src/components/ReportWelcomeText.js @@ -11,7 +11,6 @@ import * as OptionsListUtils from '@libs/OptionsListUtils'; import * as PolicyUtils from '@libs/PolicyUtils'; import * as ReportUtils from '@libs/ReportUtils'; import reportPropTypes from '@pages/reportPropTypes'; -import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import Text from './Text'; @@ -71,6 +70,7 @@ function ReportWelcomeText(props) { const isUserPolicyAdmin = PolicyUtils.isPolicyAdmin(props.policy); const roomWelcomeMessage = ReportUtils.getRoomWelcomeMessage(props.report, isUserPolicyAdmin); const moneyRequestOptions = ReportUtils.getMoneyRequestOptions(props.report, participantAccountIDs); + const additionalText = _.map(moneyRequestOptions, (item) => props.translate(`reportActionsView.iouTypes.${item}`)).join(', '); return ( <> @@ -130,9 +130,7 @@ function ReportWelcomeText(props) { ))} )} - {(moneyRequestOptions.includes(CONST.IOU.TYPE.SEND) || moneyRequestOptions.includes(CONST.IOU.TYPE.REQUEST)) && ( - {props.translate('reportActionsView.usePlusButton')} - )} + {!!additionalText && {props.translate('reportActionsView.usePlusButton', {additionalText})}} ); diff --git a/src/languages/en.ts b/src/languages/en.ts index 71d27e341ca..ab1a1aad2fa 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -73,6 +73,7 @@ import type { UntilTimeParams, UpdatedTheDistanceParams, UpdatedTheRequestParams, + UsePlusButtonParams, UserIsAlreadyMemberParams, WaitingOnBankAccountParams, WalletProgramParams, @@ -465,7 +466,12 @@ export default { chatWithAccountManager: 'Chat with your account manager here', sayHello: 'Say hello!', welcomeToRoom: ({roomName}: WelcomeToRoomParams) => `Welcome to ${roomName}!`, - usePlusButton: '\n\nYou can also use the + button to send money, request money, or assign a task!', + usePlusButton: ({additionalText}: UsePlusButtonParams) => `\n\nYou can also use the + button to ${additionalText}, or assign a task!`, + iouTypes: { + send: 'send money', + split: 'split bill', + request: 'request money', + }, }, reportAction: { asCopilot: 'as copilot for', diff --git a/src/languages/es.ts b/src/languages/es.ts index 85223c559f8..02f0505be1e 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -72,6 +72,7 @@ import type { UntilTimeParams, UpdatedTheDistanceParams, UpdatedTheRequestParams, + UsePlusButtonParams, UserIsAlreadyMemberParams, WaitingOnBankAccountParams, WalletProgramParams, @@ -458,7 +459,12 @@ export default { chatWithAccountManager: 'Chatea con tu gestor de cuenta aquí', sayHello: '¡Saluda!', welcomeToRoom: ({roomName}: WelcomeToRoomParams) => `¡Bienvenido a ${roomName}!`, - usePlusButton: '\n\n¡También puedes usar el botón + de abajo para enviar dinero, pedir dinero, o asignar una tarea!', + usePlusButton: ({additionalText}: UsePlusButtonParams) => `\n\n¡También puedes usar el botón + de abajo para ${additionalText}, o asignar una tarea!`, + iouTypes: { + send: 'enviar dinero', + split: 'dividir factura', + request: 'redir dinero', + }, }, reportAction: { asCopilot: 'como copiloto de', diff --git a/src/languages/types.ts b/src/languages/types.ts index 8e72c700a9c..6e5021421e0 100644 --- a/src/languages/types.ts +++ b/src/languages/types.ts @@ -74,6 +74,10 @@ type WelcomeToRoomParams = { roomName: string; }; +type UsePlusButtonParams = { + additionalText: string; +}; + type ReportArchiveReasonsClosedParams = { displayName: string; }; @@ -333,4 +337,5 @@ export type { UpdatedTheDistanceParams, WalletProgramParams, TaskCreatedActionParams, + UsePlusButtonParams, }; From 05dd041980f3b3fc4bec03ce4f0cab89ffcdd382 Mon Sep 17 00:00:00 2001 From: Yauheni Date: Tue, 2 Jan 2024 09:59:17 +0300 Subject: [PATCH 2/6] Fix lint issue --- src/components/ReportWelcomeText.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReportWelcomeText.js b/src/components/ReportWelcomeText.js index 735bb59b4fd..f1c86bc764b 100644 --- a/src/components/ReportWelcomeText.js +++ b/src/components/ReportWelcomeText.js @@ -70,7 +70,7 @@ function ReportWelcomeText(props) { const isUserPolicyAdmin = PolicyUtils.isPolicyAdmin(props.policy); const roomWelcomeMessage = ReportUtils.getRoomWelcomeMessage(props.report, isUserPolicyAdmin); const moneyRequestOptions = ReportUtils.getMoneyRequestOptions(props.report, props.policy, participantAccountIDs); - const additionalText = _.map(moneyRequestOptions, (item) => props.translate(`reportActionsView.iouTypes.${item}`)).join(', '); + const additionalText = _.map(moneyRequestOptions, (item) => props.translate(`reportActionsView.iouTypes.${item}`)).join(', '); return ( <> From 342cdc547d81190a62fb5c8bc543eec9b290dd84 Mon Sep 17 00:00:00 2001 From: Yauheni Date: Wed, 3 Jan 2024 17:56:14 +0300 Subject: [PATCH 3/6] Update translate --- src/languages/es.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/es.ts b/src/languages/es.ts index 6900411c54d..8769e9bf762 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -464,7 +464,7 @@ export default { iouTypes: { send: 'enviar dinero', split: 'dividir factura', - request: 'redir dinero', + request: 'pedir dinero', }, }, reportAction: { From 6ce3bce1bdef426b7b0e96dced4658039cc59737 Mon Sep 17 00:00:00 2001 From: Yauheni Date: Wed, 3 Jan 2024 18:01:06 +0300 Subject: [PATCH 4/6] Fix eslint issue --- src/components/ReportWelcomeText.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/ReportWelcomeText.tsx b/src/components/ReportWelcomeText.tsx index 796d3eddf2f..2b5498dc4a8 100644 --- a/src/components/ReportWelcomeText.tsx +++ b/src/components/ReportWelcomeText.tsx @@ -1,4 +1,3 @@ -import _ from 'lodash'; import React from 'react'; import {View} from 'react-native'; import {OnyxEntry, withOnyx} from 'react-native-onyx'; @@ -43,7 +42,7 @@ function ReportWelcomeText({report, policy, personalDetails}: ReportWelcomeTextP const isUserPolicyAdmin = PolicyUtils.isPolicyAdmin(policy); const roomWelcomeMessage = ReportUtils.getRoomWelcomeMessage(report, isUserPolicyAdmin); const moneyRequestOptions = ReportUtils.getMoneyRequestOptions(report, policy, participantAccountIDs); - const additionalText = _.map(moneyRequestOptions, (item) => translate(`reportActionsView.iouTypes.${item}`)).join(', '); + const additionalText = moneyRequestOptions.map((item) => translate(`reportActionsView.iouTypes.${item}`)).join(', '); const navigateToReport = () => { if (!report?.reportID) { From bc0b7a118664cc433581f8a102bb0f7a5e30210e Mon Sep 17 00:00:00 2001 From: Yauheni Date: Wed, 3 Jan 2024 18:06:13 +0300 Subject: [PATCH 5/6] Update translates --- src/languages/en.ts | 2 +- src/languages/es.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 3f1fb3dc5a7..54e18b8c42b 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -470,7 +470,7 @@ export default { usePlusButton: ({additionalText}: UsePlusButtonParams) => `\n\nYou can also use the + button to ${additionalText}, or assign a task!`, iouTypes: { send: 'send money', - split: 'split bill', + split: 'split a bill', request: 'request money', }, }, diff --git a/src/languages/es.ts b/src/languages/es.ts index 8769e9bf762..76a571689d4 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -463,7 +463,7 @@ export default { usePlusButton: ({additionalText}: UsePlusButtonParams) => `\n\n¡También puedes usar el botón + de abajo para ${additionalText}, o asignar una tarea!`, iouTypes: { send: 'enviar dinero', - split: 'dividir factura', + split: 'dividir una factura', request: 'pedir dinero', }, }, From e12f06782aa3c57038325cc911ab3aa8dddc1f3d Mon Sep 17 00:00:00 2001 From: Yauheni Date: Fri, 5 Jan 2024 18:50:03 +0300 Subject: [PATCH 6/6] Update condition for text --- src/components/ReportWelcomeText.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/ReportWelcomeText.tsx b/src/components/ReportWelcomeText.tsx index e1b69725323..b337c358121 100644 --- a/src/components/ReportWelcomeText.tsx +++ b/src/components/ReportWelcomeText.tsx @@ -8,6 +8,7 @@ import Navigation from '@libs/Navigation/Navigation'; import * as OptionsListUtils from '@libs/OptionsListUtils'; import * as PolicyUtils from '@libs/PolicyUtils'; import * as ReportUtils from '@libs/ReportUtils'; +import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import type {PersonalDetailsList, Policy, Report} from '@src/types/onyx'; @@ -112,7 +113,9 @@ function ReportWelcomeText({report, policy, personalDetails}: ReportWelcomeTextP ))} )} - {!!additionalText && {translate('reportActionsView.usePlusButton', {additionalText})}} + {(moneyRequestOptions.includes(CONST.IOU.TYPE.SEND) || moneyRequestOptions.includes(CONST.IOU.TYPE.REQUEST)) && ( + {translate('reportActionsView.usePlusButton', {additionalText})} + )} );