From 26cffabe6133f0ff70451091d6bddd4504f7f85d Mon Sep 17 00:00:00 2001 From: Matan Yadaev Date: Tue, 28 Jan 2025 16:49:17 +0200 Subject: [PATCH 1/2] chore: error message change --- .../src/business-report/business-report.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/workflows-service/src/business-report/business-report.service.ts b/services/workflows-service/src/business-report/business-report.service.ts index 76b8a86957..29ce3734a1 100644 --- a/services/workflows-service/src/business-report/business-report.service.ts +++ b/services/workflows-service/src/business-report/business-report.service.ts @@ -31,7 +31,7 @@ export class BusinessReportService { if (businessReportsCount >= maxBusinessReports) { throw new BadRequestException( - `You have reached the maximum number of business reports allowed (${maxBusinessReports}).`, + `You've hit your reports limit. Talk to us to unlock additional features and continue effective risk management with Ballerine.`, ); } } From 0fbf2ee71bfce306e68fa414f81a44cda85af900 Mon Sep 17 00:00:00 2001 From: Matan Yadaev Date: Tue, 28 Jan 2025 19:21:39 +0200 Subject: [PATCH 2/2] fix: use displayDate instead of createdAt --- .../src/domains/business-reports/fetchers.ts | 1 + .../components/MerchantMonitoringTable/columns.tsx | 10 +++------- .../MerchantMonitoringBusinessReport.page.tsx | 4 ++-- .../src/business-report/merchant-monitoring-client.ts | 4 ++++ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/apps/backoffice-v2/src/domains/business-reports/fetchers.ts b/apps/backoffice-v2/src/domains/business-reports/fetchers.ts index 39be1a3977..08978960dd 100644 --- a/apps/backoffice-v2/src/domains/business-reports/fetchers.ts +++ b/apps/backoffice-v2/src/domains/business-reports/fetchers.ts @@ -23,6 +23,7 @@ export const BusinessReportSchema = z reportType: z.enum([MERCHANT_REPORT_TYPES[0]!, ...MERCHANT_REPORT_TYPES.slice(1)]), createdAt: z.string().datetime(), updatedAt: z.string().datetime(), + displayDate: z.string().datetime(), riskScore: z.number().nullable(), status: z.enum([MERCHANT_REPORT_STATUSES[0]!, ...MERCHANT_REPORT_STATUSES.slice(1)]), parentCompanyName: z.string().nullable(), diff --git a/apps/backoffice-v2/src/pages/MerchantMonitoring/components/MerchantMonitoringTable/columns.tsx b/apps/backoffice-v2/src/pages/MerchantMonitoring/components/MerchantMonitoringTable/columns.tsx index 506e1ec834..ad8797416d 100644 --- a/apps/backoffice-v2/src/pages/MerchantMonitoring/components/MerchantMonitoringTable/columns.tsx +++ b/apps/backoffice-v2/src/pages/MerchantMonitoring/components/MerchantMonitoringTable/columns.tsx @@ -153,16 +153,12 @@ export const columns = [ }, header: 'Alert', }), - columnHelper.accessor('createdAt', { + columnHelper.accessor('displayDate', { cell: info => { - const createdAt = info.getValue(); - - if (!createdAt) { - return {createdAt}; - } + const displayDate = info.getValue(); // Convert UTC time to local browser time - const localDateTime = dayjs.utc(createdAt).local(); + const localDateTime = dayjs.utc(displayDate).local(); const date = localDateTime.format('MMM DD, YYYY'); const time = localDateTime.format('HH:mm'); diff --git a/apps/backoffice-v2/src/pages/MerchantMonitoringBusinessReport/MerchantMonitoringBusinessReport.page.tsx b/apps/backoffice-v2/src/pages/MerchantMonitoringBusinessReport/MerchantMonitoringBusinessReport.page.tsx index 8f99fc0b81..2b10ad44cc 100644 --- a/apps/backoffice-v2/src/pages/MerchantMonitoringBusinessReport/MerchantMonitoringBusinessReport.page.tsx +++ b/apps/backoffice-v2/src/pages/MerchantMonitoringBusinessReport/MerchantMonitoringBusinessReport.page.tsx @@ -272,8 +272,8 @@ export const MerchantMonitoringBusinessReport: FunctionComponent = () => {
Created at - {businessReport?.createdAt && - dayjs(new Date(businessReport?.createdAt)).format('HH:mm MMM Do, YYYY')} + {businessReport?.displayDate && + dayjs(new Date(businessReport?.displayDate)).format('HH:mm MMM Do, YYYY')}
Monitoring Status diff --git a/services/workflows-service/src/business-report/merchant-monitoring-client.ts b/services/workflows-service/src/business-report/merchant-monitoring-client.ts index e8f2e1a3fe..df1fcfa26e 100644 --- a/services/workflows-service/src/business-report/merchant-monitoring-client.ts +++ b/services/workflows-service/src/business-report/merchant-monitoring-client.ts @@ -50,6 +50,10 @@ const ReportSchema = z.object({ .string() .datetime() .transform(value => new Date(value)), + displayDate: z + .string() + .datetime() + .transform(value => new Date(value)), data: z.record(z.string(), z.unknown()).nullish(), });