diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
index 717ceaf563..c92b09c7e3 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
@@ -55,15 +55,11 @@
"pendingCancellation" | i18n
}}
-
{{ "nextCharge" | i18n }}
-
- {{
- nextInvoice
- ? (nextInvoice.date | date : "mediumDate") +
- ", " +
- (nextInvoice.amount | currency : "$")
- : "-"
- }}
+
+ {{ "subscriptionExpiration" | i18n }}
+
+
+ {{ nextInvoice ? (nextInvoice.date | date : "mediumDate") : "-" }}
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
index 1a4fa29201..0af283c95a 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts
@@ -99,6 +99,16 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy
return this.sub != null ? this.sub.upcomingInvoice : null;
}
+ get isExpired() {
+ const nextInvoice = this.nextInvoice;
+
+ if (nextInvoice == null) {
+ return false;
+ }
+
+ return new Date(nextInvoice.date).getTime() < Date.now();
+ }
+
get storagePercentage() {
return this.sub != null && this.sub.maxStorageGb
? +(100 * (this.sub.storageGb / this.sub.maxStorageGb)).toFixed(2)
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index b63fa130d8..02ecb4ca21 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -2020,6 +2020,9 @@
"cancelSubscription": {
"message": "Cancel subscription"
},
+ "subscriptionExpiration": {
+ "message": "Subscription expiration"
+ },
"subscriptionCanceled": {
"message": "The subscription has been canceled."
},