From 6c1994cb86e424e2cafdba1165e566a5a10b1911 Mon Sep 17 00:00:00 2001
From: Alex Khomenko <Clarity-89@users.noreply.github.com>
Date: Wed, 20 Apr 2022 21:37:54 +0300
Subject: [PATCH] Use trialExpiry for determining if a user is on trial
 (#47975)

---
 packages/grafana-data/src/types/config.ts | 1 +
 public/app/features/admin/utils.ts        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-data/src/types/config.ts b/packages/grafana-data/src/types/config.ts
index 8231bb4c252..0c49f3249bc 100644
--- a/packages/grafana-data/src/types/config.ts
+++ b/packages/grafana-data/src/types/config.ts
@@ -42,6 +42,7 @@ export interface LicenseInfo {
   stateInfo: string;
   edition: GrafanaEdition;
   enabledFeatures: { [key: string]: boolean };
+  trialExpiry?: number;
 }
 
 /**
diff --git a/public/app/features/admin/utils.ts b/public/app/features/admin/utils.ts
index eea09437aa5..f4bdf531730 100644
--- a/public/app/features/admin/utils.ts
+++ b/public/app/features/admin/utils.ts
@@ -1,8 +1,8 @@
 import { config } from '@grafana/runtime/src';
 
 export function isTrial() {
-  const settings = (config as any).licensing;
-  return settings?.isTrial;
+  const expiry = config.licenseInfo?.trialExpiry;
+  return !!(expiry && expiry > 0);
 }
 
 export const highlightTrial = () => isTrial() && config.featureToggles.featureHighlights;