feat: add trial status badge in appbar

packages/backend/src/graphql/queries/get-trial-status.ee.ts

@@ -9,7 +9,9 @@ const getTrialStatus = async (
   if (!appConfig.isCloud) return;
 
   const inTrial = await context.currentUser.inTrial();
-  if (!inTrial) return;
+  const hasActiveSubscription = await context.currentUser.hasActiveSubscription();
+
+  if (!inTrial && hasActiveSubscription) return;
 
   return {
     expireAt: context.currentUser.trialExpiryDate,

packages/backend/src/models/user.ts

@@ -165,6 +165,16 @@ class User extends Base {
     this.trialExpiryDate = DateTime.now().plus({ days: 30 }).toISODate();
   }
 
+  async hasActiveSubscription() {
+    if (!appConfig.isCloud) {
+      return false;
+    }
+
+    const subscription = await this.$relatedQuery('currentSubscription');
+
+    return subscription?.isActive;
+  }
+
   async inTrial() {
     if (!appConfig.isCloud) {
       return false;
@@ -174,9 +184,7 @@ class User extends Base {
       return false;
     }
 
-    const subscription = await this.$relatedQuery('currentSubscription');
-
-    if (subscription?.isActive) {
+    if (await this.hasActiveSubscription()) {
       return false;
     }