add isTrial check for pro trial accounts

Author: sergiolms

src/plus/gk/account/subscription.ts

@@ -34,6 +34,7 @@ export interface SubscriptionPlan {
 	readonly startedOn: string;
 	readonly expiresOn?: string | undefined;
 	readonly organizationId: string | undefined;
+	readonly isTrial: boolean;
 }
 
 export interface SubscriptionAccount {
@@ -143,6 +144,7 @@ export function getSubscriptionPlan(
 	expiresOn?: Date,
 	cancelled: boolean = false,
 	nextTrialOptInDate?: string,
+	isTrial: boolean = false,
 ): SubscriptionPlan {
 	return {
 		id: id,
@@ -154,6 +156,7 @@ export function getSubscriptionPlan(
 		nextTrialOptInDate: nextTrialOptInDate,
 		startedOn: (startedOn ?? new Date()).toISOString(),
 		expiresOn: expiresOn != null ? expiresOn.toISOString() : undefined,
+		isTrial: isTrial,
 	};
 }
 
@@ -214,7 +217,7 @@ export function isSubscriptionExpired(subscription: Optional<Subscription, 'stat
 }
 
 export function isSubscriptionTrial(subscription: Optional<Subscription, 'state'>): boolean {
-	return subscription.plan.actual.id !== subscription.plan.effective.id;
+	return subscription.plan.effective.isTrial;
 }
 
 export function isSubscriptionInProTrial(subscription: Optional<Subscription, 'state'>): boolean {

src/plus/gk/account/subscriptionService.ts

@@ -717,7 +717,7 @@ export class SubscriptionService implements Disposable {
 			...this._subscription,
 			plan: {
 				...this._subscription.plan,
-				effective: getSubscriptionPlan(SubscriptionPlanId.Pro, false, 0, undefined, startedOn, expiresOn),
+				effective: getSubscriptionPlan(SubscriptionPlanId.Pro, false, 0, undefined, startedOn, expiresOn, true),
 			},
 			previewTrial: previewTrial,
 		});
@@ -1234,6 +1234,7 @@ export class SubscriptionService implements Disposable {
 						undefined,
 						new Date(subscription.previewTrial.startedOn),
 						new Date(subscription.previewTrial.expiresOn),
+						true,
 					),
 				},
 			};

src/plus/gk/checkin.ts

@@ -141,6 +141,7 @@ export function getSubscriptionFromCheckIn(
 			license.organizationId,
 			new Date(license.latestStartDate),
 			new Date(license.latestEndDate),
+			license.latestStatus === 'trial' || license.latestStatus === 'in_trial',
 		);
 	}
 
@@ -177,6 +178,7 @@ export function getSubscriptionFromCheckIn(
 			new Date(license.latestEndDate),
 			license.latestStatus === 'cancelled',
 			license.nextOptInDate ?? data.nextOptInDate,
+			license.latestStatus === 'trial' || license.latestStatus === 'in_trial',
 		);
 	}