From af81ede100acd435c7c665389c661be4b1ec8a30 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@home-assistant.io>
Date: Tue, 16 Oct 2018 23:29:40 +0200
Subject: [PATCH] Fix showing sub info (#1785)

---
 .../config/cloud/ha-config-cloud-account.js   | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/panels/config/cloud/ha-config-cloud-account.js b/src/panels/config/cloud/ha-config-cloud-account.js
index 213d3afe9e..b53440d3ce 100644
--- a/src/panels/config/cloud/ha-config-cloud-account.js
+++ b/src/panels/config/cloud/ha-config-cloud-account.js
@@ -199,15 +199,23 @@ class HaConfigCloudAccount extends EventsMixin(LocalizeMixin(PolymerElement)) {
   }
 
   _formatSubscription(subInfo) {
-    return subInfo === null
-      ? "Fetching subscription…"
-      : subInfo.human_description.replace(
-          "{periodEnd}",
-          formatDateTime(
-            new Date(subInfo.subscription.current_period_end * 1000),
-            this.language
-          )
-        );
+    if (subInfo === null) {
+      return "Fetching subscription…";
+    }
+
+    let description = subInfo.human_description;
+
+    if (subInfo.plan_renewal_date) {
+      description = description.replace(
+        "{periodEnd}",
+        formatDateTime(
+          new Date(subInfo.plan_renewal_date * 1000),
+          this.language
+        )
+      );
+    }
+
+    return description;
   }
 
   _alexaChanged(ev) {