diff --git a/src/languages/de.ts b/src/languages/de.ts index df281500a997..f400a7f5c194 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -1717,6 +1717,18 @@ const translations: TranslationDeepObject = { bulkSubtitle: 'Wähle eine zusätzliche genehmigende Person für diese Berichte aus, bevor wir sie durch den restlichen Genehmigungs-Workflow leiten.', }, bulkSubtitle: 'Wählen Sie eine Option, um den Genehmiger für diese Berichte zu ändern.', + delegateSubmitNotOnPolicyForWingman: (originalManager: string) => + `Dieser Bericht wurde an @${originalManager} statt an Sie (deren Urlaubsvertretung) gesendet, weil Sie kein Mitglied der Richtlinie dieses Berichts sind`, + delegateSubmitNotOnPolicyAsOriginalManager: (originalManager: string, delegate: string) => + `Dieser Bericht wurde Ihnen anstelle Ihrer Urlaubsvertretung @${delegate} gesendet, weil sie kein Mitglied der Richtlinie dieses Berichts ist.`, + delegateSubmitNotOnPolicy: (originalManager: string, delegate: string) => + `Dieser Bericht wurde an @${originalManager} statt an die Urlaubsvertretung @${delegate} gesendet, weil diese Person kein Mitglied der Richtlinie dieses Berichts ist`, + delegateSubmitCannotApproveOwnReportForWingman: (originalManager: string) => + `Dieser Bericht wurde zur Genehmigung an @${originalManager} gesendet, da Sie Ihre eigenen Berichte nicht genehmigen können`, + delegateSubmitCannotApproveOwnReportAsOriginalManager: (delegate: string) => + `Dieser Bericht wurde Ihnen zur Genehmigung gesendet, da Ihre Vertretung im Urlaub, @${delegate}, ihre eigenen Berichte nicht genehmigen kann.`, + delegateSubmitCannotApproveOwnReport: (originalManager: string, delegate: string) => + `Dieser Bericht wurde zur Genehmigung an @${originalManager} gesendet, da deren Urlaubsvertretung, @${delegate}, eigene Berichte nicht genehmigen kann`, }, chooseWorkspace: 'Wähle einen Arbeitsbereich', routedDueToDEW: (to: string, reason?: string) => `Bericht weitergeleitet an ${to}${reason ? ` weil ${reason}` : ''}`, diff --git a/src/languages/el.ts b/src/languages/el.ts index e6e9549f242a..7457e6f3eb15 100644 --- a/src/languages/el.ts +++ b/src/languages/el.ts @@ -1762,6 +1762,18 @@ const translations: TranslationDeepObject = { `Επιλέξτε μια επιλογή για να αλλάξετε τον εγκριτή για αυτήν την αναφορά. (Ενημερώστε τις ρυθμίσεις χώρου εργασίας σας για να το αλλάξετε μόνιμα για όλες τις αναφορές.)`, changedApproverMessage: (managerID: number) => `άλλαξε τον εγκρίνοντα σε `, reassignedApproverMessage: (managerID: number) => `ανέθεσε εκ νέου τον εγκρίνοντα στον/στην μέσω ενημέρωσης ροής εργασίας`, + delegateSubmitNotOnPolicyForWingman: (originalManager: string) => + `Η αναφορά στάλθηκε στον/στην @${originalManager} αντί για εσάς (τον/την αναπληρωτή/τριά τους για διακοπές), επειδή δεν είστε μέλος της πολιτικής αυτής της αναφοράς`, + delegateSubmitNotOnPolicyAsOriginalManager: (originalManager: string, delegate: string) => + `Αυτή η αναφορά σας εστάλη αντί για τον αναπληρωτή διακοπών σας @${delegate} επειδή δεν είναι μέλος της πολιτικής αυτής της αναφοράς`, + delegateSubmitNotOnPolicy: (originalManager: string, delegate: string) => + `Αυτή η αναφορά στάλθηκε στον/στην @${originalManager} αντί για τον/την αναπληρωτή/τρια αδείας τους @${delegate}, επειδή δεν είναι μέλος του κανονισμού αυτής της αναφοράς`, + delegateSubmitCannotApproveOwnReportForWingman: (originalManager: string) => + `Αυτή η αναφορά στάλθηκε στον/στην @${originalManager} για έγκριση, επειδή δεν μπορείτε να εγκρίνετε τις δικές σας αναφορές`, + delegateSubmitCannotApproveOwnReportAsOriginalManager: (delegate: string) => + `Αυτή η αναφορά σας στάλθηκε για έγκριση, επειδή ο εκπρόσωπός σας για άδεια, @${delegate}, δεν μπορεί να εγκρίνει τις δικές του αναφορές`, + delegateSubmitCannotApproveOwnReport: (originalManager: string, delegate: string) => + `Αυτή η αναφορά στάλθηκε στον/στη @${originalManager} για έγκριση, καθώς ο/η αναπληρωτής/-τριάς του/της, @${delegate}, δεν μπορεί να εγκρίνει τις δικές του/της αναφορές`, actions: { addApprover: 'Προσθήκη εγκρίνων', addApproverSubtitle: 'Προσθέστε έναν επιπλέον εγκρίνοντα στην υπάρχουσα ροή έγκρισης.', diff --git a/src/languages/en.ts b/src/languages/en.ts index 1b32d75d2101..8a73470a71fc 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -1786,6 +1786,18 @@ const translations = { `Choose an option to change the approver for this report. (Update your workspace settings to change this permanently for all reports.)`, changedApproverMessage: (managerID: number) => `changed the approver to `, reassignedApproverMessage: (managerID: number) => `reassigned the approver to via a workflow update`, + delegateSubmitNotOnPolicyForWingman: (originalManager: string) => + `This report was sent to @${originalManager} instead of you (their Vacation Delegate) because you are not a member of this report's policy`, + delegateSubmitNotOnPolicyAsOriginalManager: (originalManager: string, delegate: string) => + `This report was sent to you instead of your Vacation Delegate @${delegate} because they are not a member of this report's policy`, + delegateSubmitNotOnPolicy: (originalManager: string, delegate: string) => + `This report was sent to @${originalManager} instead of their Vacation Delegate @${delegate} because they are not a member of this report's policy`, + delegateSubmitCannotApproveOwnReportForWingman: (originalManager: string) => + `This report was sent to @${originalManager} for approval since you can't approve your own reports`, + delegateSubmitCannotApproveOwnReportAsOriginalManager: (delegate: string) => + `This report was sent to you for approval since your Vacation Delegate, @${delegate} can't approve their own reports`, + delegateSubmitCannotApproveOwnReport: (originalManager: string, delegate: string) => + `This report was sent to @${originalManager} for approval since their Vacation Delegate, @${delegate} can't approve their own reports`, actions: { addApprover: 'Add approver', addApproverSubtitle: 'Add an additional approver to the existing workflow.', diff --git a/src/languages/es.ts b/src/languages/es.ts index 7669a62716f0..f6c1de1f6c44 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -1716,6 +1716,18 @@ const translations: TranslationDeepObject = { bulkSubtitle: 'Elige un aprobador adicional para estos informes antes de que los enviemos por el resto del flujo de aprobación.', }, bulkSubtitle: 'Elige una opción para cambiar el aprobador de estos informes.', + delegateSubmitNotOnPolicyForWingman: (originalManager: string) => + `Este informe se envió a @${originalManager} en lugar de a ti (su sustituto de vacaciones) porque no eres miembro de la política de este informe`, + delegateSubmitNotOnPolicyAsOriginalManager: (originalManager: string, delegate: string) => + `Este informe se te envió a ti en lugar de a tu sustituto de vacaciones @${delegate} porque no es miembro de la política de este informe`, + delegateSubmitNotOnPolicy: (originalManager: string, delegate: string) => + `Este informe se envió a @${originalManager} en lugar de a su delegado de vacaciones @${delegate} porque no es miembro de la política de este informe`, + delegateSubmitCannotApproveOwnReportForWingman: (originalManager: string) => + `Este informe se envió a @${originalManager} para su aprobación, ya que no puedes aprobar tus propios informes`, + delegateSubmitCannotApproveOwnReportAsOriginalManager: (delegate: string) => + `Este informe se te envió para su aprobación porque tu delegado de vacaciones, @${delegate}, no puede aprobar sus propios informes`, + delegateSubmitCannotApproveOwnReport: (originalManager: string, delegate: string) => + `Este informe se envió a @${originalManager} para su aprobación ya que su delegado de vacaciones, @${delegate}, no puede aprobar sus propios informes`, }, chooseWorkspace: 'Elige un espacio de trabajo', routedDueToDEW: (to: string, reason?: string) => `informe enviado a ${to}${reason ? ` porque ${reason}` : ''}`, diff --git a/src/languages/fr.ts b/src/languages/fr.ts index fb996c6db927..0dd36f1e8cd6 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -1723,6 +1723,18 @@ const translations: TranslationDeepObject = { bulkSubtitle: 'Choisissez un approbateur supplémentaire pour ces rapports avant que nous ne les transmettions pour le reste du flux de validation.', }, bulkSubtitle: 'Choisissez une option pour changer l’approbateur de ces rapports.', + delegateSubmitNotOnPolicyForWingman: (originalManager: string) => + `Cette note de frais a été envoyée à @${originalManager} au lieu de vous (son remplaçant de vacances), car vous n’êtes pas membre de la politique de cette note de frais`, + delegateSubmitNotOnPolicyAsOriginalManager: (originalManager: string, delegate: string) => + `Cette note de frais vous a été envoyée au lieu de votre remplaçant pendant les vacances @${delegate}, car il n’est pas membre de la politique de cette note de frais`, + delegateSubmitNotOnPolicy: (originalManager: string, delegate: string) => + `Cette note de frais a été envoyée à @${originalManager} au lieu de son remplaçant de vacances @${delegate}, car cette personne n’est pas membre de la politique de cette note de frais`, + delegateSubmitCannotApproveOwnReportForWingman: (originalManager: string) => + `Cette note de frais a été envoyée à @${originalManager} pour approbation, car vous ne pouvez pas approuver vos propres notes de frais`, + delegateSubmitCannotApproveOwnReportAsOriginalManager: (delegate: string) => + `Cette note de frais vous a été envoyée pour approbation, car votre remplaçant pour congés, @${delegate}, ne peut pas approuver ses propres notes de frais`, + delegateSubmitCannotApproveOwnReport: (originalManager: string, delegate: string) => + `Cette note de frais a été envoyée à @${originalManager} pour approbation, car son délégué de congés, @${delegate}, ne peut pas approuver ses propres notes de frais`, }, chooseWorkspace: 'Choisir un espace de travail', routedDueToDEW: (to: string, reason?: string) => `note de frais acheminée vers ${to}${reason ? ` parce que ${reason}` : ''}`, diff --git a/src/languages/it.ts b/src/languages/it.ts index af6af932c45d..0f4dcc863c53 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -1716,6 +1716,18 @@ const translations: TranslationDeepObject = { bulkSubtitle: 'Scegli un approvatore aggiuntivo per questi report prima che li instradiamo attraverso il resto del flusso di approvazione.', }, bulkSubtitle: "Scegli un'opzione per cambiare l'approvatore di questi report.", + delegateSubmitNotOnPolicyForWingman: (originalManager: string) => + `Questo report è stato inviato a @${originalManager} invece che a te (il loro Delegato per le ferie) perché non fai parte della policy di questo report`, + delegateSubmitNotOnPolicyAsOriginalManager: (originalManager: string, delegate: string) => + `Questo report è stato inviato a te invece che al tuo delegato per le vacanze @${delegate} perché non è un membro della policy di questo report`, + delegateSubmitNotOnPolicy: (originalManager: string, delegate: string) => + `Questo report è stato inviato a @${originalManager} invece che al/la suo/a delegato/a per le vacanze @${delegate} perché non è membro della policy di questo report`, + delegateSubmitCannotApproveOwnReportForWingman: (originalManager: string) => + `Questo resoconto è stato inviato a @${originalManager} per l'approvazione, dato che non puoi approvare i tuoi stessi resoconti`, + delegateSubmitCannotApproveOwnReportAsOriginalManager: (delegate: string) => + `Questo resoconto ti è stato inviato per l'approvazione perché il tuo delegato per le vacanze, @${delegate}, non può approvare i propri resoconti`, + delegateSubmitCannotApproveOwnReport: (originalManager: string, delegate: string) => + `Questo report è stato inviato a @${originalManager} per l'approvazione, dato che il/la suo/a Delegato/a per le ferie, @${delegate}, non può approvare i propri report`, }, chooseWorkspace: 'Scegli uno spazio di lavoro', routedDueToDEW: (to: string, reason?: string) => `report indirizzato a ${to}${reason ? ` perché ${reason}` : ''}`, diff --git a/src/languages/ja.ts b/src/languages/ja.ts index cbb7db9cfeb4..4a7a792c2c50 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -1698,6 +1698,18 @@ const translations: TranslationDeepObject = { bulkSubtitle: '残りの承認ワークフローに回す前に、これらのレポートの追加承認者を選択してください。', }, bulkSubtitle: 'これらのレポートの承認者を変更する方法を選択してください。', + delegateSubmitNotOnPolicyForWingman: (originalManager: string) => + `このレポートは、あなた(休暇代理人)ではなく、あなたが所属していないこのレポートのポリシーのメンバーであるため、@${originalManager} に送信されました`, + delegateSubmitNotOnPolicyAsOriginalManager: (originalManager: string, delegate: string) => + `このレポートは、休暇代理人である @${delegate} がこのレポートのポリシーのメンバーではないため、代わりにあなたに送信されました`, + delegateSubmitNotOnPolicy: (originalManager: string, delegate: string) => + `このレポートは、このレポートのポリシーのメンバーではないため、休暇代理人の @${delegate} ではなく、@${originalManager} に送信されました`, + delegateSubmitCannotApproveOwnReportForWingman: (originalManager: string) => + `このレポートは、ご自身のレポートをご自身で承認することはできないため、承認のために @${originalManager} に送信されました`, + delegateSubmitCannotApproveOwnReportAsOriginalManager: (delegate: string) => + `このレポートは、休暇代理人の @${delegate} さんが自分のレポートを承認できないため、承認のためにあなたに送信されました`, + delegateSubmitCannotApproveOwnReport: (originalManager: string, delegate: string) => + `このレポートは、休暇代理人である @${delegate} は自分のレポートを承認できないため、承認のために @${originalManager} に送信されました`, }, chooseWorkspace: 'ワークスペースを選択', routedDueToDEW: (to: string, reason?: string) => `レポートは ${to}${reason ? ` ${reason} のため` : ''} に回覧されました`, diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 0b13a1395ed0..1ed62ee2b522 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -1712,6 +1712,18 @@ const translations: TranslationDeepObject = { bulkSubtitle: 'Kies een extra fiatteur voor deze rapporten voordat we ze door de rest van de goedkeuringsworkflow sturen.', }, bulkSubtitle: 'Kies een optie om de fiatteur voor deze rapporten te wijzigen.', + delegateSubmitNotOnPolicyForWingman: (originalManager: string) => + `Dit rapport is naar @${originalManager} gestuurd in plaats van naar jou (hun Vakantievertegenwoordiger), omdat je geen lid bent van het beleid van dit rapport`, + delegateSubmitNotOnPolicyAsOriginalManager: (originalManager: string, delegate: string) => + `Dit rapport is naar jou gestuurd in plaats van naar je vakantiemandataris @${delegate}, omdat die geen lid is van het beleid van dit rapport`, + delegateSubmitNotOnPolicy: (originalManager: string, delegate: string) => + `Dit rapport is naar @${originalManager} gestuurd in plaats van naar hun vervangend manager @${delegate}, omdat die geen lid is van het beleid van dit rapport`, + delegateSubmitCannotApproveOwnReportForWingman: (originalManager: string) => + `Dit rapport is ter goedkeuring naar @${originalManager} gestuurd, omdat je je eigen rapporten niet kunt goedkeuren`, + delegateSubmitCannotApproveOwnReportAsOriginalManager: (delegate: string) => + `Dit rapport is naar jou gestuurd voor goedkeuring omdat je Vakantieplaatsvervanger, @${delegate}, zijn of haar eigen rapporten niet kan goedkeuren`, + delegateSubmitCannotApproveOwnReport: (originalManager: string, delegate: string) => + `Dit rapport is ter goedkeuring naar @${originalManager} gestuurd, omdat hun vervanger tijdens vakantie, @${delegate}, hun eigen rapporten niet kan goedkeuren`, }, chooseWorkspace: 'Kies een werkruimte', routedDueToDEW: (to: string, reason?: string) => `rapport doorgestuurd naar ${to}${reason ? ` omdat ${reason}` : ''}`, diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 513b7a8c0203..35044fa2d477 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -1708,6 +1708,18 @@ const translations: TranslationDeepObject = { bulkSubtitle: 'Wybierz dodatkowego akceptującego dla tych raportów, zanim przekażemy je dalej w pozostałej części procesu zatwierdzania.', }, bulkSubtitle: 'Wybierz opcję, aby zmienić akceptującego dla tych raportów.', + delegateSubmitNotOnPolicyForWingman: (originalManager: string) => + `Ten raport został wysłany do @${originalManager} zamiast do ciebie (twojego Zastępcy na czas urlopu), ponieważ nie jesteś członkiem polityki tego raportu`, + delegateSubmitNotOnPolicyAsOriginalManager: (originalManager: string, delegate: string) => + `Ten raport został wysłany do ciebie zamiast do twojego zastępcy urlopowego @${delegate}, ponieważ nie jest on członkiem polityki tego raportu`, + delegateSubmitNotOnPolicy: (originalManager: string, delegate: string) => + `Ten raport został wysłany do @${originalManager}, a nie do Zastępcy na czas urlopu @${delegate}, ponieważ nie jest on członkiem polityki tego raportu`, + delegateSubmitCannotApproveOwnReportForWingman: (originalManager: string) => + `Ten raport został wysłany do @${originalManager} do zatwierdzenia, ponieważ nie możesz zatwierdzać własnych raportów`, + delegateSubmitCannotApproveOwnReportAsOriginalManager: (delegate: string) => + `Ten raport został wysłany do ciebie do zatwierdzenia, ponieważ twój Zastępca na czas urlopu, @${delegate}, nie może zatwierdzać swoich własnych raportów`, + delegateSubmitCannotApproveOwnReport: (originalManager: string, delegate: string) => + `Ten raport został wysłany do @${originalManager} do zatwierdzenia, ponieważ ich Zastępca na czas urlopu, @${delegate}, nie może zatwierdzać własnych raportów`, }, chooseWorkspace: 'Wybierz przestrzeń roboczą', routedDueToDEW: (to: string, reason?: string) => `raport przekazany do ${to}${reason ? ` bo ${reason}` : ''}`, diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index e86b3fe154a8..20de454e2b5d 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -1711,6 +1711,18 @@ const translations: TranslationDeepObject = { bulkSubtitle: 'Escolha um aprovador adicional para estes relatórios antes de seguirmos pelo restante do fluxo de aprovação.', }, bulkSubtitle: 'Escolha uma opção para alterar o aprovador destes relatórios.', + delegateSubmitNotOnPolicyForWingman: (originalManager: string) => + `Este relatório foi enviado para @${originalManager} em vez de para você (o Delegado de Férias) porque você não é membro da política deste relatório`, + delegateSubmitNotOnPolicyAsOriginalManager: (originalManager: string, delegate: string) => + `Este relatório foi enviado para você em vez do seu Delegado de Férias @${delegate} porque ele não é membro da política deste relatório`, + delegateSubmitNotOnPolicy: (originalManager: string, delegate: string) => + `Este relatório foi enviado para @${originalManager} em vez de para o Delegado de Férias @${delegate} porque ele não é membro da política deste relatório`, + delegateSubmitCannotApproveOwnReportForWingman: (originalManager: string) => + `Este relatório foi enviado para @${originalManager} para aprovação, pois você não pode aprovar seus próprios relatórios`, + delegateSubmitCannotApproveOwnReportAsOriginalManager: (delegate: string) => + `Este relatório foi enviado para você para aprovação, pois seu Delegado de Férias, @${delegate}, não pode aprovar os próprios relatórios`, + delegateSubmitCannotApproveOwnReport: (originalManager: string, delegate: string) => + `Este relatório foi enviado para @${originalManager} para aprovação, já que o representante de férias dele(a), @${delegate}, não pode aprovar os próprios relatórios`, }, chooseWorkspace: 'Escolha um workspace', routedDueToDEW: (to: string, reason?: string) => `relatório encaminhado para ${to}${reason ? ` porque ${reason}` : ''}`, diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 05dccc11ef0f..f70d4e22483f 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -1655,6 +1655,17 @@ const translations: TranslationDeepObject = { bulkSubtitle: '在我们将这些报表提交给其余审批流程之前,请为其选择一位额外审批人。', }, bulkSubtitle: '选择一个选项来更改这些报表的审批人。', + delegateSubmitNotOnPolicyForWingman: (originalManager: string) => + `该报表已发送给 @${originalManager},而不是发送给你(他们的休假代理人),因为你不是此报表所属政策的成员`, + delegateSubmitNotOnPolicyAsOriginalManager: (originalManager: string, delegate: string) => + `此报表被发送给你,而不是你的休假代理人 @${delegate},因为 TA 不是此报表所属政策的成员`, + delegateSubmitNotOnPolicy: (originalManager: string, delegate: string) => + `此报表被发送给 @${originalManager},而不是他们的假期代理人 @${delegate},因为该代理人不是此报表所属策略的成员`, + delegateSubmitCannotApproveOwnReportForWingman: (originalManager: string) => `由于你不能审批自己的报销单,此报销单已发送给 @${originalManager} 审批`, + delegateSubmitCannotApproveOwnReportAsOriginalManager: (delegate: string) => + `由于你的休假代理人 @${delegate} 无法审批自己的报销单,因此此报销单已发送给你审批`, + delegateSubmitCannotApproveOwnReport: (originalManager: string, delegate: string) => + `此报销单已发送给 @${originalManager} 审批,因为其休假代理人 @${delegate} 不能审批自己提交的报销单`, }, chooseWorkspace: '选择工作区', routedDueToDEW: (to: string, reason?: string) => `报销单已转交给 ${to}${reason ? ` 因为 ${reason}` : ''}`, diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts index a1fc21c98d7a..7a04bf779d3e 100644 --- a/src/libs/ReportActionsUtils.ts +++ b/src/libs/ReportActionsUtils.ts @@ -4520,6 +4520,41 @@ function getChangedApproverActionMessage(translate: LocalizedTranslate, reportAc return translate('iou.changeApprover.changedApproverMessage', actorAccountID); } +function getDelegateSubmitMessage( + translate: LocalizedTranslate, + reportAction: OnyxEntry>, + currentUserEmail: string | undefined, +): string { + const originalMessage = getOriginalMessage(reportAction); + const {originalManager, delegate, isOnPolicy = true} = originalMessage ?? {}; + + if (!originalManager || !delegate) { + Log.warn('ACTION_DELEGATE_SUBMIT action missing originalManager or delegate'); + return ''; + } + + const isWingman = currentUserEmail === delegate; + const isOriginalManager = currentUserEmail === originalManager; + + if (!isOnPolicy) { + if (isWingman) { + return translate('iou.changeApprover.delegateSubmitNotOnPolicyForWingman', originalManager); + } + if (isOriginalManager) { + return translate('iou.changeApprover.delegateSubmitNotOnPolicyAsOriginalManager', originalManager, delegate); + } + return translate('iou.changeApprover.delegateSubmitNotOnPolicy', originalManager, delegate); + } + + if (isWingman) { + return translate('iou.changeApprover.delegateSubmitCannotApproveOwnReportForWingman', originalManager); + } + if (isOriginalManager) { + return translate('iou.changeApprover.delegateSubmitCannotApproveOwnReportAsOriginalManager', delegate); + } + return translate('iou.changeApprover.delegateSubmitCannotApproveOwnReport', originalManager, delegate); +} + function getHarvestCreatedExpenseReportMessage(reportID: string | undefined, reportName: string, translate: LocalizedTranslate) { const reportUrl = getReportURLForCurrentContext(reportID); const resolvedName = reportName || (reportID ? `#${reportID}` : ''); @@ -5101,6 +5136,7 @@ export { getVacationer, getSubmittedTo, getChangedApproverActionMessage, + getDelegateSubmitMessage, getUpdatedOwnershipMessage, getUpdatedDefaultTitleMessage, getUpdatedAutoHarvestingMessage, diff --git a/src/libs/ReportNameUtils.ts b/src/libs/ReportNameUtils.ts index 3a8ad6a669c2..d5360e7d39fd 100644 --- a/src/libs/ReportNameUtils.ts +++ b/src/libs/ReportNameUtils.ts @@ -31,6 +31,7 @@ import {formatPhoneNumber as formatPhoneNumberPhoneUtils} from './LocalePhoneNum import {translateLocal} from './Localize'; // eslint-disable-next-line import/no-cycle import {getForReportAction, getMovedReportID} from './ModifiedExpenseMessage'; +import {getCurrentUserEmail} from './Network/NetworkStore'; import Parser from './Parser'; import {temporaryGetDisplayNameOrDefault} from './PersonalDetailsUtils'; import {getCleanedTagName, isPolicyAdmin, isPolicyFieldListEmpty} from './PolicyUtils'; @@ -51,6 +52,7 @@ import { getCurrencyDefaultTaxUpdateMessage, getCustomTaxNameUpdateMessage, getDefaultApproverUpdateMessage, + getDelegateSubmitMessage, getDismissedViolationMessageText, getDynamicExternalWorkflowApproveFailedActionMessage, getDynamicExternalWorkflowSubmitFailedActionMessage, @@ -747,6 +749,13 @@ function computeReportNameBasedOnReportAction({ return Parser.htmlToText(getChangedApproverActionMessage(translate, parentReportAction)); } + if (isActionOfType(parentReportAction, CONST.REPORT.ACTIONS.TYPE.ACTION_DELEGATE_SUBMIT)) { + const delegateSubmitMessage = getDelegateSubmitMessage(translate, parentReportAction, getCurrentUserEmail() ?? undefined); + if (delegateSubmitMessage) { + return Parser.htmlToText(delegateSubmitMessage); + } + } + if (parentReportAction?.actionName && isTagModificationAction(parentReportAction?.actionName)) { return getCleanedTagName(getWorkspaceTagUpdateMessage(translate, parentReportAction) ?? ''); } diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts index 2cde76f07f4a..3cd63907ba68 100644 --- a/src/libs/SidebarUtils.ts +++ b/src/libs/SidebarUtils.ts @@ -64,6 +64,7 @@ import { getCurrencyDefaultTaxUpdateMessage, getCustomTaxNameUpdateMessage, getDefaultApproverUpdateMessage, + getDelegateSubmitMessage, getDeletedApprovalRuleMessage, getDeletedBudgetMessage, getForeignCurrencyDefaultTaxUpdateMessage, @@ -1035,9 +1036,11 @@ function getOptionData({ // We need to remove sms domain in case the last message text has a phone number mention with sms domain. let lastMessageText = Str.removeSMSDomain(lastMessageTextFromReport); - // Specifically for concierge chats, which don't meet any of the conditions in the if statement below + // Specifically for concierge chats and expense reports, which don't meet any of the conditions in the if statement below if (isActionOfType(lastAction, CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_CARD_3DS_TRANSACTION_APPROVAL)) { lastMessageText = getActionableCard3DSTransactionApprovalMessage(translate, lastAction) ?? lastMessageText; + } else if (isActionOfType(lastAction, CONST.REPORT.ACTIONS.TYPE.ACTION_DELEGATE_SUBMIT) && !!getDelegateSubmitMessage(translate, lastAction, currentUserLogin)) { + lastMessageText = Parser.htmlToText(getDelegateSubmitMessage(translate, lastAction, currentUserLogin)); } const isGroupChat = isGroupChatUtil(report) || isDeprecatedGroupDM(report, isReportArchived); diff --git a/src/pages/inbox/report/ContextMenu/ContextMenuActions.tsx b/src/pages/inbox/report/ContextMenu/ContextMenuActions.tsx index 49c7de61ff4c..ed29ef2b74a9 100644 --- a/src/pages/inbox/report/ContextMenu/ContextMenuActions.tsx +++ b/src/pages/inbox/report/ContextMenu/ContextMenuActions.tsx @@ -45,6 +45,7 @@ import { getCurrencyDefaultTaxUpdateMessage, getCustomTaxNameUpdateMessage, getDefaultApproverUpdateMessage, + getDelegateSubmitMessage, getDeletedApprovalRuleMessage, getDeletedBudgetMessage, getDismissedViolationMessageText, @@ -1359,6 +1360,11 @@ const ContextMenuActions: ContextMenuAction[] = [ isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.REASSIGN_APPROVER) ) { setClipboardMessage(getChangedApproverActionMessage(translate, reportAction)); + } else if ( + isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ACTION_DELEGATE_SUBMIT) && + !!getDelegateSubmitMessage(translate, reportAction, currentUserPersonalDetails.email) + ) { + setClipboardMessage(getDelegateSubmitMessage(translate, reportAction, currentUserPersonalDetails.email)); } else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.MOVED_TRANSACTION)) { setClipboardMessage(getMovedTransactionMessage(translate, reportAction, reportAttributes)); } else if (isMovedAction(reportAction)) { diff --git a/src/pages/inbox/report/actionContents/ActionContentRouter.tsx b/src/pages/inbox/report/actionContents/ActionContentRouter.tsx index 7fb4c54dd9c3..5d1370d01715 100644 --- a/src/pages/inbox/report/actionContents/ActionContentRouter.tsx +++ b/src/pages/inbox/report/actionContents/ActionContentRouter.tsx @@ -10,6 +10,7 @@ import TaskPreview from '@components/ReportActionItem/TaskPreview'; import TripRoomPreview from '@components/ReportActionItem/TripRoomPreview'; import UnreportedTransactionAction from '@components/ReportActionItem/UnreportedTransactionAction'; +import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; @@ -19,6 +20,7 @@ import { getChangedApproverActionMessage, getCommuterExclusionMessage, getCompanyCardConnectionBrokenMessage, + getDelegateSubmitMessage, getForwardedReportActionMessage, getIOUReportIDFromReportActionPreview, getOriginalMessage, @@ -160,6 +162,7 @@ function ActionContentRouter({ }: ActionContentRouterProps): React.JSX.Element | null { const {translate, formatTravelDate} = useLocalize(); const styles = useThemeStyles(); + const {email: currentUserEmail} = useCurrentUserPersonalDetails(); const [originalReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${originalReportID}`, {selector: getStableReportSelector}); const [policyRole] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${getNonEmptyStringOnyxID(report?.policyID)}`, {selector: policyRoleSelector}); @@ -507,6 +510,16 @@ function ActionContentRouter({ ); } + if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.ACTION_DELEGATE_SUBMIT)) { + const delegateSubmitMessage = getDelegateSubmitMessage(translate, action, currentUserEmail); + if (delegateSubmitMessage) { + return ( + + ${delegateSubmitMessage}`} /> + + ); + } + } if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.SETTLEMENT_ACCOUNT_LOCKED)) { return ( diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts index 443eec3ca5a1..659407adf82b 100644 --- a/src/types/onyx/OriginalMessage.ts +++ b/src/types/onyx/OriginalMessage.ts @@ -1647,6 +1647,20 @@ type OriginalMessageReassignApprover = { newApproverID: number; }; +/** + * Model of Delegate Submit action original message (posted when a report is auto-forwarded to a vacation delegate) + */ +type OriginalMessageDelegateSubmit = { + /** Email of the manager the report would normally have been sent to */ + originalManager: string; + + /** Email of the vacation delegate the report was sent to (or would have been sent to) */ + delegate: string; + + /** Whether the delegate is a member of the report's policy. Defaults to true when absent. */ + isOnPolicy?: boolean; +}; + /** * Minimal transaction data needed to render the MFA authorize transaction preview. */ @@ -1813,6 +1827,7 @@ type OriginalMessageMap = { [CONST.REPORT.ACTIONS.TYPE.RECEIPT_SCAN_FAILED]: OriginalMessageSmartScanFailed; [CONST.REPORT.ACTIONS.TYPE.REASSIGN_APPROVER]: OriginalMessageReassignApprover; [CONST.REPORT.ACTIONS.TYPE.REROUTE]: OriginalMessageTakeControl; + [CONST.REPORT.ACTIONS.TYPE.ACTION_DELEGATE_SUBMIT]: OriginalMessageDelegateSubmit; [CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DIRECTOR_INFORMATION_REQUIRED]: OriginalMessageReimbursementDirectorInformationRequired; [CONST.REPORT.ACTIONS.TYPE.SETTLEMENT_ACCOUNT_LOCKED]: OriginalMessageSettlementAccountLocked; } & Omit & diff --git a/tests/unit/ReportActionsUtilsTest.ts b/tests/unit/ReportActionsUtilsTest.ts index fb0d27618273..5b80606fa196 100644 --- a/tests/unit/ReportActionsUtilsTest.ts +++ b/tests/unit/ReportActionsUtilsTest.ts @@ -3778,6 +3778,85 @@ describe('ReportActionsUtils', () => { }); }); + describe('getDelegateSubmitMessage', () => { + const originalManagerEmail = 'manager@example.com'; + const delegateEmail = 'delegate@example.com'; + const thirdPartyEmail = 'thirdparty@example.com'; + + const buildDelegateSubmitAction = ( + originalMessage: Partial['originalMessage']> = {}, + ): ReportAction => ({ + actionName: CONST.REPORT.ACTIONS.TYPE.ACTION_DELEGATE_SUBMIT, + created: '2026-06-05 10:00:00', + reportActionID: '1', + originalMessage: { + originalManager: originalManagerEmail, + delegate: delegateEmail, + ...originalMessage, + }, + }); + + it('returns an empty string when originalManager is missing', () => { + const action = buildDelegateSubmitAction({originalManager: undefined}); + + expect(ReportActionsUtils.getDelegateSubmitMessage(translateLocal, action, thirdPartyEmail)).toBe(''); + }); + + it('returns an empty string when delegate is missing', () => { + const action = buildDelegateSubmitAction({delegate: undefined}); + + expect(ReportActionsUtils.getDelegateSubmitMessage(translateLocal, action, thirdPartyEmail)).toBe(''); + }); + + it('returns the wingman message when the delegate is not on the policy', () => { + const action = buildDelegateSubmitAction({isOnPolicy: false}); + + expect(ReportActionsUtils.getDelegateSubmitMessage(translateLocal, action, delegateEmail)).toBe( + translateLocal('iou.changeApprover.delegateSubmitNotOnPolicyForWingman', originalManagerEmail), + ); + }); + + it('returns the original manager message when the delegate is not on the policy', () => { + const action = buildDelegateSubmitAction({isOnPolicy: false}); + + expect(ReportActionsUtils.getDelegateSubmitMessage(translateLocal, action, originalManagerEmail)).toBe( + translateLocal('iou.changeApprover.delegateSubmitNotOnPolicyAsOriginalManager', originalManagerEmail, delegateEmail), + ); + }); + + it('returns the third-party message when the delegate is not on the policy', () => { + const action = buildDelegateSubmitAction({isOnPolicy: false}); + + expect(ReportActionsUtils.getDelegateSubmitMessage(translateLocal, action, thirdPartyEmail)).toBe( + translateLocal('iou.changeApprover.delegateSubmitNotOnPolicy', originalManagerEmail, delegateEmail), + ); + }); + + it('returns the wingman message for the cannot-approve-own-report case', () => { + const action = buildDelegateSubmitAction(); + + expect(ReportActionsUtils.getDelegateSubmitMessage(translateLocal, action, delegateEmail)).toBe( + translateLocal('iou.changeApprover.delegateSubmitCannotApproveOwnReportForWingman', originalManagerEmail), + ); + }); + + it('returns the original manager message for the cannot-approve-own-report case', () => { + const action = buildDelegateSubmitAction(); + + expect(ReportActionsUtils.getDelegateSubmitMessage(translateLocal, action, originalManagerEmail)).toBe( + translateLocal('iou.changeApprover.delegateSubmitCannotApproveOwnReportAsOriginalManager', delegateEmail), + ); + }); + + it('returns the third-party message for the cannot-approve-own-report case', () => { + const action = buildDelegateSubmitAction(); + + expect(ReportActionsUtils.getDelegateSubmitMessage(translateLocal, action, thirdPartyEmail)).toBe( + translateLocal('iou.changeApprover.delegateSubmitCannotApproveOwnReport', originalManagerEmail, delegateEmail), + ); + }); + }); + describe('getPolicyChangeLogMaxExpenseAmountMessage', () => { it('should return set message when setting from disabled to a value', () => { const action = {