Updates promos

Author: eamodio

README.md

@@ -8,8 +8,6 @@ GitLens supercharges your Git experience in VS Code. Maintaining focus is critic
 
 GitLens sets itself apart from other Git tools through its deep level of integration, versatility, and ease of use. GitLens sits directly within your editor, reducing context switching and promoting a more efficient workflow. We know Git is hard and strive to make it as easy as possible while also going beyond the basics with rich visualizations and step-by-step guidance and safety, just to name a few.
 
-> 💡 **Limited-time:** [Upgrade to Pro](https://gitkraken.dev/purchase/checkout?source=gitlens&product=gitlens&promoCode=GLLAUNCHPAD24&context=marketplace) before October 14th and save more than 75%. 💡
-
 ## Getting Started
 
 <p>

package.json

@@ -17552,13 +17552,18 @@
 			},
 			{
 				"view": "gitlens.views.worktrees",
-				"contents": "Limited-time Sale: Save 33% or more on your 1st seat of Pro.",
+				"contents": "Limited-time sale: Save 33% or more on your 1st seat of Pro.",
 				"when": "gitlens:plus:required && gitlens:plus:state == 4 && (gitlens:promo == pro50 || !gitlens:promo)"
 			},
 			{
 				"view": "gitlens.views.worktrees",
-				"contents": "Launchpad Sale: Save 75% or more on GitLens Pro",
-				"when": "gitlens:plus:required && gitlens:plus:state == 4 && gitlens:promo =~ /(launchpad|launchpad-extended)/"
+				"contents": "Launchpad sale: Save 75% or more on GitLens Pro",
+				"when": "gitlens:plus:required && gitlens:plus:state == 4 && gitlens:promo == launchpad-extended"
+			},
+			{
+				"view": "gitlens.views.worktrees",
+				"contents": "Limited-time sale: Save up to 80% on GitLen Pro",
+				"when": "gitlens:plus:required && gitlens:plus:state == 4 && gitlens:promo == devexdays"
 			},
 			{
 				"view": "gitlens.views.worktrees",

src/constants.subscription.ts

@@ -1,7 +1,7 @@
 export const proPreviewLengthInDays = 3;
 export const proTrialLengthInDays = 7;
 
-export type PromoKeys = 'launchpad' | 'launchpad-extended' | 'pro50';
+export type PromoKeys = 'devexdays' | 'launchpad-extended' | 'pro50';
 
 export const enum SubscriptionPlanId {
 	Community = 'community',

src/git/gitProviderService.ts

@@ -19,7 +19,6 @@ import { SubscriptionPlanId } from '../constants.subscription';
 import type { Container } from '../container';
 import { AccessDeniedError, CancellationError, ProviderNotFoundError, ProviderNotSupportedError } from '../errors';
 import type { FeatureAccess, Features, PlusFeatures, RepoFeatureAccess } from '../features';
-import { getApplicablePromo } from '../plus/gk/account/promos';
 import type { Subscription } from '../plus/gk/account/subscription';
 import { isSubscriptionPaidPlan } from '../plus/gk/account/subscription';
 import type { SubscriptionChangeEvent } from '../plus/gk/account/subscriptionService';
@@ -778,10 +777,6 @@ export class GitProviderService implements Disposable {
 		}
 
 		if (feature === 'launchpad') {
-			// If our launchpad graduation promo is active allow access for everyone
-			if (getApplicablePromo(subscription.state, undefined, 'launchpad')) {
-				return { allowed: true, subscription: { current: subscription } };
-			}
 			return { allowed: false, subscription: { current: subscription, required: SubscriptionPlanId.Pro } };
 		}
 

src/plus/gk/account/promos.ts

@@ -21,7 +21,7 @@ export interface Promo {
 // Must be ordered by applicable order
 const promos: Promo[] = [
 	{
-		key: 'launchpad',
+		key: 'launchpad-extended',
 		code: 'GLLAUNCHPAD24',
 		states: [
 			SubscriptionState.Community,
@@ -31,15 +31,16 @@ const promos: Promo[] = [
 			SubscriptionState.ProTrialExpired,
 			SubscriptionState.ProTrialReactivationEligible,
 		],
-		expiresOn: new Date('2024-09-27T06:59:00.000Z').getTime(),
-		command: { tooltip: 'Launchpad Sale: Save 75% or more on GitLens Pro' },
+		startsOn: new Date('2024-09-27T06:59:00.000Z').getTime(),
+		expiresOn: new Date('2024-10-14T06:59:00.000Z').getTime(),
+		command: { tooltip: 'Launchpad sale: Save 75% or more on GitLens Pro' },
 		quickpick: {
-			detail: '$(rocket) Launchpad Sale: Save 75% or more on GitLens Pro',
+			detail: '$(rocket) Launchpad sale: Save 75% or more on GitLens Pro',
 		},
 	},
 	{
-		key: 'launchpad-extended',
-		code: 'GLLAUNCHPAD24',
+		key: 'devexdays',
+		code: 'DEXEXDAYS24',
 		states: [
 			SubscriptionState.Community,
 			SubscriptionState.ProPreview,
@@ -48,11 +49,12 @@ const promos: Promo[] = [
 			SubscriptionState.ProTrialExpired,
 			SubscriptionState.ProTrialReactivationEligible,
 		],
-		startsOn: new Date('2024-09-27T06:59:00.000Z').getTime(),
-		expiresOn: new Date('2024-10-14T06:59:00.000Z').getTime(),
-		command: { tooltip: 'Launchpad Sale: Save 75% or more on GitLens Pro' },
+		startsOn: new Date('2024-10-13T06:59:00.000Z').getTime(),
+		expiresOn: new Date('2024-11-05T06:59:00.000Z').getTime(),
+		command: { tooltip: 'Limited-Time sale: Save up to 80% off GitLens Pro' },
+		locations: ['account', 'badge', 'gate'],
 		quickpick: {
-			detail: '$(rocket) Launchpad Sale: Save 75% or more on GitLens Pro',
+			detail: '$(star-full) Limited-Time sale: Save up to 80% off GitLens Pro',
 		},
 	},
 	{
@@ -65,9 +67,9 @@ const promos: Promo[] = [
 			SubscriptionState.ProTrialExpired,
 			SubscriptionState.ProTrialReactivationEligible,
 		],
-		command: { tooltip: 'Limited-Time Sale: Save 33% or more on your 1st seat of Pro. See your special price' },
+		command: { tooltip: 'Limited-Time sale: Save 33% or more on your 1st seat of Pro. See your special price' },
 		quickpick: {
-			detail: '$(star-full) Limited-Time Sale: Save 33% or more on your 1st seat of Pro',
+			detail: '$(star-full) Limited-Time sale: Save 33% or more on your 1st seat of Pro',
 		},
 	},
 ];

src/plus/launchpad/launchpad.ts

@@ -53,7 +53,6 @@ import { interpolate, pluralize } from '../../system/string';
 import { executeCommand } from '../../system/vscode/command';
 import { configuration } from '../../system/vscode/configuration';
 import { openUrl } from '../../system/vscode/utils';
-import { getApplicablePromo } from '../gk/account/promos';
 import { ProviderBuildStatusState, ProviderPullRequestReviewState } from '../integrations/providers/models';
 import type {
 	LaunchpadAction,
@@ -112,7 +111,6 @@ interface Context {
 	collapsed: Map<LaunchpadGroup, boolean>;
 	telemetryContext: LaunchpadTelemetryContext | undefined;
 	connectedIntegrations: Map<IntegrationId, boolean>;
-	showGraduationPromo: boolean;
 }
 
 interface GroupedLaunchpadItem extends LaunchpadItem {
@@ -221,7 +219,6 @@ export class LaunchpadCommand extends QuickCommand<State> {
 			collapsed: collapsed,
 			telemetryContext: this.telemetryContext,
 			connectedIntegrations: await this.container.launchpad.getConnectedIntegrations(),
-			showGraduationPromo: false,
 		};
 
 		let opened = false;
@@ -266,9 +263,6 @@ export class LaunchpadCommand extends QuickCommand<State> {
 			const result = yield* ensureAccessStep(state, context, PlusFeatures.Launchpad);
 			if (result === StepResultBreak) continue;
 
-			context.showGraduationPromo =
-				getApplicablePromo(result.subscription.current.state, undefined, 'launchpad') != null;
-
 			await updateContextItems(this.container, context, { force: newlyConnected });
 
 			if (state.counter < 1 || state.item == null) {
@@ -378,16 +372,6 @@ export class LaunchpadCommand extends QuickCommand<State> {
 		const hasDisconnectedIntegrations = [...context.connectedIntegrations.values()].some(c => !c);
 		const getItems = (result: LaunchpadCategorizedResult) => {
 			const items: (LaunchpadItemQuickPickItem | DirectiveQuickPickItem | ConnectMoreIntegrationsItem)[] = [];
-			if (context.showGraduationPromo) {
-				items.push(
-					createDirectiveQuickPickItem(Directive.RequiresPaidSubscription, undefined, {
-						label: `Preview access of Launchpad will end on September 27th`,
-						detail: '$(blank) Upgrade before then to save 75% or more on GitLens Pro',
-						iconPath: new ThemeIcon('megaphone'),
-						buttons: [LearnAboutProQuickInputButton],
-					}),
-				);
-			}
 
 			if (result.items?.length) {
 				const uiGroups = groupAndSortLaunchpadItems(result.items);

src/webviews/apps/shared/components/promo.ts

@@ -81,13 +81,17 @@ export class GlPromo extends LitElement {
 		switch (promo.key) {
 			case 'pro50':
 				return html`<span class="content${this.type === 'link' ? nothing : ' muted'}"
-					>Limited-Time Sale: <b>Save 33% or more on your 1st seat of Pro.</b></span
+					>Limited-Time sale: <b>Save 33% or more</b> on your 1st seat of Pro</span
 				>`;
 
-			case 'launchpad':
 			case 'launchpad-extended':
 				return html`<span class="content${this.type === 'link' ? nothing : ' muted'}"
-					>Launchpad Sale: <b>Save 75% or more on GitLens Pro.</b></span
+					>Launchpad sale: <b>Save 75% or more</b> on GitLens Pro</span
+				>`;
+
+			case 'devexdays':
+				return html`<span class="content${this.type === 'link' ? nothing : ' muted'}"
+					>Limited-time sale: <b>Save up to 80%</b> on GitLen Pro</span
 				>`;
 		}
 	}