From 23704b00ce1b427d1cec701e89f21edad2ec9cd3 Mon Sep 17 00:00:00 2001 From: Yunus M Date: Fri, 6 Sep 2024 11:20:47 +0530 Subject: [PATCH] feat: show RPS message only if user is on trail and trail is not converted to sub (#5860) * feat: show rps message only if user is on trail and trail is not converted to sub * feat: show rps message only if user is on trail and trail is not converted to sub --- .../ServiceMetrics/ServiceMetricTable.tsx | 7 ++++++- .../ServiceTraces/ServiceTracesTable.tsx | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricTable.tsx b/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricTable.tsx index 33a4dd729b..6430cc9c8f 100644 --- a/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricTable.tsx +++ b/frontend/src/container/ServiceApplication/ServiceMetrics/ServiceMetricTable.tsx @@ -69,7 +69,12 @@ function ServiceMetricTable({ const [RPS, setRPS] = useState(0); useEffect(() => { - if (!isFetching && licenseData?.payload?.onTrial && isCloudUserVal) { + if ( + !isFetching && + licenseData?.payload?.onTrial && + !licenseData?.payload?.trialConvertedToSubscription && + isCloudUserVal + ) { if (services.length > 0) { const rps = getTotalRPS(services); setRPS(rps); diff --git a/frontend/src/container/ServiceApplication/ServiceTraces/ServiceTracesTable.tsx b/frontend/src/container/ServiceApplication/ServiceTraces/ServiceTracesTable.tsx index 8b03027a16..6633b7a1aa 100644 --- a/frontend/src/container/ServiceApplication/ServiceTraces/ServiceTracesTable.tsx +++ b/frontend/src/container/ServiceApplication/ServiceTraces/ServiceTracesTable.tsx @@ -26,7 +26,12 @@ function ServiceTraceTable({ const tableColumns = useMemo(() => getColumns(search, false), [search]); useEffect(() => { - if (!isFetching && licenseData?.payload?.onTrial && isCloudUserVal) { + if ( + !isFetching && + licenseData?.payload?.onTrial && + !licenseData?.payload?.trialConvertedToSubscription && + isCloudUserVal + ) { if (services.length > 0) { const rps = getTotalRPS(services); setRPS(rps);