Show queued subscription access and fix forecast time plotting

2026-04-13 16:35:22 +08:00
parent 57acbc41c9
commit 41cfb65b92
8 changed files with 374 additions and 61 deletions
@@ -38,7 +38,11 @@ export function HeaderBar() {
  const accountAria = isAuthenticated
    ? t("header.accountAria")
    : t("header.signInAria");
-  const expiryInfo = parseExpiryInfo(store.proAccess.subscriptionExpiresAt);
+  const effectiveExpiry = store.proAccess.subscriptionActive
+    ? store.proAccess.subscriptionTotalExpiresAt ||
+      store.proAccess.subscriptionExpiresAt
+    : store.proAccess.subscriptionExpiresAt;
+  const expiryInfo = parseExpiryInfo(effectiveExpiry);
  const isTrialPlan = /trial/i.test(
    String(store.proAccess.subscriptionPlanCode || ""),
  );