diff --git a/frontend/src/component/admin/network/NetworkTrafficUsage/NetworkTrafficUsage.tsx b/frontend/src/component/admin/network/NetworkTrafficUsage/NetworkTrafficUsage.tsx index 96d9e01d02..84881a267c 100644 --- a/frontend/src/component/admin/network/NetworkTrafficUsage/NetworkTrafficUsage.tsx +++ b/frontend/src/component/admin/network/NetworkTrafficUsage/NetworkTrafficUsage.tsx @@ -65,11 +65,11 @@ const NetworkTrafficUsage: FC = () => { usageTotal - totalTraffic > 0 && estimateTrafficDataCost; + const isCurrentMonth = + chartDataSelection.grouping === 'daily' && + chartDataSelection.month === currentMonth; const showConsumptionBillingWarning = - (chartDataSelection.grouping === 'monthly' || - chartDataSelection.month === currentMonth) && - totalTraffic > 0 && - overageCost > 0; + isCurrentMonth && totalTraffic > 0 && overageCost > 0; return ( { purchasedTraffic={ trafficBundles.purchasedTraffic } + currentMonth={isCurrentMonth} /> {showOverageCalculations && ( ({ @@ -64,7 +65,7 @@ const incomingRequestsText = (period: ChartDataSelection): string => { return `Average requests from ${formatMonth(fromMonth)} to ${formatMonth(toMonth)}`; } - return `Incoming requests in ${formatMonth(parseMonthString(period.month))}`; + return `Requests used in ${formatMonth(parseMonthString(period.month))}`; }; export const RequestSummary: FC = ({ @@ -72,6 +73,7 @@ export const RequestSummary: FC = ({ usageTotal, includedTraffic, purchasedTraffic, + currentMonth, }) => { const { locationSettings } = useLocationSettings(); @@ -100,13 +102,13 @@ export const RequestSummary: FC = ({ {includedTraffic > 0 && ( -
Included in your plan monthly
+
Included in your plan
{includedTraffic.toLocaleString('en-US')} requests
)} - {purchasedTraffic > 0 && ( + {purchasedTraffic > 0 && currentMonth && (
Additional traffic purchased
@@ -114,9 +116,9 @@ export const RequestSummary: FC = ({
)} - {includedTraffic > 0 && ( + {includedTraffic > 0 && currentMonth && ( -
Total traffic
+
Total traffic available
{( includedTraffic + purchasedTraffic