diff --git a/frontend/src/container/BillingContainer/BillingContainer.tsx b/frontend/src/container/BillingContainer/BillingContainer.tsx index 54a9aa0ac8..b31f9c4745 100644 --- a/frontend/src/container/BillingContainer/BillingContainer.tsx +++ b/frontend/src/container/BillingContainer/BillingContainer.tsx @@ -186,7 +186,7 @@ export default function BillingContainer(): JSX.Element { [licensesData?.payload?.onTrial], ); - const { isLoading } = useQuery( + const { isLoading, isFetching: isFetchingBillingData } = useQuery( [REACT_QUERY_KEY.GET_BILLING_USAGE, user?.userId], { queryFn: () => getUsage(activeLicense?.key || ''), @@ -332,14 +332,14 @@ export default function BillingContainer(): JSX.Element { const BillingUsageGraphCallback = useCallback( () => - !isLoading ? ( + !isLoading && !isFetchingBillingData ? ( ) : ( ), - [apiResponse, billAmount, isLoading], + [apiResponse, billAmount, isLoading, isFetchingBillingData], ); return ( @@ -364,9 +364,11 @@ export default function BillingContainer(): JSX.Element { {isCloudUserVal ? 'Enterprise Cloud' : 'Enterprise'}{' '} {isFreeTrial ? Free Trial : ''} - - {daysRemaining} {daysRemainingStr} - + {!isLoading && !isFetchingBillingData ? ( + + {daysRemaining} {daysRemainingStr} + + ) : null}