From 7b5f194cfd4cab6e7b85e8bf6fe27221005974f7 Mon Sep 17 00:00:00 2001 From: Andrew Rosiclair Date: Mon, 1 Jul 2024 12:57:57 -0400 Subject: [PATCH 1/4] clear only notFound error on success --- src/libs/actions/Report.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts index 6a16e88314b7..3761f5b65e0d 100644 --- a/src/libs/actions/Report.ts +++ b/src/libs/actions/Report.ts @@ -783,7 +783,9 @@ function openReport( onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, value: { - errorFields: null, + errorFields: { + notFound: null, + }, }, }, { From 6209ec959e6d6db38bef95d86c8ab19c4cf18268 Mon Sep 17 00:00:00 2001 From: Andrew Rosiclair Date: Mon, 1 Jul 2024 13:31:21 -0400 Subject: [PATCH 2/4] fix formatting for INTEGRATIONSMESSAGE actions --- src/languages/en.ts | 2 +- src/languages/es.ts | 2 +- src/languages/types.ts | 13 ++++++++++++- src/libs/ReportActionsUtils.ts | 5 +++-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 958a1704d239..c27fa6b6026a 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -3053,7 +3053,7 @@ export default { exportedToCSV: `exported this report to CSV`, exportedToIntegration: ({label}: ExportedToIntegrationParams) => `exported this report to ${label}`, forwarded: ({amount, currency}: ForwardedParams) => `approved ${currency}${amount}`, - integrationsMessage: ({errorMessage, label}: IntegrationsMessageParams) => `failed to export this report to ${label}. ${errorMessage}`, + integrationsMessage: (errorMessage: string, label: string) => `failed to export this report to ${label} ("${errorMessage}").`, managerAttachReceipt: `added a receipt`, managerDetachReceipt: `removed the receipt`, markedReimbursed: ({amount, currency}: MarkedReimbursedParams) => `paid ${currency}${amount} elsewhere`, diff --git a/src/languages/es.ts b/src/languages/es.ts index f8664d8b4d2c..731e2af94522 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -3089,7 +3089,7 @@ export default { exportedToCSV: `exportó este informe a CSV`, exportedToIntegration: ({label}: ExportedToIntegrationParams) => `exportó este informe a ${label}`, forwarded: ({amount, currency}: ForwardedParams) => `aprobado ${currency}${amount}`, - integrationsMessage: ({errorMessage, label}: IntegrationsMessageParams) => `no se pudo exportar este informe a ${label}. ${errorMessage}`, + integrationsMessage: (errorMessage: string, label: string) => `no se pudo exportar este informe a ${label} ("${errorMessage}").`, managerAttachReceipt: `agregó un recibo`, managerDetachReceipt: `quitó el recibo`, markedReimbursed: ({amount, currency}: MarkedReimbursedParams) => `pagó ${currency}${amount} en otro lugar`, diff --git a/src/languages/types.ts b/src/languages/types.ts index eb90f2d9e0b2..7ec56760c2f1 100644 --- a/src/languages/types.ts +++ b/src/languages/types.ts @@ -310,7 +310,18 @@ type ExportedToIntegrationParams = {label: string}; type ForwardedParams = {amount: string; currency: string}; -type IntegrationsMessageParams = {errorMessage: string; label: string}; +type IntegrationsMessageParams = { + label: string; + result: { + code?: number; + messages?: string[]; + title?: string; + link?: { + url: string; + text: string; + }; + }; +}; type MarkedReimbursedParams = {amount: string; currency: string}; diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts index c8599d785b22..e749ade365bb 100644 --- a/src/libs/ReportActionsUtils.ts +++ b/src/libs/ReportActionsUtils.ts @@ -1256,8 +1256,9 @@ function getMessageOfOldDotReportAction(oldDotAction: PartialReportAction | OldD case CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION: return Localize.translateLocal('report.actions.type.exportedToIntegration', {label: originalMessage.label}); case CONST.REPORT.ACTIONS.TYPE.INTEGRATIONS_MESSAGE: { - const {errorMessage, label} = originalMessage; - return Localize.translateLocal('report.actions.type.integrationsMessage', {errorMessage, label}); + const {result, label} = originalMessage; + const errorMessage = result.messages?.join(', ') ?? ''; + return Localize.translateLocal('report.actions.type.integrationsMessage', errorMessage, label); } case CONST.REPORT.ACTIONS.TYPE.MANAGER_ATTACH_RECEIPT: return Localize.translateLocal('report.actions.type.managerAttachReceipt'); From f481096abd90b9f8f20de143170484195823e5b4 Mon Sep 17 00:00:00 2001 From: Andrew Rosiclair Date: Mon, 1 Jul 2024 15:29:30 -0400 Subject: [PATCH 3/4] lint --- src/languages/en.ts | 1 - src/languages/es.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index c27fa6b6026a..8edd24a5c4f4 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -33,7 +33,6 @@ import type { GoBackMessageParams, GoToRoomParams, InstantSummaryParams, - IntegrationsMessageParams, LocalTimeParams, LoggedInAsParams, LogSizeParams, diff --git a/src/languages/es.ts b/src/languages/es.ts index 731e2af94522..98f759d35430 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -33,7 +33,6 @@ import type { GoBackMessageParams, GoToRoomParams, InstantSummaryParams, - IntegrationsMessageParams, LocalTimeParams, LoggedInAsParams, LogSizeParams, From c1ac6f8e4d504bce12df7b1fe63ce10ff211b703 Mon Sep 17 00:00:00 2001 From: Andrew Rosiclair Date: Mon, 1 Jul 2024 16:12:29 -0400 Subject: [PATCH 4/4] extra safety check --- src/libs/ReportActionsUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts index e749ade365bb..65aaf4c9de0a 100644 --- a/src/libs/ReportActionsUtils.ts +++ b/src/libs/ReportActionsUtils.ts @@ -1257,7 +1257,7 @@ function getMessageOfOldDotReportAction(oldDotAction: PartialReportAction | OldD return Localize.translateLocal('report.actions.type.exportedToIntegration', {label: originalMessage.label}); case CONST.REPORT.ACTIONS.TYPE.INTEGRATIONS_MESSAGE: { const {result, label} = originalMessage; - const errorMessage = result.messages?.join(', ') ?? ''; + const errorMessage = result?.messages?.join(', ') ?? ''; return Localize.translateLocal('report.actions.type.integrationsMessage', errorMessage, label); } case CONST.REPORT.ACTIONS.TYPE.MANAGER_ATTACH_RECEIPT: