diff --git a/Common/Types/Billing/SubscriptionStatus.ts b/Common/Types/Billing/SubscriptionStatus.ts index 649871d3c9..1fedb525ee 100644 --- a/Common/Types/Billing/SubscriptionStatus.ts +++ b/Common/Types/Billing/SubscriptionStatus.ts @@ -33,17 +33,15 @@ export class SubscriptionStatusUtil { public static isSubscriptionOverdue( status?: SubscriptionStatus | undefined, - ): boolean { + ): boolean { if (!status) { return false; } - return ( - status === SubscriptionStatus.PastDue - ); + return status === SubscriptionStatus.PastDue; } - // is subscription canclled. + // is subscription canclled. public static isSubscriptionCancelled( status?: SubscriptionStatus | undefined, ): boolean { diff --git a/Common/UI/Utils/Project.ts b/Common/UI/Utils/Project.ts index 2831867b17..6d661d2564 100644 --- a/Common/UI/Utils/Project.ts +++ b/Common/UI/Utils/Project.ts @@ -52,7 +52,7 @@ export default class ProjectUtil { data.paymentProviderSubscriptionStatus, ); - const isSubscriptionOverdue: boolean = + const isSubscriptionOverdue: boolean = SubscriptionStatusUtil.isSubscriptionOverdue( data.paymentProviderMeteredSubscriptionStatus, ) || diff --git a/Dashboard/src/Components/MasterPage/MasterPage.tsx b/Dashboard/src/Components/MasterPage/MasterPage.tsx index aa24aac2e9..dc72e83225 100644 --- a/Dashboard/src/Components/MasterPage/MasterPage.tsx +++ b/Dashboard/src/Components/MasterPage/MasterPage.tsx @@ -4,7 +4,9 @@ import Footer from "../Footer/Footer"; import Header from "../Header/Header"; import NavBar from "../NavBar/NavBar"; import Route from "Common/Types/API/Route"; -import SubscriptionStatus, { SubscriptionStatusUtil } from "Common/Types/Billing/SubscriptionStatus"; +import SubscriptionStatus, { + SubscriptionStatusUtil, +} from "Common/Types/Billing/SubscriptionStatus"; import SSOAuthorizationException from "Common/Types/Exception/SsoAuthorizationException"; import AppLink from "../AppLink/AppLink"; import MasterPage from "Common/UI/Components/MasterPage/MasterPage"; @@ -53,14 +55,15 @@ const DashboardMasterPage: FunctionComponent = ( let isSubscriptionOverdue: boolean = false; if (props.selectedProject) { - isSubscriptionInactiveOrOverdue = ProjectUtil.setIsSubscriptionInactiveOrOverdue({ - paymentProviderMeteredSubscriptionStatus: - props.selectedProject?.paymentProviderMeteredSubscriptionStatus || - SubscriptionStatus.Active, - paymentProviderSubscriptionStatus: - props.selectedProject?.paymentProviderSubscriptionStatus || - SubscriptionStatus.Active, - }); + isSubscriptionInactiveOrOverdue = + ProjectUtil.setIsSubscriptionInactiveOrOverdue({ + paymentProviderMeteredSubscriptionStatus: + props.selectedProject?.paymentProviderMeteredSubscriptionStatus || + SubscriptionStatus.Active, + paymentProviderSubscriptionStatus: + props.selectedProject?.paymentProviderSubscriptionStatus || + SubscriptionStatus.Active, + }); isSubscriptionOverdue = SubscriptionStatusUtil.isSubscriptionOverdue( @@ -78,7 +81,11 @@ const DashboardMasterPage: FunctionComponent = ( {BILLING_ENABLED && isSubscriptionInactiveOrOverdue && (