Skip to content

Commit 3f734c9

Browse files
sergiolmssergiolms
committed
update trial messaging
1 parent 1701081 commit 3f734c9

File tree

6 files changed

+41
-52
lines changed

6 files changed

+41
-52
lines changed

‎package.json‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18845,7 +18845,7 @@
1884518845
},
1884618846
{
1884718847
"view": "gitlens.views.drafts",
18848-
"contents": "Cloud Patches ᴘʀᴇᴠɪᴇᴡ — easily and securely share code with your teammates or other developers, accessible from anywhere, streamlining your workflow with better collaboration."
18848+
"contents": "Cloud Patches ᴘʀᴇᴠɪᴇᴡ — easily and securely share code with your teammates and other developers without adding noise to your repository."
1884918849
},
1885018850
{
1885118851
"view": "gitlens.views.drafts",
@@ -18857,10 +18857,6 @@
1885718857
"contents": "[Start Pro Trial](command:gitlens.plus.signUp?%7B%22source%22%3A%22cloud-patches%22%7D)\n\nStart your free 7-day Pro trial to try Cloud Patches and other Pro features, or [sign in](command:gitlens.plus.login?%7B%22source%22%3A%22cloud-patches%22%7D).",
1885818858
"when": "!gitlens:plus"
1885918859
},
18860-
{
18861-
"view": "gitlens.views.drafts",
18862-
"contents": "Preview feature ☁️ — requires an account and may require a paid plan in the future."
18863-
},
1886418860
{
1886518861
"view": "gitlens.views.launchpad",
1886618862
"contents": "[Launchpad](command:gitlens.views.launchpad.info \"Learn about Launchpad\") — organizes your pull requests into actionable groups to help you focus and keep your team unblocked.",
@@ -18891,7 +18887,7 @@
1889118887
},
1889218888
{
1889318889
"view": "gitlens.views.worktrees",
18894-
"contents": "[Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view-pro) ᴾᴿᴼ — minimize context switching by allowing you to work on multiple branches simultaneously."
18890+
"contents": "[Worktrees](https://help.gitkraken.com/gitlens/side-bar/#worktrees-view-pro) ᴾᴿᴼ — minimize context switching by working on multiple branches simultaneously."
1889518891
},
1889618892
{
1889718893
"view": "gitlens.views.grouped",
@@ -18940,7 +18936,7 @@
1894018936
},
1894118937
{
1894218938
"view": "gitlens.views.worktrees",
18943-
"contents": "[Upgrade to Pro](command:gitlens.plus.upgrade?%7B%22source%22%3A%22worktrees%22%7D)",
18939+
"contents": "Use on privately-hosted repos requires [GitLens Pro](https://help.gitkraken.com/gitlens/gitlens-community-vs-gitlens-pro?%7B%22source%22%3A%22worktrees%22%7D).\n\n[Upgrade to Pro](command:gitlens.plus.upgrade?%7B%22source%22%3A%22worktrees%22%7D)",
1894418940
"when": "gitlens:plus:required && gitlens:plus:state == 4"
1894518941
},
1894618942
{
@@ -18968,11 +18964,6 @@
1896818964
"contents": "Limited-time sale: Save up to 80% on GitLens Pro",
1896918965
"when": "gitlens:plus:required && gitlens:plus:state == 4 && gitlens:promo == devexdays && gitlens:views:grouped:view == worktrees"
1897018966
},
18971-
{
18972-
"view": "gitlens.views.worktrees",
18973-
"contents": "Your Pro trial has ended. Please upgrade for full access to Worktrees and other Pro features.",
18974-
"when": "gitlens:plus:required && gitlens:plus:state == 4"
18975-
},
1897618967
{
1897718968
"view": "gitlens.views.grouped",
1897818969
"contents": "Your Pro trial has ended. Please upgrade for full access to Worktrees and other Pro features.",
@@ -18988,10 +18979,6 @@
1898818979
"contents": "[Continue](command:gitlens.plus.reactivateProTrial?%7B%22source%22%3A%22worktrees%22%7D)\n\nReactivate your Pro trial and experience Worktrees and all the new Pro features — free for another 7 days!",
1898918980
"when": "gitlens:plus:required && gitlens:plus:state == 5 && gitlens:views:grouped:view == worktrees"
1899018981
},
18991-
{
18992-
"view": "gitlens.views.worktrees",
18993-
"contents": "Pro feature — requires a paid plan for use on privately-hosted repos."
18994-
},
1899518982
{
1899618983
"view": "gitlens.views.grouped",
1899718984
"contents": "Pro feature — requires a paid plan for use on privately-hosted repos.",

‎src/constants.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ export const urls = Object.freeze({
170170

171171
releaseNotes: 'https://help.gitkraken.com/gitlens/gitlens-release-notes-current/',
172172
releaseAnnouncement: `https://www.gitkraken.com/blog/gitkraken-launches-devex-platform-acquires-codesee?${utm}`,
173+
gitlensProVsCommunity: `https://help.gitkraken.com/gitlens/gitlens-community-vs-gitlens-pro/?${utm}`,
173174
});
174175

175176
export type WalkthroughSteps =

‎src/plus/gk/account/subscriptionService.ts‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -315,33 +315,30 @@ export class SubscriptionService implements Disposable {
315315
} = this._subscription;
316316

317317
if (account?.verified === false) {
318-
const days = getSubscriptionTimeRemaining(this._subscription, 'days') ?? proTrialLengthInDays;
319-
320318
const verify: MessageItem = { title: 'Resend Email' };
321-
const learn: MessageItem = { title: 'See Pro Features' };
319+
const learn: MessageItem | undefined = isSubscriptionPaid(this._subscription)
320+
? { title: 'See Pro Features' }
321+
: undefined;
322322
const confirm: MessageItem = { title: 'Continue', isCloseAffordance: true };
323+
323324
const result = await window.showInformationMessage(
324325
isSubscriptionPaid(this._subscription)
325326
? `You are now on the ${actual.name} plan. \n\nYou must first verify your email. Once verified, you will have full access to Pro features.`
326-
: `Welcome to your ${
327-
effective.name
328-
} Trial.\n\nYou must first verify your email. Once verified, you will have full access to Pro features for ${
329-
days < 1 ? '<1 more day' : pluralize('day', days, { infix: ' more ' })
330-
}.`,
327+
: `Welcome to GitLens.`,
331328
{
332329
modal: true,
333-
detail: `Your ${
334-
isSubscriptionPaid(this._subscription) ? 'plan' : 'trial'
335-
} also includes access to the GitKraken DevEx platform, unleashing powerful Git visualization & productivity capabilities everywhere you work: IDE, desktop, browser, and terminal.`,
330+
detail: isSubscriptionPaid(this._subscription)
331+
? `Your ${
332+
isSubscriptionPaid(this._subscription) ? 'plan' : 'trial'
333+
} also includes access to the GitKraken DevEx platform, unleashing powerful Git visualization & productivity capabilities everywhere you work: IDE, desktop, browser, and terminal.`
334+
: `Verify the email we just sent you to start your Pro trial.`,
336335
},
337-
verify,
338-
learn,
339-
confirm,
336+
...([verify, learn, confirm].filter(Boolean) as MessageItem[]),
340337
);
341338

342339
if (result === verify) {
343340
void this.resendVerification(source);
344-
} else if (result === learn) {
341+
} else if (learn && result === learn) {
345342
void this.learnAboutPro({ source: 'prompt', detail: { action: 'trial-started-verify-email' } }, source);
346343
}
347344
} else if (isSubscriptionPaid(this._subscription)) {

‎src/quickpicks/items/directive.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export function createDirectiveQuickPickItem(
6565
break;
6666
case Directive.StartProTrial:
6767
label = 'Start Pro Trial';
68-
detail = `Start your free ${proTrialLengthInDays}-day Pro trial for full access to Pro features`;
68+
detail = `Start your free ${proTrialLengthInDays}-day GitLens Pro trial - no credit card required.`;
6969
break;
7070
case Directive.RequiresVerification:
7171
label = 'Resend Email';
@@ -74,7 +74,7 @@ export function createDirectiveQuickPickItem(
7474
case Directive.RequiresPaidSubscription:
7575
label = 'Upgrade to Pro';
7676
if (detail != null) {
77-
description ??= ' \u2014\u00a0\u00a0 a paid plan is required to use this Pro feature';
77+
description ??= ' - access Launchpad and all Pro features with GitLens Pro';
7878
} else {
7979
detail = 'Upgrading to a paid plan is required to use this Pro feature';
8080
}

‎src/webviews/apps/plus/shared/components/feature-gate-plus-state.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { css, html, LitElement, nothing } from 'lit';
22
import { customElement, property, query } from 'lit/decorators.js';
3+
import { urls } from '../../../../../constants';
34
import { Commands } from '../../../../../constants.commands';
45
import { proTrialLengthInDays, SubscriptionState } from '../../../../../constants.subscription';
56
import type { Source } from '../../../../../constants.telemetry';
@@ -139,31 +140,30 @@ export class GlFeatureGatePlusState extends LitElement {
139140

140141
case SubscriptionState.ProPreviewExpired:
141142
return html`
143+
<p>
144+
Use on privately-hosted repos requires <a href="${urls.gitlensProVsCommunity}">GitLens Pro</a>.
145+
</p>
142146
<gl-button
143147
appearance="${appearance}"
144148
href="${generateCommandLink(Commands.PlusSignUp, this.source)}"
145-
>Start Pro Trial</gl-button
149+
>&nbsp;Try GitLens Pro&nbsp;</gl-button
146150
>
147151
<p>
148-
Start your free ${proTrialLengthInDays}-day Pro trial to try
149-
${this.featureWithArticleIfNeeded ? `${this.featureWithArticleIfNeeded} and other ` : ''}Pro
150-
features, or
152+
Start your free ${proTrialLengthInDays}-day GitLens Pro trial - no credit card required. Or
151153
<a href="${generateCommandLink(Commands.PlusLogin, this.source)}" title="Sign In">sign in</a>.
152154
</p>
153155
`;
154156

155157
case SubscriptionState.ProTrialExpired:
156-
return html` <gl-button
158+
return html`<p>
159+
Use on privately-hosted repos requires <a href="${urls.gitlensProVsCommunity}">GitLens Pro</a>.
160+
</p>
161+
<gl-button
157162
appearance="${appearance}"
158163
href="${generateCommandLink(Commands.PlusUpgrade, this.source)}"
159164
>Upgrade to Pro</gl-button
160165
>
161-
${this.renderPromo(promo)}
162-
<p>
163-
Your Pro trial has ended. Please upgrade for full access to
164-
${this.featureWithArticleIfNeeded ? `${this.featureWithArticleIfNeeded} and other ` : ''}Pro
165-
features.
166-
</p>`;
166+
${this.renderPromo(promo)}`;
167167

168168
case SubscriptionState.ProTrialReactivationEligible:
169169
return html`

‎src/webviews/apps/plus/shared/components/home-account-content.ts‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -361,11 +361,14 @@ export class GLHomeAccountContent extends LitElement {
361361
case SubscriptionState.ProTrialExpired:
362362
return html`
363363
<div class="account">
364-
<p>Your Pro trial has ended. You can now only use Pro features on publicly-hosted repos.</p>
364+
<p>
365+
Thank you for trying <a href="${urls.gitlensProVsCommunity}">GitLens Pro</a>. <br /><br />
366+
Continue leveraging Pro features and workflows on privately-hosted repos by upgrading today.
367+
</p>
365368
<button-container>
366369
<gl-button full href="command:gitlens.plus.upgrade">Upgrade to Pro</gl-button>
367370
</button-container>
368-
${this.renderPromo(promo)} ${this.renderIncludesDevEx()}
371+
${this.renderPromo(promo)}
369372
</div>
370373
`;
371374

@@ -395,15 +398,16 @@ export class GLHomeAccountContent extends LitElement {
395398
return html`
396399
<div class="account">
397400
<p>
398-
Sign up for access to Pro features and the
399-
<a href="${urls.platform}">GitKraken DevEx platform</a>, or
400-
<a href="command:gitlens.plus.login">sign in</a>.
401+
Unlock advanced workflows and professional developer features with
402+
<a href="${urls.gitlensProVsCommunity}">GitLens Pro</a>.
401403
</p>
402404
<button-container>
403-
<gl-button full href="command:gitlens.plus.signUp">Sign Up</gl-button>
405+
<gl-button full href="command:gitlens.plus.signUp">Try GitLens Pro</gl-button>
404406
</button-container>
405-
<p>Signing up starts your free ${proTrialLengthInDays}-day Pro trial.</p>
406-
${this.renderIncludesDevEx()}
407+
<p>
408+
Get ${proTrialLengthInDays} days of GitLens Pro for free - no credit card required. Or
409+
<a href="command:gitlens.plus.login">sign in</a>.
410+
</p>
407411
</div>
408412
`;
409413
}

0 commit comments

Comments
 (0)