From 6de50974374c302986f79eba685f80312bb69d27 Mon Sep 17 00:00:00 2001 From: VickyStash Date: Thu, 24 Oct 2024 14:21:50 +0200 Subject: [PATCH 1/3] Update CARDASSIGNED report action text --- src/languages/en.ts | 4 ++-- src/languages/es.ts | 4 ++-- src/languages/params.ts | 5 +++-- src/libs/ReportActionsUtils.ts | 3 ++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 4050993a23f2..635d6c3e6347 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -12,7 +12,7 @@ import type { ApprovalWorkflowErrorParams, ApprovedAmountParams, AssignCardParams, - AssignedYouCardParams, + AssignedCardParams, AssigneeParams, AuthenticationErrorParams, AutoPayApprovedReportsLimitErrorParams, @@ -3140,7 +3140,7 @@ const translations = { brokenConnectionErrorFirstPart: `Card feed connection is broken. Please `, brokenConnectionErrorLink: 'log into your bank ', brokenConnectionErrorSecondPart: 'so we can establish the connection again.', - assignedYouCard: ({link}: AssignedYouCardParams) => `assigned you a ${link}! Imported transactions will appear in this chat.`, + assignedCard: ({ assignee, link}: AssignedCardParams) => `assigned ${assignee} a ${link}! Imported transactions will appear in this chat.`, companyCard: 'company card', chooseCardFeed: 'Choose card feed', }, diff --git a/src/languages/es.ts b/src/languages/es.ts index 1db6616571e2..50e1976ce3ef 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -10,7 +10,7 @@ import type { ApprovalWorkflowErrorParams, ApprovedAmountParams, AssignCardParams, - AssignedYouCardParams, + AssignedCardParams, AssigneeParams, AuthenticationErrorParams, AutoPayApprovedReportsLimitErrorParams, @@ -3180,7 +3180,7 @@ const translations = { brokenConnectionErrorFirstPart: `La conexión de la fuente de tarjetas está rota. Por favor, `, brokenConnectionErrorLink: 'inicia sesión en tu banco ', brokenConnectionErrorSecondPart: 'para que podamos restablecer la conexión.', - assignedYouCard: ({link}: AssignedYouCardParams) => `te ha asignado una ${link}! Las transacciones importadas aparecerán en este chat.`, + assignedCard: ({assignee, link}: AssignedCardParams) => `le ha asignado a ${assignee} una ${link}! Las transacciones importadas aparecerán en este chat.`, companyCard: 'tarjeta de empresa', chooseCardFeed: 'Elige feed de tarjetas', }, diff --git a/src/languages/params.ts b/src/languages/params.ts index 9341b914d1d0..da47b7b13a77 100644 --- a/src/languages/params.ts +++ b/src/languages/params.ts @@ -476,7 +476,8 @@ type SpreadCategoriesParams = { categories: number; }; -type AssignedYouCardParams = { +type AssignedCardParams = { + assignee: string; link: string; }; @@ -558,7 +559,7 @@ export type { FeatureNameParams, SpreadSheetColumnParams, SpreadFieldNameParams, - AssignedYouCardParams, + AssignedCardParams, SpreadCategoriesParams, DelegateRoleParams, DelegatorParams, diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts index ade79ee327a2..a32f201d42de 100644 --- a/src/libs/ReportActionsUtils.ts +++ b/src/libs/ReportActionsUtils.ts @@ -1754,6 +1754,7 @@ function getCardIssuedMessage(reportAction: OnyxEntry, shouldRende reportAction, CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED, CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED_VIRTUAL, + CONST.REPORT.ACTIONS.TYPE.CARD_ASSIGNED, CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS, ) ? getOriginalMessage(reportAction) @@ -1790,7 +1791,7 @@ function getCardIssuedMessage(reportAction: OnyxEntry, shouldRende case CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED_VIRTUAL: return Localize.translateLocal('workspace.expensifyCard.issuedCardVirtual', {assignee, link: expensifyCardLink}); case CONST.REPORT.ACTIONS.TYPE.CARD_ASSIGNED: - return Localize.translateLocal('workspace.companyCards.assignedYouCard', {link: companyCardLink}); + return Localize.translateLocal('workspace.companyCards.assignedCard', {assignee, link: companyCardLink}); case CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS: return Localize.translateLocal(`workspace.expensifyCard.${shouldShowAddMissingDetailsMessage ? 'issuedCardNoShippingDetails' : 'addedShippingDetails'}`, {assignee}); default: From 7bf19a5abe41aec3841ff9706c6463cbd2782d89 Mon Sep 17 00:00:00 2001 From: VickyStash Date: Thu, 24 Oct 2024 14:43:47 +0200 Subject: [PATCH 2/3] Lint fix --- src/languages/en.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 635d6c3e6347..e3a332754e87 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -3140,7 +3140,7 @@ const translations = { brokenConnectionErrorFirstPart: `Card feed connection is broken. Please `, brokenConnectionErrorLink: 'log into your bank ', brokenConnectionErrorSecondPart: 'so we can establish the connection again.', - assignedCard: ({ assignee, link}: AssignedCardParams) => `assigned ${assignee} a ${link}! Imported transactions will appear in this chat.`, + assignedCard: ({assignee, link}: AssignedCardParams) => `assigned ${assignee} a ${link}! Imported transactions will appear in this chat.`, companyCard: 'company card', chooseCardFeed: 'Choose card feed', }, From 8f55d82d9dde052203b6056e34f94de3ad97c009 Mon Sep 17 00:00:00 2001 From: VickyStash Date: Thu, 24 Oct 2024 15:06:03 +0200 Subject: [PATCH 3/3] Fix translation --- 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 50e1976ce3ef..a0cc9e944959 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -3180,7 +3180,7 @@ const translations = { brokenConnectionErrorFirstPart: `La conexión de la fuente de tarjetas está rota. Por favor, `, brokenConnectionErrorLink: 'inicia sesión en tu banco ', brokenConnectionErrorSecondPart: 'para que podamos restablecer la conexión.', - assignedCard: ({assignee, link}: AssignedCardParams) => `le ha asignado a ${assignee} una ${link}! Las transacciones importadas aparecerán en este chat.`, + assignedCard: ({assignee, link}: AssignedCardParams) => `ha asignado a ${assignee} una ${link}! Las transacciones importadas aparecerán en este chat.`, companyCard: 'tarjeta de empresa', chooseCardFeed: 'Elige feed de tarjetas', },