diff --git a/apps/frontend/src/pages/settings/billing/index.vue b/apps/frontend/src/pages/settings/billing/index.vue index 8cb481bc77..b90c57a72a 100644 --- a/apps/frontend/src/pages/settings/billing/index.vue +++ b/apps/frontend/src/pages/settings/billing/index.vue @@ -233,6 +233,7 @@ v-if="subscription.serverInfo" v-bind="subscription.serverInfo" :pending-change="getPendingChange(subscription)" + :cancellation-date="getCancellationDate(subscription)" />

@@ -919,6 +920,13 @@ const getPyroCharge = (subscription) => { ) } +const getCancellationDate = (subscription) => { + const charge = getPyroCharge(subscription) + if (!charge) return null + if (charge.status === 'cancelled') return charge.due + return null +} + const getProductSize = (product) => { if (!product || !product.metadata) return 'Unknown' const ramSize = product.metadata.ram diff --git a/packages/ui/src/components/servers/ServerListing.vue b/packages/ui/src/components/servers/ServerListing.vue index d4b99483c6..fa91c3af00 100644 --- a/packages/ui/src/components/servers/ServerListing.vue +++ b/packages/ui/src/components/servers/ServerListing.vue @@ -1,23 +1,30 @@